refactor: JPQL을 QueryDSL로 변환

Author: HYEONSIKOH

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 " +

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);
+}

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();
+
+    }
+}

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

@@ -2,13 +2,12 @@
 
 import org.dfbf.soundlink.domain.user.dto.response.UserMyPageDto;
 import org.dfbf.soundlink.domain.user.entity.User;
+import org.dfbf.soundlink.domain.user.repository.dsl.UserRepositoryCustom;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
-public interface UserRepository extends JpaRepository<User, Long>, org.dfbf.soundlink.domain.user.repository.dsl.UserRepositoryCustom {
+public interface UserRepository extends JpaRepository<User, Long>, UserRepositoryCustom {
     boolean existsByEmail(String email);
 
     boolean existsByNickname(String nickName);
@@ -17,10 +16,5 @@ public interface UserRepository extends JpaRepository<User, Long>, org.dfbf.soun
 
     Optional<User> findById(Long id);
 
-    // 로그인관련
     Optional<User> findByLoginId(String loginId);
-    
-    // 비밀번호만 조회
-    @Query("Select u.password from User u  where u.loginId =:loginId ")
-    String findPasswordByLoginId(@Param("loginId")String loginId);
 }

src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserRepositoryCustom.java

@@ -11,4 +11,6 @@ public interface UserRepositoryCustom {
     UserMyPageDto findUserMyPageDtoByUserId(Long userId);
 
     Optional<UserMyPageDto> findUserMyPageDtoByLoginId(@Param("loginId") String loginId);
+
+    String findPasswordByLoginId(String loginId);
 }

src/main/java/org/dfbf/soundlink/domain/user/repository/dsl/UserRepositoryImpl.java

@@ -17,8 +17,6 @@
 public class UserRepositoryImpl implements UserRepositoryCustom {
     private final JPAQueryFactory jpaQueryFactory;
 
-    QUser user = QUser.user;
-    QProfileMusic profileMusic = QProfileMusic.profileMusic;
 
     @Override
     public UserMyPageDto findUserMyPageDtoByUserId(Long userId) {
@@ -57,4 +55,13 @@ public Optional<UserMyPageDto> findUserMyPageDtoByLoginId(String loginId) {
                 .where(QUser.user.loginId.eq(loginId))
                 .fetchOne());
     }
+
+    @Override
+    public String findPasswordByLoginId(String loginId) {
+        return jpaQueryFactory
+                .select(QUser.user.password)
+                .from(QUser.user)
+                .where(QUser.user.loginId.eq(loginId))
+                .fetchOne();
+    }
 }