#231 Refactor: 리뷰 정렬 기준 최신순, 별점순 구분 완료

Drink-Easy · Dec 15, 2024 · da23806 · da23806
1 parent dfef40d
commit da23806
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/drinkeg/drinkeg/wine/controller/WineController.java b/src/main/java/com/drinkeg/drinkeg/wine/controller/WineController.java
@@ -48,9 +48,9 @@ public ApiResponse<WineResponseWithThreeReviewsDTO> showWine(@AuthenticationPrin
     @GetMapping("/review/{wineId}")
     @Operation(summary = "선택 와인 리뷰 열람", description = "선택한 와인 리뷰를 List로 반환")
     public ApiResponse<WineReviewResponseDTO> showWineReview(@AuthenticationPrincipal PrincipalDetail principalDetail,
-                                                           @PathVariable("wineId") Long wineId) {
+                                                           @PathVariable("wineId") Long wineId, @RequestParam Boolean orderByLatest) {
 
-        WineReviewResponseDTO wineReviewResponseDTO = wineService.getWineReviewsByWineId(wineId, principalDetail);
+        WineReviewResponseDTO wineReviewResponseDTO = wineService.getWineReviewsByWineId(wineId, principalDetail, orderByLatest);
 
         return ApiResponse.onSuccess(wineReviewResponseDTO);
     }

diff --git a/src/main/java/com/drinkeg/drinkeg/wine/repository/WineRepositoryCustom.java b/src/main/java/com/drinkeg/drinkeg/wine/repository/WineRepositoryCustom.java
@@ -12,7 +12,7 @@ public interface WineRepositoryCustom {
     List<SearchWineResponseDTO> findWinesWithLikeStatus(String searchName, Long memberId);
 
     WineResponseWithThreeReviewsDTO findWineResponseByWineId(Long wineId, Long memberID);
-    WineReviewResponseDTO findWineReviewsAndLikeStatusByWineIdAndMemberId(Long wineId, Long memberId);
+    WineReviewResponseDTO findWineReviewsAndLikeStatusByWineIdAndMemberId(Long wineId, Long memberId, boolean orderByLatest);
 
     List<RecommendWineDTO> findRecommendWines(Member member);
 }
diff --git a/src/main/java/com/drinkeg/drinkeg/wine/repository/WineRepositoryImpl.java b/src/main/java/com/drinkeg/drinkeg/wine/repository/WineRepositoryImpl.java
@@ -26,7 +26,7 @@ public class WineRepositoryImpl implements WineRepositoryCustom {
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public WineReviewResponseDTO findWineReviewsAndLikeStatusByWineIdAndMemberId(Long wineId, Long memberId) {
+    public WineReviewResponseDTO findWineReviewsAndLikeStatusByWineIdAndMemberId(Long wineId, Long memberId, boolean orderByLatest) {
 
         // wineWishlist에 해당하는 데이터가 존재하면 true, 존재하지 않으면 false
         Optional<Boolean> isLiked = Optional.ofNullable(
@@ -46,7 +46,8 @@ public WineReviewResponseDTO findWineReviewsAndLikeStatusByWineIdAndMemberId(Lon
                 ))
                 .from(tastingNote)
                 .where(tastingNote.wine.id.eq(wineId))
-                .orderBy(tastingNote.createdAt.desc()) // 최신순 정렬
+                .orderBy(orderByLatest? tastingNote.createdAt.desc()
+                        : tastingNote.satisfaction.desc()) // 최신순 정렬
                 .fetch());
 
         return WineReviewResponseDTO.create(recentReviews.orElse(null), isLiked.orElse(false));

diff --git a/src/main/java/com/drinkeg/drinkeg/wine/service/WineService.java b/src/main/java/com/drinkeg/drinkeg/wine/service/WineService.java
@@ -16,7 +16,7 @@ public interface WineService {
 
     public WineResponseWithThreeReviewsDTO getWineResponseByWineId(Long wineId, PrincipalDetail principalDetail);
 
-    public WineReviewResponseDTO getWineReviewsByWineId(Long wineId, PrincipalDetail principalDetail);
+    public WineReviewResponseDTO getWineReviewsByWineId(Long wineId, PrincipalDetail principalDetail, boolean orderByLatest);
 
     public HomeResponseDTO getHomeResponse(PrincipalDetail principalDetail);
 

diff --git a/src/main/java/com/drinkeg/drinkeg/wine/service/WineServiceImpl.java b/src/main/java/com/drinkeg/drinkeg/wine/service/WineServiceImpl.java
@@ -60,12 +60,12 @@ public WineResponseWithThreeReviewsDTO getWineResponseByWineId(Long wineId, Prin
     }
 
     @Override
-    public WineReviewResponseDTO getWineReviewsByWineId(Long wineId, PrincipalDetail principalDetail){
+    public WineReviewResponseDTO getWineReviewsByWineId(Long wineId, PrincipalDetail principalDetail, boolean orderByLatest){
         // 회원을 조회한다.
         Member member = memberRepository.findByUsername(principalDetail.getUsername()).orElseThrow(
                 () -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
 
-        return wineRepository.findWineReviewsAndLikeStatusByWineIdAndMemberId(wineId, member.getId());
+        return wineRepository.findWineReviewsAndLikeStatusByWineIdAndMemberId(wineId, member.getId(), orderByLatest);
     }
 
     @Override