Merge pull request #42 from prgrms-web-devcourse-final-project/feat/emotionRecord/search

zizi0308 · web-flow · commit 849d406a066f · 2025-02-28T12:19:41.000+09:00
감정 기록 검색 기능 및 기타 감정기록 관련 수정
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
@@ -1,6 +1,7 @@
 package org.dfbf.soundlink.domain.emotionRecord.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -11,6 +12,8 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/emotion")
 @RequiredArgsConstructor
@@ -34,13 +37,17 @@ public ResponseResult saveEmotionWithMusic(
     @GetMapping
     @Operation(
             summary = "감정 기록 전체 조회 메인 API",
-            description = "유저들이 작성한 감정 기록 전체를 조회합니다.(자신의 아이디에 해당하는 감정 기록은 조회되지 않습니다.)"
+            description = "유저들이 작성한 감정 기록 전체를 조회합니다. 자신의 아이디에 해당하는 감정 기록은 조회되지 않으며," +
+                    " 주어진 spotifyId와 emotion을 가진 감정 기록을 검색 할 수 있습니다. 검색 조건이 없으면 전체 조회합니다."
     )
     public ResponseResult getEmotionRecordsWithoutMine(
             @AuthenticationPrincipal Long userId,
+            @RequestParam(required = false) String spotifyId,
+            @Parameter(description = "감정 필터(추가 가능)")
+            @RequestParam(required = false) List<String> emotions,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size) {
-        return emotionRecordService.getEmotionRecordsExcludingUserId(userId, page, size);
+        return emotionRecordService.getEmotionRecordsExcludingUserIdByFilters(userId, emotions, spotifyId, page, size);
     }
 
     @GetMapping("/user")
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
@@ -3,6 +3,7 @@
 import org.dfbf.soundlink.domain.emotionRecord.entity.EmotionRecord;
 import org.dfbf.soundlink.domain.user.dto.response.EmotionRecordDto;
 import org.dfbf.soundlink.domain.user.entity.User;
+import org.dfbf.soundlink.global.comm.enums.Emotions;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -15,7 +16,7 @@ public interface EmotionRecordRepositoryCustom {
 
     Page<EmotionRecord> findByLoginId(String loginId, Pageable pageable);
 
-    Page<EmotionRecord> findByWithoutUserId(Long userId, Pageable pageable);
+    Page<EmotionRecord> findByFilters(Long userId, List<Emotions> emotions, String spotifyId, Pageable pageable);
 
     Optional<EmotionRecord> findByRecordId(Long recordId);
 
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
@@ -1,6 +1,7 @@
 package org.dfbf.soundlink.domain.emotionRecord.repository.dsl;
 
 import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.dfbf.soundlink.domain.emotionRecord.entity.EmotionRecord;
@@ -9,9 +10,10 @@
 import org.dfbf.soundlink.domain.user.dto.response.EmotionRecordDto;
 import org.dfbf.soundlink.domain.user.entity.QUser;
 import org.dfbf.soundlink.domain.user.entity.User;
+import org.dfbf.soundlink.global.comm.enums.Emotions;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -50,48 +52,56 @@ public Page<EmotionRecord> findByLoginId(String loginId, Pageable pageable) {
                 .join(QEmotionRecord.emotionRecord.user, QUser.user).fetchJoin()
                 .join(QEmotionRecord.emotionRecord.spotifyMusic, QSpotifyMusic.spotifyMusic).fetchJoin()
                 .where(QUser.user.loginId.eq(loginId))
+                .orderBy(QEmotionRecord.emotionRecord.createdAt.desc())
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();
 
         // Spring Data JPA에서 페이징 처리를 위한 메서드 사용 시,
         // 내부적으로 데이터(페이징된 결과)를 가져오는 쿼리와 전체 데이터 수를 계산하는 쿼리가 둘 다 실행됨
         // QueryDSL을 사용할 경우에 위와 달리 데이터 수 계산 쿼리를 별도로 실행해 줘야함 (Querydsl 5 이상 권장 방식)
-        long total = Optional.ofNullable(
-                jpaQueryFactory
-                .select(QEmotionRecord.emotionRecord.count())
-                .from(QEmotionRecord.emotionRecord)
-                .join(QEmotionRecord.emotionRecord.user, QUser.user)
-                .where(QUser.user.loginId.eq(loginId))
-                .fetchOne()
-        ).orElse(0L);
-
-        return new PageImpl<>(emotionRecords, pageable, total);
+        return PageableExecutionUtils.getPage(emotionRecords, pageable, () ->
+                Optional.ofNullable(
+                        jpaQueryFactory
+                                .select(QEmotionRecord.emotionRecord.count())
+                                .from(QEmotionRecord.emotionRecord)
+                                .join(QEmotionRecord.emotionRecord.user, QUser.user)
+                                .where(QUser.user.loginId.eq(loginId))
+                                .fetchOne()
+                ).orElse(0L)
+        );
     }
 
-    // 로그인 된 userId를 제외한 EmotionRecord 조회 (LEFT JOIN으로 spotifyMusic 포함) 후 페이징처리
-    @Override
-    public Page<EmotionRecord> findByWithoutUserId(Long userId, Pageable pageable) {
+    // 동적으로 필터링 후 EmotionRecords를 가져오는 쿼리
+    public Page<EmotionRecord> findByFilters(Long userId, List<Emotions> emotions, String spotifyId, Pageable pageable) {
         List<EmotionRecord> emotionRecords = jpaQueryFactory
                 .selectFrom(QEmotionRecord.emotionRecord)
                 .join(QEmotionRecord.emotionRecord.user, QUser.user).fetchJoin()
                 .leftJoin(QEmotionRecord.emotionRecord.spotifyMusic, QSpotifyMusic.spotifyMusic).fetchJoin()
-                .where(QUser.user.userId.ne(userId))
+                .where(
+                        excludeUserId(userId),
+                        filterByEmotions(emotions),
+                        filterBySpotifyId(spotifyId)
+                )
+                .orderBy(QEmotionRecord.emotionRecord.createdAt.desc())
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();
 
         // 위의 findByLoginId 메서드 설명 참고
-        long total = Optional.ofNullable(
-                jpaQueryFactory
-                .select(QEmotionRecord.emotionRecord.count())
-                .from(QEmotionRecord.emotionRecord)
-                .join(QEmotionRecord.emotionRecord.user, QUser.user)
-                .where(QUser.user.userId.ne(userId))
-                .fetchOne()
-        ).orElse(0L);
-
-        return new PageImpl<>(emotionRecords, pageable, total);
+        return PageableExecutionUtils.getPage(emotionRecords, pageable, () ->
+                Optional.ofNullable(
+                        jpaQueryFactory
+                                .select(QEmotionRecord.emotionRecord.count())
+                                .from(QEmotionRecord.emotionRecord)
+                                .join(QEmotionRecord.emotionRecord.user, QUser.user)
+                                .where(
+                                        excludeUserId(userId),          // 로그인 된 userId를 제외한 EmotionRecord 조회
+                                        filterByEmotions(emotions),     // 감정이 있을 경우
+                                        filterBySpotifyId(spotifyId)    // spotifyId 있을 경우
+                                )
+                                .fetchOne()
+                ).orElse(0L));
     }
 
     // recordId에 해당하는 EmotionRecord 조회
@@ -107,9 +117,21 @@ public Optional<EmotionRecord> findByRecordId(Long recordId) {
     // recordId에 해당하는 EmotionRecord 삭제
     @Override
     public int deleteByRecordId(Long recordId) {
-        return (int)jpaQueryFactory
+        return (int) jpaQueryFactory
                 .delete(QEmotionRecord.emotionRecord)
                 .where(QEmotionRecord.emotionRecord.recordId.eq(recordId))
                 .execute();
     }
+
+    private BooleanExpression excludeUserId(Long userId) {
+        return userId != null ? QUser.user.userId.ne(userId) : null;
+    }
+
+    private BooleanExpression filterByEmotions(List<Emotions> emotions) {
+        return (emotions != null && !emotions.isEmpty()) ? QEmotionRecord.emotionRecord.emotion.in(emotions) : null;
+    }
+
+    private BooleanExpression filterBySpotifyId(String spotifyId) {
+        return (spotifyId != null && !spotifyId.isBlank()) ? QSpotifyMusic.spotifyMusic.spotifyId.eq(spotifyId) : null;
+    }
 }
diff --git a/src/main/java/org/dfbf/soundlink/domain/emotionRecord/service/EmotionRecordService.java b/src/main/java/org/dfbf/soundlink/domain/emotionRecord/service/EmotionRecordService.java
@@ -13,6 +13,7 @@
 import org.dfbf.soundlink.domain.emotionRecord.repository.SpotifyMusicRepository;
 import org.dfbf.soundlink.domain.user.entity.User;
 import org.dfbf.soundlink.domain.user.repository.UserRepository;
+import org.dfbf.soundlink.global.comm.enums.Emotions;
 import org.dfbf.soundlink.global.exception.ErrorCode;
 import org.dfbf.soundlink.global.exception.ResponseResult;
 import org.springframework.dao.DataAccessException;
@@ -72,8 +73,14 @@ public ResponseResult saveEmotionRecordWithMusic(Long userId, EmotionRecordReque
 
     @Transactional(readOnly = true)
     public ResponseResult getEmotionRecordsByLoginId(String userTag, int page, int size) {
+        Pageable pageable;
+
+        try {
+            pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
+        } catch (IllegalArgumentException e) {
+            return new ResponseResult(ErrorCode.INVALID_PAGE_REQUEST, "페이지 요청 값이 잘못되었습니다.");
+        }
         try {
-            Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
             Page<EmotionRecord> recordsPage = emotionRecordRepository.findByLoginId(userTag, pageable);
 
             List<EmotionRecordResponseWithoutNicknameDTO> dtoList = recordsPage.getContent()
@@ -89,12 +96,28 @@ public ResponseResult getEmotionRecordsByLoginId(String userTag, int page, int s
         }
     }
 
-    public ResponseResult getEmotionRecordsExcludingUserId(Long userId, int page, int size) {
+    public ResponseResult getEmotionRecordsExcludingUserIdByFilters(Long userId, List<String> emotionList, String spotifyId, int page, int size) {
+        Pageable pageable;
+        List<Emotions> emotionEnums = null;
 
         try {
-            Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
-            Page<EmotionRecord> recordsPage = emotionRecordRepository.findByWithoutUserId(userId, pageable);
+            pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
+        } catch (IllegalArgumentException e) {
+            return new ResponseResult(ErrorCode.INVALID_PAGE_REQUEST, "페이지 요청 값이 잘못되었습니다.");
+        }
 
+        if (emotionList != null && !emotionList.isEmpty()) {
+            try {
+                emotionEnums = emotionList.stream()
+                        .map(e -> Emotions.valueOf(e.toUpperCase()))
+                        .toList();
+            } catch (IllegalArgumentException e) {
+                return new ResponseResult(ErrorCode.FAIL_TO_FIND_EMOTION, "잘못된 감정 값이 포함되어 있습니다.");
+            }
+        }
+
+        try {
+            Page<EmotionRecord> recordsPage = emotionRecordRepository.findByFilters(userId, emotionEnums, spotifyId, pageable);
             List<EmotionRecordResponseMainDTO> dtoList = recordsPage.getContent()
                     .stream()
                     .map(EmotionRecordResponseMainDTO::fromEntity)
@@ -114,6 +137,7 @@ public ResponseResult getEmotionRecord(Long userId, Long recordId) {
         try {
             EmotionRecord records = emotionRecordRepository.findByRecordId(recordId)
                     .orElseThrow(EmotionRecordNotFoundException::new);
+
             return new ResponseResult(ErrorCode.SUCCESS, EmotionRecordResponseWithOwnerDTO.fromEntity(records, userId));
         } catch (EmotionRecordNotFoundException e) {
             return new ResponseResult(ErrorCode.FAIL_TO_FIND_EMOTION_RECORD, e.getMessage());
diff --git a/src/main/java/org/dfbf/soundlink/global/exception/ErrorCode.java b/src/main/java/org/dfbf/soundlink/global/exception/ErrorCode.java
@@ -43,6 +43,8 @@ public enum ErrorCode {
 
     // EmotionRecord
     FAIL_TO_FIND_EMOTION_RECORD(HttpStatus.NOT_FOUND, "해당 감정 기록을 찾을 수 없습니다."),
+    FAIL_TO_FIND_EMOTION(HttpStatus.NOT_FOUND, "해당 감정을 찾을 수 없습니다."),
+    INVALID_PAGE_REQUEST(HttpStatus.BAD_REQUEST, "페이지 요청 값이 잘못되었습니다."),
 
     // Auth
     TOKEN_NOT_EXPIRED(HttpStatus.OK, "토큰 정상"),
