fix: 유저 수정 기능 수정

- 프로필 뮤직이 변경이 없을때 처리

Author: HYEONSIKOH

src/main/java/org/dfbf/soundlink/domain/user/dto/request/UserUpdateDto.java

@@ -13,4 +13,17 @@ public record UserUpdateDto(
         Optional<String> albumImage,
         Optional<String> videoId
 ) {
+    public String toString(){
+        return "UserUpdateDto{" +
+                "email=" + email +
+                ", loginId=" + loginId +
+                ", nickName=" + nickName +
+                ", password=" + password +
+                ", spotifyId=" + spotifyId +
+                ", title=" + title +
+                ", artist=" + artist +
+                ", albumImage=" + albumImage +
+                ", videoId=" + videoId +
+                "}";
+    }
 }

src/main/java/org/dfbf/soundlink/domain/user/entity/User.java

@@ -15,6 +15,7 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@ToString
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/org/dfbf/soundlink/domain/user/service/UserService.java

@@ -80,7 +80,7 @@ public ResponseResult signUp(UserSignUpDto userSignUpDto) {
             userRepository.save(userSignUpDto.toEntity(passwordEncoder));
             return new ResponseResult(ErrorCode.SUCCESS);
         } catch (Exception e) {
-            return new ResponseResult(ErrorCode.DB_ERROR);
+            return new ResponseResult(ErrorCode.DB_ERROR, e.getMessage());
         }
     }
 
@@ -95,7 +95,7 @@ public ResponseResult getUser(Long userId) {
 
             return new ResponseResult(ErrorCode.SUCCESS, result);
         } catch (NoUserDataException e) {
-            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER);
+            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER, e.getMessage());
         }
     }
 
@@ -111,6 +111,7 @@ public ResponseResult updateUser(Long userId, UserUpdateDto userUpdateDto) {
          * orElse -> 일단 함수는 실행, 그러나 값이 null이면 orElse의 값으로 대체 (함수O, 람다x)
          * orElseGet -> null일때만 실행 (함수O, 람다O)
          */
+        //log.info("userUpdateDto: " + userUpdateDto.toString());
 
         try {
             User user = userRepository.findByUserIdWithCache(userId)
@@ -129,12 +130,13 @@ public ResponseResult updateUser(Long userId, UserUpdateDto userUpdateDto) {
                 }
 
                 user.update(userUpdateDto, passwordEncoder, spotifyMusicList.get(0));
+                profileMusicRepository.save(user.getProfileMusic());
             } else {
                 if("-1".equals(spotifyId)) { user.getProfileMusic().deleteSpotifyId(); }
                 user.update(userUpdateDto, passwordEncoder);
+                log.info(user.toString());
             }
 
-            profileMusicRepository.save(user.getProfileMusic());
             userRepository.saveWithCache(user);
 
             return new ResponseResult(ErrorCode.SUCCESS);
@@ -167,9 +169,9 @@ public ResponseResult deleteUser(Long userId) {
 
             return new ResponseResult(ErrorCode.SUCCESS);
         } catch (NoUserDataException e) {
-            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER);
+            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER, e.getMessage());
         } catch (Exception e) {
-            return new ResponseResult(ErrorCode.DB_ERROR);
+            return new ResponseResult(ErrorCode.DB_ERROR, e.getMessage());
         }
     }
 
@@ -185,9 +187,9 @@ public ResponseResult passwordCheck(Long userId, CheckPasswordDto dto) {
                 return new ResponseResult(ErrorCode.NOT_EQUALS_PASSWORD);
             }
         } catch (NoUserDataException e) {
-            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER);
+            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER, e.getMessage());
         } catch (Exception e) {
-            return new ResponseResult(ErrorCode.DB_ERROR);
+            return new ResponseResult(ErrorCode.DB_ERROR, e.getMessage());
         }
     }
 
@@ -202,9 +204,9 @@ public ResponseResult getMyPage(Long userId) {
 
             return new ResponseResult(ErrorCode.SUCCESS, result);
         } catch (NoUserDataException e) {
-            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER);
+            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER, e.getMessage());
         } catch (Exception e) {
-            return new ResponseResult(ErrorCode.DB_ERROR);
+            return new ResponseResult(ErrorCode.DB_ERROR, e.getMessage());
         }
     }
 
@@ -216,7 +218,7 @@ public ResponseResult sendAuthCode(String email) {
             redisService.setCode(email, authCode);
             return new ResponseResult(ErrorCode.SUCCESS, email);
         } catch (MessagingException e) {
-            return new ResponseResult(ErrorCode.EMAIL_SEND_ERROR, "이메일 전송에 실패했습니다.");
+            return new ResponseResult(ErrorCode.EMAIL_SEND_ERROR, e.getMessage());
         }
     }
 
@@ -231,7 +233,7 @@ public ResponseResult validateAuthCode(String email, String authCode){
                 return new ResponseResult(ErrorCode.BAD_REQUEST, "이메일 전송 실패: 잘못된 요청입니다.");
             }
         } catch (AuthenticationException e) {
-            return new ResponseResult(ErrorCode.EMAIL_SEND_ERROR);
+            return new ResponseResult(ErrorCode.EMAIL_SEND_ERROR, e.getMessage());
         }
     }
 
@@ -361,7 +363,7 @@ public ResponseResult checkLoginiId(String loginId) {
                 return new ResponseResult(ErrorCode.NOT_DUPLICATE_LOGINID);
             }
         } catch (Exception e) {
-            return new ResponseResult(ErrorCode.DB_ERROR);
+            return new ResponseResult(ErrorCode.DB_ERROR, e.getMessage());
         }
     }
 
@@ -376,7 +378,7 @@ public ResponseResult getProfile(String tag) {
 
             return new ResponseResult(ErrorCode.SUCCESS, result);
         } catch (NoUserDataException e) {
-            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER);
+            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER, e.getMessage());
         } catch (Exception e) {
             return new ResponseResult(ErrorCode.DB_ERROR, e.getMessage());
         }