merge: pull request #25 from feat/user/1

HYEONSIKOH · web-flow · commit d554bf452b4c · 2025-02-24T17:38:38.000+09:00
Feat/user/1
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    java
+    id("java")
     id("org.springframework.boot") version "3.4.2"
     id("io.spring.dependency-management") version "1.1.7"
 }
@@ -76,7 +76,7 @@ dependencies {
     // validation
     implementation("org.springframework.boot:spring-boot-starter-validation")
 
-    // Feign
+    // Feign -> NETFLIX API 통신 라이브러리
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
 
     // Mail
diff --git a/src/main/generated/org/dfbf/soundlink/domain/blocklist/entity/QBlocklist.java b/src/main/generated/org/dfbf/soundlink/domain/blocklist/entity/QBlocklist.java
@@ -50,8 +50,8 @@ public QBlocklist(PathMetadata metadata, PathInits inits) {
 
     public QBlocklist(Class<? extends Blocklist> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.blockedUser = inits.isInitialized("blockedUser") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("blockedUser")) : null;
-        this.user = inits.isInitialized("user") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("user")) : null;
+        this.blockedUser = inits.isInitialized("blockedUser") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("blockedUser"), inits.get("blockedUser")) : null;
+        this.user = inits.isInitialized("user") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("user"), inits.get("user")) : null;
     }
 
 }
diff --git a/src/main/generated/org/dfbf/soundlink/domain/emotionRecord/entity/QEmotionRecord.java b/src/main/generated/org/dfbf/soundlink/domain/emotionRecord/entity/QEmotionRecord.java
@@ -55,7 +55,7 @@ public QEmotionRecord(PathMetadata metadata, PathInits inits) {
     public QEmotionRecord(Class<? extends EmotionRecord> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.spotifyMusic = inits.isInitialized("spotifyMusic") ? new QSpotifyMusic(forProperty("spotifyMusic")) : null;
-        this.user = inits.isInitialized("user") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("user")) : null;
+        this.user = inits.isInitialized("user") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("user"), inits.get("user")) : null;
     }
 
 }
diff --git a/src/main/generated/org/dfbf/soundlink/domain/user/entity/QProfileMusic.java b/src/main/generated/org/dfbf/soundlink/domain/user/entity/QProfileMusic.java
@@ -30,8 +30,6 @@ public class QProfileMusic extends EntityPathBase<ProfileMusic> {
 
     public final DateTimePath<java.sql.Timestamp> updatedAt = createDateTime("updatedAt", java.sql.Timestamp.class);
 
-    public final QUser user;
-
     public QProfileMusic(String variable) {
         this(ProfileMusic.class, forVariable(variable), INITS);
     }
@@ -51,7 +49,6 @@ public QProfileMusic(PathMetadata metadata, PathInits inits) {
     public QProfileMusic(Class<? extends ProfileMusic> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.spotifyMusic = inits.isInitialized("spotifyMusic") ? new org.dfbf.soundlink.domain.emotionRecord.entity.QSpotifyMusic(forProperty("spotifyMusic")) : null;
-        this.user = inits.isInitialized("user") ? new QUser(forProperty("user")) : null;
     }
 
 }
diff --git a/src/main/generated/org/dfbf/soundlink/domain/user/entity/QUser.java b/src/main/generated/org/dfbf/soundlink/domain/user/entity/QUser.java
@@ -7,6 +7,7 @@
 import com.querydsl.core.types.PathMetadata;
 import javax.annotation.processing.Generated;
 import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.PathInits;
 
 
 /**
@@ -17,6 +18,8 @@ public class QUser extends EntityPathBase<User> {
 
     private static final long serialVersionUID = -2109140326L;
 
+    private static final PathInits INITS = PathInits.DIRECT2;
+
     public static final QUser user = new QUser("user");
 
     public final DateTimePath<java.sql.Timestamp> createdAt = createDateTime("createdAt", java.sql.Timestamp.class);
@@ -29,6 +32,8 @@ public class QUser extends EntityPathBase<User> {
 
     public final StringPath password = createString("password");
 
+    public final QProfileMusic profileMusic;
+
     public final NumberPath<Long> socialId = createNumber("socialId", Long.class);
 
     public final EnumPath<org.dfbf.soundlink.global.comm.enums.SocialType> socialType = createEnum("socialType", org.dfbf.soundlink.global.comm.enums.SocialType.class);
@@ -38,15 +43,24 @@ public class QUser extends EntityPathBase<User> {
     public final NumberPath<Long> userId = createNumber("userId", Long.class);
 
     public QUser(String variable) {
-        super(User.class, forVariable(variable));
+        this(User.class, forVariable(variable), INITS);
     }
 
     public QUser(Path<? extends User> path) {
-        super(path.getType(), path.getMetadata());
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
     }
 
     public QUser(PathMetadata metadata) {
-        super(User.class, metadata);
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QUser(PathMetadata metadata, PathInits inits) {
+        this(User.class, metadata, inits);
+    }
+
+    public QUser(Class<? extends User> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.profileMusic = inits.isInitialized("profileMusic") ? new QProfileMusic(forProperty("profileMusic"), inits.get("profileMusic")) : null;
     }
 
 }
diff --git a/src/main/java/org/dfbf/soundlink/domain/emotionRecord/controller/EmotionRecordController.java b/src/main/java/org/dfbf/soundlink/domain/emotionRecord/controller/EmotionRecordController.java
@@ -24,6 +24,7 @@ public class EmotionRecordController {
             summary = "감정 기록 작성/저장 API",
             description = "작성한 감정 기록을 저장합니다."
     )
+
     public ResponseResult saveEmotionWithMusic(
             @AuthenticationPrincipal Long userId,
             @Valid @RequestBody EmotionRecordRequestDTO request) {
diff --git a/src/main/java/org/dfbf/soundlink/domain/emotionRecord/entity/SpotifyMusic.java b/src/main/java/org/dfbf/soundlink/domain/emotionRecord/entity/SpotifyMusic.java
@@ -16,6 +16,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class SpotifyMusic {
     @Id
+    @Column(name = "spotify_id")
     private Long spotifyId;
 
     @Column(name = "title")
diff --git a/src/main/java/org/dfbf/soundlink/domain/emotionRecord/mock/TestDataInitializer.java b/src/main/java/org/dfbf/soundlink/domain/emotionRecord/mock/TestDataInitializer.java
@@ -1,9 +1,7 @@
 package org.dfbf.soundlink.domain.emotionRecord.mock;
 
 import lombok.RequiredArgsConstructor;
-import org.dfbf.soundlink.domain.user.entity.User;
 import org.dfbf.soundlink.domain.user.repository.UserRepository;
-import org.dfbf.soundlink.global.comm.enums.SocialType;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/org/dfbf/soundlink/domain/emotionRecord/repository/EmotionRecordRepository.java b/src/main/java/org/dfbf/soundlink/domain/emotionRecord/repository/EmotionRecordRepository.java
@@ -1,6 +1,7 @@
 package org.dfbf.soundlink.domain.emotionRecord.repository;
 
 import org.dfbf.soundlink.domain.emotionRecord.entity.EmotionRecord;
+import org.dfbf.soundlink.domain.emotionRecord.repository.dsl.EmotionRecordRepositoryCustom;
 import org.dfbf.soundlink.domain.user.dto.response.EmotionRecordDto;
 import org.dfbf.soundlink.domain.user.entity.User;
 import org.springframework.data.domain.Page;
@@ -13,18 +14,12 @@
 import java.util.Optional;
 
 @Repository
-public interface EmotionRecordRepository extends JpaRepository<EmotionRecord, Long> {
+public interface EmotionRecordRepository extends JpaRepository<EmotionRecord, Long>, EmotionRecordRepositoryCustom {
 
     @Modifying(clearAutomatically = true)
     @Query("DELETE FROM EmotionRecord e WHERE e.user = :user")
     public void deleteByUser(@Param("user") User user);
 
-    @Query( "SELECT new org.dfbf.soundlink.domain.user.dto.response.EmotionRecordDto" +
-            "(er.spotifyMusic.spotifyId, er.spotifyMusic.title, er.spotifyMusic.artist, er.spotifyMusic.albumImage, er.emotion, er.comment, er.createdAt) " +
-            "FROM EmotionRecord er " +
-            "WHERE er.user = :user" )
-    List<EmotionRecordDto> findByUser(@Param("user") User user);
-
     @Query("SELECT er FROM EmotionRecord er " +
             "JOIN FETCH er.user u " +
             "JOIN FETCH er.spotifyMusic sm " +
diff --git a/src/main/java/org/dfbf/soundlink/domain/emotionRecord/repository/dsl/EmotionRecordRepositoryCustom.java b/src/main/java/org/dfbf/soundlink/domain/emotionRecord/repository/dsl/EmotionRecordRepositoryCustom.java
@@ -0,0 +1,11 @@
+package org.dfbf.soundlink.domain.emotionRecord.repository.dsl;
+
+import org.dfbf.soundlink.domain.user.dto.response.EmotionRecordDto;
+import org.dfbf.soundlink.domain.user.entity.User;
+
+import java.util.List;
+
+public interface EmotionRecordRepositoryCustom {
+
+    List<EmotionRecordDto> findByUser(User user);
+}
diff --git a/src/main/java/org/dfbf/soundlink/domain/emotionRecord/repository/dsl/EmotionRecordRepositoryImpl.java b/src/main/java/org/dfbf/soundlink/domain/emotionRecord/repository/dsl/EmotionRecordRepositoryImpl.java
@@ -0,0 +1,37 @@
+package org.dfbf.soundlink.domain.emotionRecord.repository.dsl;
+
+import com.querydsl.core.types.Projections;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.dfbf.soundlink.domain.emotionRecord.entity.QEmotionRecord;
+import org.dfbf.soundlink.domain.user.dto.response.EmotionRecordDto;
+import org.dfbf.soundlink.domain.user.entity.User;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+@RequiredArgsConstructor
+public class EmotionRecordRepositoryImpl implements EmotionRecordRepositoryCustom {
+
+    private final JPAQueryFactory jpaQueryFactory;
+
+    @Override
+    public List<EmotionRecordDto> findByUser(User user) {
+        return jpaQueryFactory
+                .select(Projections.constructor(
+                        EmotionRecordDto.class,
+                        QEmotionRecord.emotionRecord.spotifyMusic.spotifyId,
+                        QEmotionRecord.emotionRecord.spotifyMusic.title,
+                        QEmotionRecord.emotionRecord.spotifyMusic.artist,
+                        QEmotionRecord.emotionRecord.spotifyMusic.albumImage,
+                        QEmotionRecord.emotionRecord.emotion,
+                        QEmotionRecord.emotionRecord.comment,
+                        QEmotionRecord.emotionRecord.createdAt
+                ))
+                .from(QEmotionRecord.emotionRecord)
+                .where(QEmotionRecord.emotionRecord.user.eq(user))
+                .fetch();
+
+    }
+}
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/controller/MailController.java b/src/main/java/org/dfbf/soundlink/domain/user/controller/MailController.java
@@ -7,12 +7,9 @@
 import org.dfbf.soundlink.domain.user.repository.UserRepository;
 import org.dfbf.soundlink.domain.user.service.MailService;
 import org.dfbf.soundlink.domain.user.service.UserService;
-import org.dfbf.soundlink.global.exception.ErrorCode;
 import org.dfbf.soundlink.global.exception.ResponseResult;
 import org.springframework.web.bind.annotation.*;
 
-import javax.naming.AuthenticationException;
-
 @RestController
 @RequestMapping("/api/mail")
 @RequiredArgsConstructor
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/controller/UserController.java b/src/main/java/org/dfbf/soundlink/domain/user/controller/UserController.java
@@ -34,8 +34,8 @@ public ResponseResult checkNickName(@RequestParam String nickName){
 
     @GetMapping("/checkLoginId")
     @Operation(summary = "LoginId 중복 확인", description = "LoginId가 이미 사용중인지 확인.")
-    public ResponseResult checkLoginiId(@RequestParam String loginiId){
-        return userService.checkLoginiId(loginiId);
+    public ResponseResult checkLoginiId(@RequestParam String loginId){
+        return userService.checkLoginiId(loginId);
     }
 
     @GetMapping
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/dto/response/UserMyPageDto.java b/src/main/java/org/dfbf/soundlink/domain/user/dto/response/UserMyPageDto.java
@@ -12,11 +12,17 @@ public class UserMyPageDto {
     private final String nickname;
     private final ProfileMusic profileMusic;
 
-    public UserMyPageDto(String loginId, String nickname, ProfileMusic profileMusic) {
+    public UserMyPageDto(String loginId, String nickname, Long spotifyId, String title, String artist, String album) {
         this.loginId = loginId;
         this.nickname = nickname;
-        this.profileMusic = profileMusic;
+        this.profileMusic = new ProfileMusic(spotifyId, title, artist, album);
     }
+
+//    public UserMyPageDto(String loginId, String nickname, Long profileMusicId) {
+//        this.loginId = loginId;
+//        this.nickname = nickname;
+//        this.profileMusicId = profileMusicId;
+//    }
 }
 
 // Inner 레코드
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/entity/ProfileMusic.java b/src/main/java/org/dfbf/soundlink/domain/user/entity/ProfileMusic.java
@@ -4,7 +4,6 @@
 import jakarta.persistence.Id;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import org.dfbf.soundlink.domain.emotionRecord.entity.SpotifyMusic;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
@@ -13,17 +12,12 @@
 
 @Entity
 @Getter
-@NoArgsConstructor
 public class ProfileMusic {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @JoinColumn(name = "profile_music_id")
     private Long profileMusicId;
 
-    @OneToOne(cascade = CascadeType.REMOVE)
-    @JoinColumn(name = "user_id")
-    private User user;
-
     @ManyToOne
     @JoinColumn(name = "spotify_id")
     private SpotifyMusic spotifyMusic;
@@ -37,9 +31,8 @@ public class ProfileMusic {
     private Timestamp updatedAt;
 
     @Builder
-    public ProfileMusic(User user, SpotifyMusic spotifyMusic) {
-        this.user = user;
-        this.spotifyMusic = spotifyMusic;
+    public ProfileMusic(SpotifyMusic sm) {
+        this.spotifyMusic = sm;
     }
 
     public void update(SpotifyMusic spotifyMusic) {
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/entity/User.java b/src/main/java/org/dfbf/soundlink/domain/user/entity/User.java
@@ -2,16 +2,14 @@
 
 import jakarta.persistence.*;
 import lombok.*;
-import org.dfbf.soundlink.domain.blocklist.entity.Blocklist;
-import org.dfbf.soundlink.domain.emotionRecord.entity.EmotionRecord;
+import org.dfbf.soundlink.domain.emotionRecord.entity.SpotifyMusic;
 import org.dfbf.soundlink.domain.user.dto.request.UserUpdateDto;
 import org.dfbf.soundlink.global.comm.enums.SocialType;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.sql.Timestamp;
-import java.util.List;
 
 @Entity
 @Getter
@@ -22,6 +20,10 @@ public class User {
     @Column(name = "user_id")
     private Long userId;
 
+    @OneToOne (cascade = CascadeType.PERSIST)
+    @JoinColumn(name = "profile_music_id")
+    private ProfileMusic profileMusic;
+
     @Column(name = "nickname", unique = true)
     private String nickname;
 
@@ -57,13 +59,15 @@ public class User {
         this.loginId = loginId;
         this.password = password;
         this.email = email;
+        this.profileMusic = new ProfileMusic(null);
     }
 
-    public void update(UserUpdateDto userUpdateDto, BCryptPasswordEncoder passwordEncoder) {
+    public void update(UserUpdateDto userUpdateDto, BCryptPasswordEncoder passwordEncoder, SpotifyMusic spotifyMusic) {
         this.nickname = userUpdateDto.nickName();
         this.loginId = userUpdateDto.loginId();
         this.password = passwordEncoder.encode(userUpdateDto.password());
         this.email = userUpdateDto.email();
+        this.profileMusic.update(spotifyMusic);
     }
 }
 
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/repository/ProfileMusicRepository.java b/src/main/java/org/dfbf/soundlink/domain/user/repository/ProfileMusicRepository.java
@@ -13,13 +13,6 @@
 
 @Repository
 public interface ProfileMusicRepository extends JpaRepository<ProfileMusic, Long> {
-
-    @Query("SELECT p FROM ProfileMusic p WHERE p.user.userId = :userId" )
-    Optional<ProfileMusic> findByUserId(@Param("userId") Long userId);
-
-    @Modifying(clearAutomatically = true)
-    @Query("DELETE FROM ProfileMusic p WHERE p.user = :user")
-    public void deleteByUser(@Param("user") User user);
 }
 
 /**
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/repository/UserRepository.java b/src/main/java/org/dfbf/soundlink/domain/user/repository/UserRepository.java
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserCustomerRepository.java b/src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserCustomerRepository.java
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserQueryRepository.java b/src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserQueryRepository.java
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserRepositoryCustom.java b/src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserRepositoryCustom.java
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserRepositoryImpl.java b/src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserRepositoryImpl.java
diff --git a/src/main/java/org/dfbf/soundlink/domain/user/service/UserService.java b/src/main/java/org/dfbf/soundlink/domain/user/service/UserService.java
diff --git a/src/main/java/org/dfbf/soundlink/global/Controller.java b/src/main/java/org/dfbf/soundlink/global/Controller.java
diff --git a/src/test/java/org/dfbf/soundlink/domain/user/UserServiceTest.java b/src/test/java/org/dfbf/soundlink/domain/user/UserServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ public QBlocklist(PathMetadata metadata, PathInits inits) {`
`50`	`50`
`51`	`51`	`public QBlocklist(Class<? extends Blocklist> type, PathMetadata metadata, PathInits inits) {`
`52`	`52`	`super(type, metadata, inits);`
`53`		`- this.blockedUser = inits.isInitialized("blockedUser") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("blockedUser")) : null;`
`54`		`- this.user = inits.isInitialized("user") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("user")) : null;`
	`53`	`+ this.blockedUser = inits.isInitialized("blockedUser") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("blockedUser"), inits.get("blockedUser")) : null;`
	`54`	`+ this.user = inits.isInitialized("user") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("user"), inits.get("user")) : null;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public QEmotionRecord(PathMetadata metadata, PathInits inits) {`
`55`	`55`	`public QEmotionRecord(Class<? extends EmotionRecord> type, PathMetadata metadata, PathInits inits) {`
`56`	`56`	`super(type, metadata, inits);`
`57`	`57`	`this.spotifyMusic = inits.isInitialized("spotifyMusic") ? new QSpotifyMusic(forProperty("spotifyMusic")) : null;`
`58`		`- this.user = inits.isInitialized("user") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("user")) : null;`
	`58`	`+ this.user = inits.isInitialized("user") ? new org.dfbf.soundlink.domain.user.entity.QUser(forProperty("user"), inits.get("user")) : null;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ public class QProfileMusic extends EntityPathBase<ProfileMusic> {`
`30`	`30`
`31`	`31`	`public final DateTimePath<java.sql.Timestamp> updatedAt = createDateTime("updatedAt", java.sql.Timestamp.class);`
`32`	`32`
`33`		`- public final QUser user;`
`34`		`-`
`35`	`33`	`public QProfileMusic(String variable) {`
`36`	`34`	`this(ProfileMusic.class, forVariable(variable), INITS);`
`37`	`35`	`}`
`@@ -51,7 +49,6 @@ public QProfileMusic(PathMetadata metadata, PathInits inits) {`
`51`	`49`	`public QProfileMusic(Class<? extends ProfileMusic> type, PathMetadata metadata, PathInits inits) {`
`52`	`50`	`super(type, metadata, inits);`
`53`	`51`	`this.spotifyMusic = inits.isInitialized("spotifyMusic") ? new org.dfbf.soundlink.domain.emotionRecord.entity.QSpotifyMusic(forProperty("spotifyMusic")) : null;`
`54`		`- this.user = inits.isInitialized("user") ? new QUser(forProperty("user")) : null;`
`55`	`52`	`}`
`56`	`53`
`57`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public class EmotionRecordController {`
`24`	`24`	`summary = "감정 기록 작성/저장 API",`
`25`	`25`	`description = "작성한 감정 기록을 저장합니다."`
`26`	`26`	`)`
	`27`	`+`
`27`	`28`	`public ResponseResult saveEmotionWithMusic(`
`28`	`29`	`@AuthenticationPrincipal Long userId,`
`29`	`30`	`@Valid @RequestBody EmotionRecordRequestDTO request) {`