#231 Refactor: 와인 정보/리뷰 보기 수정, WineWishlist 리패키징

src/main/java/com/drinkeg/drinkeg/controller/WineWishlist.java

@@ -1,11 +1,10 @@
 package com.drinkeg.drinkeg.controller;
 
 import com.drinkeg.drinkeg.apipayLoad.ApiResponse;
-import com.drinkeg.drinkeg.dto.WineWishlistDTO.request.WineWishlistRequestDTO;
-import com.drinkeg.drinkeg.dto.WineWishlistDTO.response.WineWishlistResponseDTO;
+import com.drinkeg.drinkeg.wineWishlist.dto.request.WineWishlistRequestDTO;
+import com.drinkeg.drinkeg.wineWishlist.dto.response.WineWishlistResponseDTO;
 import com.drinkeg.drinkeg.dto.loginDTO.commonDTO.PrincipalDetail;
-import com.drinkeg.drinkeg.member.service.MemberService;
-import com.drinkeg.drinkeg.service.wineWishlistService.WineWishlistService;
+import com.drinkeg.drinkeg.wineWishlist.service.WineWishlistService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -17,7 +16,6 @@
 @RequestMapping("/wine-wishlist")
 public class WineWishlist {
     private final WineWishlistService wineWishlistService;
-    private final MemberService memberService;
 
     @PostMapping("")
     public ApiResponse<WineWishlistResponseDTO> createWineWishlist(@RequestBody WineWishlistRequestDTO wineWishlistRequestDTO, @AuthenticationPrincipal PrincipalDetail principalDetail) {

src/main/java/com/drinkeg/drinkeg/converter/WineWishlistConverter.java

@@ -2,8 +2,8 @@
 
 import com.drinkeg.drinkeg.member.domain.Member;
 import com.drinkeg.drinkeg.wine.domain.Wine;
-import com.drinkeg.drinkeg.domain.WineWishlist;
-import com.drinkeg.drinkeg.dto.WineWishlistDTO.response.WineWishlistResponseDTO;
+import com.drinkeg.drinkeg.wineWishlist.domain.WineWishlist;
+import com.drinkeg.drinkeg.wineWishlist.dto.response.WineWishlistResponseDTO;
 import com.drinkeg.drinkeg.wine.dto.response.SearchWineResponseDTO;
 
 public class WineWishlistConverter {

src/main/java/com/drinkeg/drinkeg/tastingNote/repository/TastingNoteNoseRepositoryCustom.java

@@ -7,5 +7,5 @@
 
 public interface TastingNoteNoseRepositoryCustom {
 
-    Optional<List<TastingNoteNose>> getTastingNoteNoseListByUsername(String username);
+    List<TastingNoteNose> getTastingNoteNoseListByUsername(String username);
 }

src/main/java/com/drinkeg/drinkeg/tastingNote/repository/TastingNoteNoseRepositoryImpl.java

@@ -20,10 +20,10 @@ public class TastingNoteNoseRepositoryImpl implements TastingNoteNoseRepositoryC
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public Optional<List<TastingNoteNose>> getTastingNoteNoseListByUsername(String username) {
-        return Optional.ofNullable(queryFactory.selectFrom(tastingNoteNose)
+    public List<TastingNoteNose> getTastingNoteNoseListByUsername(String username) {
+        return queryFactory.selectFrom(tastingNoteNose)
                 .join(tastingNoteNose.tastingNote, tastingNote)
                 .where(tastingNote.member.username.eq(username))
-                .fetch());
+                .fetch();
     }
 }

src/main/java/com/drinkeg/drinkeg/tastingNote/service/TastingNoteServiceImpl.java

@@ -212,12 +212,12 @@ public void deleteTastingNote(Long noteId, PrincipalDetail principalDetail) {
     public List<Map<Long, String>> showMemberNoseMapList(PrincipalDetail principalDetail) {
 
         // 사용자가 작성한 TastingNoteNose 리스트 가져오기
-        Optional<List<TastingNoteNose>> tastingNoteNoseList = tastingNoteNoseRepository.getTastingNoteNoseListByUsername(principalDetail.getUsername());
+        List<TastingNoteNose> tastingNoteNoseList = tastingNoteNoseRepository.getTastingNoteNoseListByUsername(principalDetail.getUsername());
 
         // TastingNoteNose 리스트를 Map<Long, String>으로 변환
-        return tastingNoteNoseList.map(tastingNoteNoses -> tastingNoteNoses.stream()
+        return tastingNoteNoseList.stream()
                 .map(nose -> Map.of(nose.getId(), nose.getNoseElement()))
-                .collect(Collectors.toList())).orElseGet(ArrayList::new);
+                .collect(Collectors.toList());
 
     }
 

src/main/java/com/drinkeg/drinkeg/wine/controller/WineController.java

@@ -4,8 +4,8 @@
 import com.drinkeg.drinkeg.apipayLoad.ApiResponse;
 import com.drinkeg.drinkeg.wine.dto.response.SearchWineResponseDTO;
 import com.drinkeg.drinkeg.wine.dto.response.WineResponseWithThreeReviewsDTO;
-import com.drinkeg.drinkeg.wine.dto.response.WineReviewResponseDTO;
 import com.drinkeg.drinkeg.dto.loginDTO.commonDTO.PrincipalDetail;
+import com.drinkeg.drinkeg.wine.dto.response.WineReviewResponseDTO;
 import com.drinkeg.drinkeg.wine.service.WineService;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
@@ -35,21 +35,23 @@ public ApiResponse<List<SearchWineResponseDTO>> searchWine(@AuthenticationPrinci
     // 선택한 와인 정보 출력
     @GetMapping("/{wineId}")
     @Operation(summary = "선택 와인 정보 열람", description = "선택한 와인의 정보를 wineResponseDTO에 담아 반환")
-    public ApiResponse<WineResponseWithThreeReviewsDTO> showWine(@PathVariable("wineId") Long wineId) {
+    public ApiResponse<WineResponseWithThreeReviewsDTO> showWine(@AuthenticationPrincipal PrincipalDetail principalDetail,
+                                                                 @PathVariable("wineId") Long wineId) {
 
-        WineResponseWithThreeReviewsDTO wineResponseWithThreeReviewsDTO = wineService.getWineResponseByWineId(wineId);
+        WineResponseWithThreeReviewsDTO wineResponseWithThreeReviewsDTO = wineService.getWineResponseByWineId(wineId, principalDetail);
 
         return ApiResponse.onSuccess(wineResponseWithThreeReviewsDTO);
     }
 
-    // 와인 리뷰 보기
+    // 전체 와인 리뷰 보기
     @GetMapping("/review/{wineId}")
     @Operation(summary = "선택 와인 리뷰 열람", description = "선택한 와인 리뷰를 List로 반환")
-    public ApiResponse<List<WineReviewResponseDTO>> showWineReview(@PathVariable("wineId") Long wineId) {
+    public ApiResponse<WineReviewResponseDTO> showWineReview(@AuthenticationPrincipal PrincipalDetail principalDetail,
+                                                           @PathVariable("wineId") Long wineId, @RequestParam Boolean orderByLatest) {
 
-        List<WineReviewResponseDTO> wineReviews = wineService.getWineReviewsByWineId(wineId);
+        WineReviewResponseDTO wineReviewResponseDTO = wineService.getWineReviewsAndIsLikedByWineId(wineId, principalDetail, orderByLatest);
 
-        return ApiResponse.onSuccess(wineReviews);
+        return ApiResponse.onSuccess(wineReviewResponseDTO);
     }
 
     // 와인 이미지 업로드

src/main/java/com/drinkeg/drinkeg/wine/dto/response/WineResponseDTO.java

@@ -31,12 +31,14 @@ public class WineResponseDTO {
 
     private float avgSatisfaction;
 
+    private boolean isLiked;
+
 
     @QueryProjection
     public WineResponseDTO(
             Long wineId, String name, String imageUrl, int price, String sort, String area, float satisfaction,
             float avgSugarContent, float avgAcidity, float avgTannin, float avgBody, float avgAlcohol,
-            WineNoteNose wineNoteNose, float avgSatisfaction) {
+            WineNoteNose wineNoteNose, float avgSatisfaction, boolean isLiked) {
 
         this.wineId = wineId;
         this.name = name;
@@ -54,6 +56,8 @@ public WineResponseDTO(
 
         this.wineNoteNose = wineNoteNose;
         this.avgSatisfaction = avgSatisfaction;
+
+        this.isLiked = isLiked;
     }
 
 }

src/main/java/com/drinkeg/drinkeg/wine/dto/response/WineResponseWithThreeReviewsDTO.java

@@ -1,7 +1,6 @@
 package com.drinkeg.drinkeg.wine.dto.response;
 
 import com.querydsl.core.annotations.QueryProjection;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -11,10 +10,10 @@
 @NoArgsConstructor
 public class WineResponseWithThreeReviewsDTO {
     WineResponseDTO wineResponseDTO;
-    List<WineReviewResponseDTO> recentReviews;
+    List<WineReviewDTO> recentReviews;
 
     @QueryProjection
-    public WineResponseWithThreeReviewsDTO(WineResponseDTO wineResponseDTO, List<WineReviewResponseDTO> recentReviews) {
+    public WineResponseWithThreeReviewsDTO(WineResponseDTO wineResponseDTO, List<WineReviewDTO> recentReviews) {
         this.wineResponseDTO = wineResponseDTO;
         this.recentReviews = recentReviews;
     }

src/main/java/com/drinkeg/drinkeg/wine/dto/response/WineReviewDTO.java

@@ -0,0 +1,32 @@
+package com.drinkeg.drinkeg.wine.dto.response;
+
+import com.querydsl.core.annotations.QueryProjection;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor
+public class WineReviewDTO {
+
+    // 회원이 설정한 이름
+    private String name;
+
+    private String review;
+
+    private float satisfaction;
+
+    private LocalDateTime createdAt;
+
+
+    @QueryProjection
+    public WineReviewDTO(String name, String review, float satisfaction, LocalDateTime createdAt) {
+        this.name = name;
+        this.review = review;
+        this.satisfaction = satisfaction;
+        this.createdAt = createdAt;
+
+    }
+
+}

src/main/java/com/drinkeg/drinkeg/wine/dto/response/WineReviewResponseDTO.java

@@ -1,28 +1,30 @@
 package com.drinkeg.drinkeg.wine.dto.response;
 
+import com.drinkeg.drinkeg.tastingNote.dto.response.TastingNotePreviewResponseDTO;
 import com.querydsl.core.annotations.QueryProjection;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Getter
 @NoArgsConstructor
+@Builder
 public class WineReviewResponseDTO {
 
-    // 회원이 설정한 이름
-    private String name;
-
-    private String review;
-
-    private float satisfaction;
-
+    List<WineReviewDTO> wineReviews;
+    boolean isLiked;
 
     @QueryProjection
-    public WineReviewResponseDTO(String name, String review, float satisfaction) {
-        this.name = name;
-        this.review = review;
-        this.satisfaction = satisfaction;
+    public WineReviewResponseDTO(List<WineReviewDTO> wineReviews, boolean isLiked) {
+        this.wineReviews = wineReviews;
     }
 
+    public static WineReviewResponseDTO create(List<WineReviewDTO> wineReviews, boolean isLiked){
+        return WineReviewResponseDTO.builder()
+                .wineReviews(wineReviews)
+                .isLiked(isLiked)
+                .build();
+    }
 }

src/main/java/com/drinkeg/drinkeg/wine/repository/WineRepositoryCustom.java

@@ -4,14 +4,15 @@
 import com.drinkeg.drinkeg.dto.HomeDTO.RecommendWineDTO;
 import com.drinkeg.drinkeg.wine.dto.response.SearchWineResponseDTO;
 import com.drinkeg.drinkeg.wine.dto.response.WineResponseWithThreeReviewsDTO;
-import com.drinkeg.drinkeg.wine.dto.response.WineReviewResponseDTO;
+import com.drinkeg.drinkeg.wine.dto.response.WineReviewDTO;
 
 import java.util.List;
 
 public interface WineRepositoryCustom {
-    List<WineReviewResponseDTO> findWineReviewsById(Long wineId);
+    List<SearchWineResponseDTO> findWinesWithLikeStatus(String searchName, Long memberId);
+    WineResponseWithThreeReviewsDTO findWineResponseByWineId(Long wineId, Long memberID);
+
+    List<WineReviewDTO> findWineReviewsByWineIdAndMemberId(Long wineId, boolean orderByLatest);
 
-    WineResponseWithThreeReviewsDTO findWineResponseByWineId(Long wineId);
     List<RecommendWineDTO> findRecommendWines(Member member);
-    List<SearchWineResponseDTO> findWinesWithLikeStatus(String searchName, Long memberId);
 }

src/main/java/com/drinkeg/drinkeg/wine/repository/WineRepositoryImpl.java

@@ -11,12 +11,13 @@
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import static com.drinkeg.drinkeg.domain.QWineWishlist.wineWishlist;
 import static com.drinkeg.drinkeg.tastingNote.domain.QTastingNote.tastingNote;
 import static com.drinkeg.drinkeg.wine.domain.QWine.wine;
+import static com.drinkeg.drinkeg.wineWishlist.domain.QWineWishlist.wineWishlist;
 
 @Repository
 @RequiredArgsConstructor
@@ -26,23 +27,28 @@ public class WineRepositoryImpl implements WineRepositoryCustom {
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public List<WineReviewResponseDTO> findWineReviewsById(Long wineId) {
-        return queryFactory
-                .select(new QWineReviewResponseDTO(
+    public List<WineReviewDTO> findWineReviewsByWineIdAndMemberId(Long wineId, boolean orderByLatest) {
+
+        List<WineReviewDTO> recentReviews = queryFactory
+                .select(new QWineReviewDTO(
                         tastingNote.member.name,
                         tastingNote.review,
-                        tastingNote.satisfaction
+                        tastingNote.satisfaction,
+                        tastingNote.createdAt
                 ))
                 .from(tastingNote)
-                .join(tastingNote.wine, wine)
-                .where(wine.id.eq(wineId))
+                .where(tastingNote.wine.id.eq(wineId))
+                .orderBy(orderByLatest? tastingNote.createdAt.desc()
+                        : tastingNote.satisfaction.desc()) // 최신순 정렬
                 .fetch();
+
+        return recentReviews;
     }
 
 
 
     @Override
-    public WineResponseWithThreeReviewsDTO findWineResponseByWineId(Long wineId) {
+    public WineResponseWithThreeReviewsDTO findWineResponseByWineId(Long wineId, Long memberId) {
 
         // Wine 데이터를 가져옴
         WineResponseDTO wineResponseDTO = queryFactory
@@ -63,27 +69,31 @@ public WineResponseWithThreeReviewsDTO findWineResponseByWineId(Long wineId) {
 
                         wine.wineNote.wineNoteNose,
 
-                        wine.wineNote.avgSatisfaction.as("avgSatisfaction")
+                        wine.wineNote.avgSatisfaction.as("avgSatisfaction"),
+                        wineWishlist.id.isNotNull().as("isLiked") // memberId와 wineId에 따라 isLiked 여부
                 ))
                 .from(wine)
                 .leftJoin(wine.wineNote)
+                .leftJoin(wineWishlist)
+                .on(wineWishlist.wine.eq(wine).and(wineWishlist.member.id.eq(memberId)))
                 .where(wine.id.eq(wineId))
                 .fetchOne();
 
         // 최근 생성된 3개의 TastingNote
-        Optional<List<WineReviewResponseDTO>> recentReviews = Optional.ofNullable(queryFactory
-                .select(new QWineReviewResponseDTO(
+        List<WineReviewDTO> recentReviews = queryFactory
+                .select(new QWineReviewDTO(
                         tastingNote.member.name,
                         tastingNote.review,
-                        tastingNote.satisfaction
+                        tastingNote.satisfaction,
+                        tastingNote.createdAt
                 ))
                 .from(tastingNote)
                 .where(tastingNote.wine.id.eq(wineId))
                 .orderBy(tastingNote.createdAt.desc()) // 최신순 정렬
                 .limit(3) // 상위 3개 제한
-                .fetch());
+                .fetch();
 
-        return new WineResponseWithThreeReviewsDTO(wineResponseDTO, recentReviews.orElse(null));
+        return new WineResponseWithThreeReviewsDTO(wineResponseDTO, recentReviews);
     }
 
     @Override

src/main/java/com/drinkeg/drinkeg/wine/service/WineService.java

@@ -2,9 +2,7 @@
 
 import com.drinkeg.drinkeg.wine.domain.Wine;
 import com.drinkeg.drinkeg.dto.HomeDTO.HomeResponseDTO;
-import com.drinkeg.drinkeg.wine.dto.response.SearchWineResponseDTO;
-import com.drinkeg.drinkeg.wine.dto.response.WineResponseWithThreeReviewsDTO;
-import com.drinkeg.drinkeg.wine.dto.response.WineReviewResponseDTO;
+import com.drinkeg.drinkeg.wine.dto.response.*;
 import com.drinkeg.drinkeg.dto.loginDTO.commonDTO.PrincipalDetail;
 
 import java.io.IOException;
@@ -16,9 +14,9 @@ public interface WineService {
 
     public Wine findWineById(Long wineId);
 
-    public WineResponseWithThreeReviewsDTO getWineResponseByWineId(Long wineId);
+    public WineResponseWithThreeReviewsDTO getWineResponseByWineId(Long wineId, PrincipalDetail principalDetail);
 
-    public List<WineReviewResponseDTO> getWineReviewsByWineId(Long wineId);
+    public WineReviewResponseDTO getWineReviewsAndIsLikedByWineId(Long wineId, PrincipalDetail principalDetail, boolean orderByLatest);
 
     public HomeResponseDTO getHomeResponse(PrincipalDetail principalDetail);