diff --git a/src/main/java/ssu/eatssu/domain/review/dto/ReviewDetailV1.java b/src/main/java/ssu/eatssu/domain/review/dto/ReviewDetailV1.java index 196cb4c..c40a090 100644 --- a/src/main/java/ssu/eatssu/domain/review/dto/ReviewDetailV1.java +++ b/src/main/java/ssu/eatssu/domain/review/dto/ReviewDetailV1.java @@ -8,6 +8,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; +import ssu.eatssu.domain.rating.entity.Ratings; import ssu.eatssu.domain.review.entity.Review; @AllArgsConstructor @@ -53,11 +54,16 @@ public static ReviewDetailV1 from(Review review, Long userId) { List imageUrls = new ArrayList<>(); review.getReviewImages().forEach(i -> imageUrls.add(i.getImageUrl())); + Ratings ratings = review.getRatings(); + Integer mainRating = (ratings != null) ? ratings.getMainRating() : review.getRating(); + Integer amountRating = (ratings != null) ? ratings.getAmountRating() : null; + Integer tasteRating = (ratings != null) ? ratings.getTasteRating() : null; + ReviewDetailV1Builder builder = ReviewDetailV1.builder() .reviewId(review.getId()) - .mainRating(review.getRatings().getMainRating()) - .amountRating(review.getRatings().getAmountRating()) - .tasteRating(review.getRatings().getTasteRating()) + .mainRating(mainRating) + .amountRating(amountRating) + .tasteRating(tasteRating) .writedAt(review.getCreatedDate().toLocalDate()) .content(review.getContent()) .imageUrls(imageUrls)