Merge pull request #220 from prgrms-web-devcourse-final-project/fix/EA3-180-member-profile-update

[EA3-180] Fix: 닉네임 변경사항이 존재할때만 수정하도록 변경

Author: pia01190

src/main/java/grep/neogulcoder/domain/users/service/UserService.java

@@ -23,14 +23,14 @@
 import grep.neogulcoder.global.utils.upload.FileUsageType;
 import grep.neogulcoder.global.utils.upload.uploader.GcpFileUploader;
 import grep.neogulcoder.global.utils.upload.uploader.LocalFileUploader;
-import jakarta.transaction.Transactional;
 import java.io.IOException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 @Transactional
@@ -58,14 +58,14 @@ public class UserService {
     private Environment environment;
 
 
+    @Transactional(readOnly = true)
     public User get(Long id) {
-        User user = findUser(id);
-        return user;
+        return findUserById(id);
     }
 
+    @Transactional(readOnly = true)
     public User getByEmail(String email) {
-        User user = findUser(email);
-        return user;
+        return findUserByEmail(email);
     }
 
     public void signUp(SignUpRequest request) {
@@ -84,7 +84,7 @@ public void signUp(SignUpRequest request) {
         userRepository.save(
             User.UserInit(request.getEmail(), encodedPassword, request.getNickname()));
 
-        User user = findUser(request.getEmail());
+        User user = findUserByEmail(request.getEmail());
         initializeUserData(user.getId());
 
         verificationService.clearVerifiedStatus(request.getEmail());
@@ -93,10 +93,9 @@ public void signUp(SignUpRequest request) {
     public void updateProfile(Long userId, String nickname, MultipartFile profileImage)
         throws IOException {
 
-        User user = findUser(userId);
-        if(isDuplicateNickname(nickname)){
-            throw new NicknameDuplicatedException(UserErrorCode.IS_DUPLICATED_NICKNAME);
-        }
+        User user = findUserById(userId);
+
+        String validatedNickname = validateUpdateNickname(user, nickname);
 
         String uploadedImageUrl;
         if (isProfileImgExists(profileImage)) {
@@ -108,12 +107,12 @@ public void updateProfile(Long userId, String nickname, MultipartFile profileIma
             uploadedImageUrl = user.getProfileImageUrl();
         }
 
-        user.updateProfile(nickname, uploadedImageUrl);
+        user.updateProfile(validatedNickname, uploadedImageUrl);
     }
 
     public void updatePassword(Long id, String password, String newPassword,
         String newPasswordCheck) {
-        User user = findUser(id);
+        User user = findUserById(id);
 
         if (isNotMatchCurrentPassword(password, user.getPassword())) {
             throw new PasswordNotMatchException(UserErrorCode.PASSWORD_MISMATCH);
@@ -128,7 +127,7 @@ public void updatePassword(Long id, String password, String newPassword,
     }
 
     public void deleteUser(Long userId, String password) {
-        User user = findUser(userId);
+        User user = findUserById(userId);
 
         if (isNotMatchCurrentPassword(password, user.getPassword())) {
             throw new PasswordNotMatchException(UserErrorCode.PASSWORD_MISMATCH);
@@ -142,7 +141,7 @@ public void deleteUser(Long userId, String password) {
     }
 
     public void deleteUser(Long userId) {
-        User user = findUser(userId);
+        User user = findUserById(userId);
 
         prTemplateService.deleteByUserId(user.getId());
         linkService.deleteByUserId(userId);
@@ -157,6 +156,7 @@ public void initializeUserData(Long userId) {
         buddyEnergyService.createDefaultEnergy(userId);
     }
 
+    @Transactional(readOnly = true)
     public UserResponse getUserResponse(Long userId) {
         User user = get(userId);
         return UserResponse.toUserResponse(
@@ -168,6 +168,7 @@ public UserResponse getUserResponse(Long userId) {
             user.getRole());
     }
 
+    @Transactional(readOnly = true)
     public List<AllUserResponse> getAllUsers() {
         return userRepository.findAllByActivatedTrue().stream()
             .map(user -> AllUserResponse.builder()
@@ -180,13 +181,26 @@ public List<AllUserResponse> getAllUsers() {
             .toList();
     }
 
-    private User findUser(Long id) {
+    private String validateUpdateNickname(User user, String nickname) {
+        if (isChangedNickname(nickname)) {
+            nickNameDuplicationCheck(nickname);
+        } else {
+            nickname = user.getNickname();
+        }
+        return nickname;
+    }
+
+    private boolean isChangedNickname(String nickname){
+        return nickname != null && !nickname.isBlank();
+    }
+
+    private User findUserById(Long id) {
         return userRepository.findById(id)
             .orElseThrow(
                 () -> new UserNotFoundException(UserErrorCode.USER_NOT_FOUND));
     }
 
-    private User findUser(String email) {
+    private User findUserByEmail(String email) {
         return userRepository.findByEmail(email)
             .orElseThrow(
                 () -> new UserNotFoundException(UserErrorCode.USER_NOT_FOUND));
@@ -202,6 +216,12 @@ private void duplicationCheck(String email, String nickname) {
         }
     }
 
+    private void nickNameDuplicationCheck(String nickname){
+        if(isDuplicateNickname(nickname)){
+            throw new NicknameDuplicatedException(UserErrorCode.IS_DUPLICATED_NICKNAME);
+        }
+    }
+
     private boolean isDuplicateEmail(String email) {
         return userRepository.findByEmail(email).isPresent();
     }