hotfix: review response field 수정

MEME-UMC · Mar 29, 2024 · bf0027c · bf0027c
1 parent 933d1bc
commit bf0027c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/main/java/umc/meme/shop/domain/review/dto/response/MyReviewResponseDto.java b/src/main/java/umc/meme/shop/domain/review/dto/response/MyReviewResponseDto.java
@@ -15,6 +15,7 @@
 public class MyReviewResponseDto {
     private Long reviewId;
     private String artistNickName;
+    private String makeupName;
     private String portfolioImg;
     private String location; //장소
     private LocalDateTime createdAt;
@@ -23,6 +24,7 @@ public static MyReviewResponseDto from(Review review){
         return MyReviewResponseDto.builder()
                 .reviewId(review.getReviewId())
                 .artistNickName(review.getPortfolio().getArtist().getNickname())
+                .makeupName(review.getPortfolio().getMakeupName())
                 .portfolioImg(review.getPortfolio().getPortfolioImgList().get(0).getSrc()) //첫 번째 포트폴리오 이미지
                 .location(review.getPortfolio().getArtist().getShopLocation())
                 .createdAt(review.getCreatedAt())

diff --git a/src/main/java/umc/meme/shop/domain/review/dto/response/ReviewResponseDto.java b/src/main/java/umc/meme/shop/domain/review/dto/response/ReviewResponseDto.java
@@ -14,6 +14,7 @@
 @AllArgsConstructor
 public class ReviewResponseDto {
     private String modelNickName;
+    private String modelProfileImg;
     private int star;
     private String comment;
     private List<ReviewImgDto> reviewImgDtoList;
@@ -26,6 +27,7 @@ public static ReviewResponseDto from(Review review){
 
         return ReviewResponseDto.builder()
                 .modelNickName(review.getModel().getNickname())
+                .modelProfileImg(review.getModel().getProfileImg())
                 .star(review.getStar())
                 .comment(review.getComment())
                 .reviewImgDtoList(reviewImgDtoList)

diff --git a/src/main/java/umc/meme/shop/domain/review/service/ReviewService.java b/src/main/java/umc/meme/shop/domain/review/service/ReviewService.java
@@ -109,6 +109,7 @@ public List<ReviewAvailableListDto> getReviewReservationList(Long modelId){
         //status != COMPLETE 이면 리스트에서 제거
         //TODO: DevCon 이후 수정
 //        reservationList.removeIf(Reservation::isAvailableReview);
+        reservationList.removeIf(Reservation::isReview);
 
         //리뷰 작성 완료시 리스트에서 제거
         reservationList.removeIf(Reservation::isReview);