fix: entity 수정

- user에서 nickName 퀄럼을 nickname으로 변경
- entity의 모든 퀄럼에 @column(name = ~) 추가

Author: HYEONSIKOH

src/main/java/org/dfbf/soundlink/domain/blocklist/entity/Blocklist.java

@@ -18,6 +18,7 @@ public class Blocklist {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "blocklist_id")
     private Long blocklistId;
 
     @ManyToOne
@@ -29,9 +30,11 @@ public class Blocklist {
     private User blockedUser;
 
     @CreationTimestamp
+    @Column(name = "created_at")
     private Timestamp createdAt;
 
     @UpdateTimestamp
+    @Column(name = "updated_at")
     private Timestamp updatedAt;
 
     @Builder

src/main/java/org/dfbf/soundlink/domain/emotionRecord/entity/EmotionRecord.java

@@ -16,25 +16,30 @@
 public class EmotionRecord {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "record_id")
     private Long recordId;
 
     @ManyToOne
     @JoinColumn(name = "user_id")
     private User user;
 
     @Enumerated(EnumType.STRING)
+    @Column(name = "emotion")
     private Emotions emotion;
 
     @ManyToOne
     @JoinColumn(name = "spotify_music_id")
     private SpotifyMusic spotifyMusic;
 
+    @Column(name = "comment")
     private String comment;
 
     @CreationTimestamp
+    @Column(name = "created_at")
     private Timestamp createdAt;
 
     @UpdateTimestamp
+    @Column(name = "updated_at")
     private Timestamp updatedAt;
 
     @Builder

src/main/java/org/dfbf/soundlink/domain/emotionRecord/entity/SpotifyMusic.java

@@ -15,16 +15,25 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class SpotifyMusic {
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long spotifyId;
 
+    @Column(name = "title")
     private String title;
+
+    @Column(name = "artist")
     private String artist;
+
+    @Column(name = "album_image")
     private String albumImage;
 
     @CreationTimestamp
+    @Column(name = "created_at")
     private Timestamp createdAt;
+
     @UpdateTimestamp
-    private Timestamp updateAt;
+    @Column(name = "updated_at")
+    private Timestamp updatedAt;
 
     @Builder
     public SpotifyMusic (Long spotifyId, String title, String artist, String albumImage) {

src/main/java/org/dfbf/soundlink/domain/user/dto/response/UserGetDto.java

@@ -12,7 +12,7 @@ public record UserGetDto(
 ) {
     public UserGetDto(User user) {
         this(
-                user.getNickName(),
+                user.getNickname(),
                 user.getEmail(),
                 user.getLoginId(),
                 formatTimestamp(user.getCreatedAt())

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

@@ -17,6 +17,7 @@
 public class ProfileMusic {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @JoinColumn(name = "profile_music_id")
     private Long profileMusicId;
 
     @OneToOne(cascade = CascadeType.REMOVE)
@@ -28,9 +29,12 @@ public class ProfileMusic {
     private SpotifyMusic spotifyMusic;
 
     @CreationTimestamp
-    private Timestamp createAt;
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+
     @UpdateTimestamp
-    private Timestamp updateAt;
+    @Column(name = "updated_at")
+    private Timestamp updatedAt;
 
     @Builder
     public ProfileMusic(User user, SpotifyMusic spotifyMusic) {

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

@@ -19,40 +19,39 @@
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "user_id")
     private Long userId;
 
-    @Column(unique = true)
-    private String nickName;
+    @Column(name = "nickname", unique = true)
+    private String nickname;
 
     @Enumerated(EnumType.STRING)
+    @Column(name = "social_type")
     private SocialType socialType;
 
-    @Column(nullable = true)
+    @Column(name = "social_id", nullable = true)
     private Long socialId;
 
     @Column(name="login_id")
     private String loginId;
 
+    @Column(name="password")
     private String password;
-    private String email;
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.REMOVE)
-    private List<Blocklist> blocklist;
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.REMOVE)
-    private List<EmotionRecord> emotionRecord;
 
-    @OneToOne(mappedBy = "user", cascade = CascadeType.REMOVE)
-    private ProfileMusic profileMusic;
+    @Column(name="email")
+    private String email;
 
     @CreationTimestamp
+    @Column(name = "created_at")
     private Timestamp createdAt;
+
     @UpdateTimestamp
-    private Timestamp updateAt;
+    @Column(name = "updated_at")
+    private Timestamp updatedAt;
 
     @Builder
     User(String nickName, Long socialId, SocialType socialType, String loginId, String password, String email) {
-        this.nickName = nickName;
+        this.nickname = nickName;
         this.socialId = socialId;
         this.socialType = socialType;
         this.loginId = loginId;
@@ -61,7 +60,7 @@ public class User {
     }
 
     public void update(UserUpdateDto userUpdateDto, BCryptPasswordEncoder passwordEncoder) {
-        this.nickName = userUpdateDto.nickName();
+        this.nickname = userUpdateDto.nickName();
         this.loginId = userUpdateDto.loginId();
         this.password = passwordEncoder.encode(userUpdateDto.password());
         this.email = userUpdateDto.email();
@@ -81,6 +80,6 @@ public void update(UserUpdateDto userUpdateDto, BCryptPasswordEncoder passwordEn
  * CascadeType.REMOVE -> 부모 엔티티가 삭제될 때 자식 엔티티는 삭제
  * orphanRemoval = true -> 자식 엔티티가 부모와의 관계에서 제거될 때 삭제
  * 가끔 사용하지 않는 데이터가 DB에 남아있는 경우가 있는데, 이를 방지하기 위해 사용
- * 혹은 User쪽에 있는 리스트에서 제거할 경우, 양방향 매핑이기 떄문에 자식이 고아가 댐 -> 이를 위헤서  orphanRemoval를 사용
+ * 혹은 User쪽에 있는 리스트에서 제거할 경우, 양방향 매핑이기 떄문에 자식이 고아가 댐 -> 이를 위헤서 orphanRemoval를 사용
  * 근데 우린 사용 안하니까 사실 빼도 무방할 듯....
  */

src/main/java/org/dfbf/soundlink/domain/user/repository/UserRepository.java

@@ -11,14 +11,14 @@
 public interface UserRepository extends JpaRepository<User, Long> {
     boolean existsByEmail(String email);
 
-    boolean existsByNickName(String nickName);
+    boolean existsByNickname(String nickName);
 
     Optional<User> findById(Long id);
 
     // JPQL에서는 Inner Class에 직접 값을 넣을 수 있도록 하는 기능은 지원하지 않는다.
     @Query(
             "SELECT new org.dfbf.soundlink.domain.user.dto.response.UserMyPageDto(" +
-                    "u.email, u.loginId, u.nickName," +
+                    "u.email, u.loginId, u.nickname," +
                     "new org.dfbf.soundlink.domain.user.dto.response.ProfileMusic(" +
                     "pm.spotifyMusic.spotifyId, pm.spotifyMusic.title, pm.spotifyMusic.artist, pm.spotifyMusic.albumImage)) " +
                     "FROM User u " +

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

@@ -169,7 +169,7 @@ public ResponseResult checkEmail(String email){
 
     //닉네임 중복 확인
     public ResponseResult checkNickName(String nickName){
-        boolean exists =userRepository.existsByNickName(nickName);
+        boolean exists =userRepository.existsByNickname(nickName);
         if(exists){
             return new ResponseResult(ErrorCode.DUPLICATE_NICKNAME);
         }