[MOD] 회원 프로필 사진 변경 + 닉네임 변경 -> 회원 정보 변경으로 변경

modugarden · Jan 31, 2023 · 9439cf0 · 9439cf0
1 parent 3a660d0
commit 9439cf0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/src/main/java/com/modugarden/domain/user/controller/UserController.java b/src/main/java/com/modugarden/domain/user/controller/UserController.java
@@ -56,16 +56,12 @@ public BaseResponseDto<UserSettingInfoResponseDto> readUserInfo(@AuthenticationP
         return new BaseResponseDto<>(userService.readUserSettingInfo(user.getUserId()));
     }
 
-    @ApiOperation(value = "내 프로필 - 프로필 설정 - 사진 변경", notes = "내 프로필 - 프로필 설정에서 사진을 변경한다.")
-    @PatchMapping(value = "/me/profileImg", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
-    public BaseResponseDto<UserProfileImgResponseDto> updateProfileImg(@RequestPart(name = "file", required = false) MultipartFile file, @AuthenticationPrincipal ModugardenUser user) throws IOException {
-        return new BaseResponseDto<>(userService.updateProfileImg(user.getUserId(), file));
-    }
-
-    @ApiOperation(value = "내 프로필 - 프로필 설정 - 닉네임 변경", notes = "내 프로필 - 프로필 설정에서 닉네임을 변경한다.")
-    @PatchMapping("/me/nickname")
-    public BaseResponseDto<UserNicknameResponseDto> updateUserNickname(@RequestBody @Valid UserNicknameRequestDto userNicknameRequestDto, @AuthenticationPrincipal ModugardenUser user) {
-        return new BaseResponseDto<>(userService.updateUserNickname(user.getUserId(), userNicknameRequestDto));
+    @ApiOperation(value = "내 프로필 - 프로필 설정 - 닉네임, 사진 변경", notes = "내 프로필 - 프로필 설정에서 닉네임, 사진을 변경한다.")
+    @PatchMapping(value = "/me/setting-info", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
+    public BaseResponseDto<UpdateUserInfoResponseDto> updateUserInfo(@RequestPart @Valid UserNicknameRequestDto userNicknameRequestDto,
+                                                                       @RequestPart(name = "file", required = false) MultipartFile file,
+                                                                       @AuthenticationPrincipal ModugardenUser user) throws IOException {
+        return new BaseResponseDto<>(userService.updateUserInfo(user.getUserId(), file, userNicknameRequestDto));
     }
 
     @ApiOperation(value = "내 프로필 - 프로필 설정 - 카테고리 변경", notes = "내 프로필 - 프로필 설정에서 카테고리를 변경한다.")

diff --git a/src/main/java/com/modugarden/domain/user/service/UserService.java b/src/main/java/com/modugarden/domain/user/service/UserService.java
@@ -3,7 +3,6 @@
 import com.modugarden.common.error.enums.ErrorMessage;
 import com.modugarden.common.error.exception.custom.BusinessException;
 import com.modugarden.common.s3.FileService;
-import com.modugarden.domain.auth.entity.ModugardenUser;
 import com.modugarden.domain.board.repository.BoardRepository;
 import com.modugarden.domain.category.entity.InterestCategory;
 import com.modugarden.domain.category.entity.UserInterestCategory;
@@ -17,7 +16,6 @@
 import com.modugarden.domain.user.dto.response.*;
 import com.modugarden.domain.user.entity.User;
 import com.modugarden.domain.user.entity.UserNotification;
-import com.modugarden.domain.user.repository.UserNotificationRepository;
 import com.modugarden.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -63,19 +61,12 @@ public CurrentUserInfoResponseDto readCurrentUserInfo(Long userId) {
     }
 
     @Transactional
-    public UserNicknameResponseDto updateUserNickname(Long userId, UserNicknameRequestDto userNicknameRequestDto) {
+    public UpdateUserInfoResponseDto updateUserInfo(Long userId, MultipartFile file, UserNicknameRequestDto userNicknameRequestDto) throws IOException {
         User user = userRepository.findById(userId).orElseThrow(() -> new BusinessException(ErrorMessage.USER_NOT_FOUND));
         String userNickname = userNicknameRequestDto.getNickname().toLowerCase();
-        user.updateNickname(userNickname);
-        return new UserNicknameResponseDto(user.getNickname());
-    }
-
-    @Transactional
-    public UserProfileImgResponseDto updateProfileImg(Long userId, MultipartFile file) throws IOException {
-        User user = userRepository.findById(userId).orElseThrow(() -> new BusinessException(ErrorMessage.USER_NOT_FOUND));
         String profileImageUrl = fileService.uploadFile(file, userId, "profileImage");
-        user.updateProfileImage(profileImageUrl);
-        return new UserProfileImgResponseDto(user.getProfileImg());
+        user.updateUserInfo(userNickname, profileImageUrl);
+        return new UpdateUserInfoResponseDto(userNickname, user.getProfileImg());
     }
 
     public UserSettingInfoResponseDto readUserSettingInfo(Long userId) {