Merge pull request #84 from kea-dpang/develop

Develop
kea-dpang · Feb 6, 2024 · 613e9a7 · 613e9a7
2 parents 0cd65da + a6c3d96
commit 613e9a7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/src/main/java/kea/dpang/item/dto/review/PersonalReviewDto.java b/src/main/java/kea/dpang/item/dto/review/PersonalReviewDto.java
@@ -13,22 +13,24 @@ public class PersonalReviewDto {
     private Long reviewId;
     private Long reviewerId;
     private String reviewerName;
-    private LocalDateTime createdTime;
     private Long itemId;
-    private String itemImage;
+    private String itemName;
+    private String itemThumbnailImage;
     private String content;
     private Double rating;
+    private LocalDateTime createdTime;
 
     public static PersonalReviewDto of(Review review, String reviewerName) {
         return new PersonalReviewDto(
                 review.getReviewId(),
                 review.getReviewerId(),
                 reviewerName,
-                review.getCreatedTime(),
                 review.getItem().getId(),
+                review.getItem().getName(),
                 review.getItem().getThumbnailImage(),
                 review.getContent(),
-                review.getRating()
+                review.getRating(),
+                review.getCreatedTime()
         );
     }
 }
diff --git a/src/main/java/kea/dpang/item/dto/review/ReviewDto.java b/src/main/java/kea/dpang/item/dto/review/ReviewDto.java
@@ -17,14 +17,6 @@ public class ReviewDto {
     private Long itemId;
     private String content;
     private Double rating;
-
-    public ReviewDto(Review review) {
-        this.reviewId = review.getReviewId();
-        this.reviewerId = review.getReviewerId();
-        this.createdTime = review.getCreatedTime();
-        this.itemId = review.getItem().getId();
-        this.content = review.getContent();
-        this.rating = review.getRating();
-    }
+    private int reviewCount;
 }
 
diff --git a/src/main/java/kea/dpang/item/entity/Item.java b/src/main/java/kea/dpang/item/entity/Item.java
@@ -107,5 +107,9 @@ public void updateAverageRating() {
                 .orElse(0.0);
     }
 
+    public int getReviewCount() {
+        return this.reviews.size();
+    }
+
 }
 
diff --git a/src/main/java/kea/dpang/item/service/ReviewServiceImpl.java b/src/main/java/kea/dpang/item/service/ReviewServiceImpl.java
@@ -69,7 +69,8 @@ public List<ReviewDto> getReviewList(Long itemId, Pageable pageable) {
                     review.getCreatedTime(),
                     review.getItem().getId(),
                     review.getContent(),
-                    review.getRating()
+                    review.getRating(),
+                    review.getItem().getReviewCount()
             );
         }).toList();
     }