[Release] v2.0.5 릴리즈

Author: JjungminLee

.gitignore

@@ -43,4 +43,6 @@ out/
 /eat-ssu.tar
 
 ### env file ###
-.env
+.env
+
+/src/main/resources/application-local.yml

src/main/java/ssu/eatssu/domain/menu/persistence/QuerydslMealRatingCalculator.java

@@ -32,29 +32,6 @@ public Double getMainRatingAverage(Long mealId) {
                 .fetchOne();
     }
 
-    public Double getTasteRatingAverage(Long mealId) {
-        List<Long> menuIds = mealMenuQueryRepository.getMenuIds(mealId);
-        return queryFactory
-                .select(review.ratings.tasteRating.avg())
-                .from(review)
-                .join(review.menu, menu)
-                .where(
-                        menuIdIn(menuIds)
-                      )
-                .fetchOne();
-    }
-
-    public Double getAmountRatingAverage(Long mealId) {
-        List<Long> menuIds = mealMenuQueryRepository.getMenuIds(mealId);
-        return queryFactory
-                .select(review.ratings.amountRating.avg())
-                .from(review)
-                .join(review.menu, menu)
-                .where(
-                        menuIdIn(menuIds)
-                      )
-                .fetchOne();
-    }
 
     private BooleanExpression menuIdIn(List<Long> menuIds) {
         return menuIds != null && !menuIds.isEmpty() ? menu.id.in(menuIds) : null;

src/main/java/ssu/eatssu/domain/menu/persistence/QuerydslMenuRatingCalculator.java

@@ -26,27 +26,7 @@ public Double getMainRatingAverage(Long menuId) {
                 .fetchOne();
     }
 
-    public Double getTasteRatingAverage(Long menuId) {
-        return queryFactory
-                .select(review.ratings.tasteRating.avg())
-                .from(review)
-                .join(review.menu, menu)
-                .where(
-                        menuIdEq(menuId)
-                      )
-                .fetchOne();
-    }
 
-    public Double getAmountRatingAverage(Long menuId) {
-        return queryFactory
-                .select(review.ratings.amountRating.avg())
-                .from(review)
-                .join(review.menu, menu)
-                .where(
-                        menuIdEq(menuId)
-                      )
-                .fetchOne();
-    }
 
     private BooleanExpression menuIdEq(Long menuId) {
         return menu.id.eq(menuId);

src/main/java/ssu/eatssu/domain/partnership/entity/RestaurantType.java

@@ -3,7 +3,7 @@
 public enum RestaurantType {
     RESTAURANT("음식점"),
     CAFE("카페"),
-    BEER("주점");
+    PUB("주점");
 
     private final String type;
 

src/main/java/ssu/eatssu/domain/rating/entity/JpaLoadCollectionRatingCalculator.java

@@ -34,12 +34,10 @@ public RatingAverages mealAverageRatings(Meal meal) {
         long totalReviewCount = mealTotalReviewCount(meal);
 
         if (totalReviewCount == 0)
-            return new RatingAverages(null, null, null);
+            return new RatingAverages(null);
 
         return RatingAverages.builder()
                              .mainRating(averageRating(mealTotalMainRating(meal), totalReviewCount))
-                             .amountRating(averageRating(mealTotalAmountRating(meal), totalReviewCount))
-                             .tasteRating(averageRating(mealTotalTasteRating(meal), totalReviewCount))
                              .build();
     }
 
@@ -48,13 +46,11 @@ public RatingAverages menuAverageRatings(Menu menu) {
         int totalReviewCount = menu.getTotalReviewCount();
 
         if (totalReviewCount == 0) {
-            return new RatingAverages(null, null, null);
+            return new RatingAverages(null);
         }
 
         return RatingAverages.builder()
                              .mainRating(averageRating(menuTotalMainRating(menu), totalReviewCount))
-                             .amountRating(averageRating(menuTotalAmountRating(menu), totalReviewCount))
-                             .tasteRating(averageRating(menuTotalTasteRating(menu), totalReviewCount))
                              .build();
     }
 
@@ -101,35 +97,11 @@ public Integer mealTotalMainRating(Meal meal) {
                    .reduce(null, this::sum);
     }
 
-    // 식단 양 평점 총합
-    public Integer mealTotalAmountRating(Meal meal) {
-        return meal.getMealMenus().stream()
-                   .map(MealMenu::getMenu)
-                   .map(menu -> menu.getReviews().getTotalAmountRating())
-                   .reduce(null, this::sum);
-    }
-
-    // 식단 맛 평점 총합
-    public Integer mealTotalTasteRating(Meal meal) {
-        return meal.getMealMenus().stream()
-                   .map(MealMenu::getMenu)
-                   .map(menu -> menu.getReviews().getTotalTasteRating())
-                   .reduce(null, this::sum);
-    }
 
     // 메뉴 메인 평점 총합
     public Integer menuTotalMainRating(Menu menu) {
         return menu.getReviews().getTotalMainRating();
     }
 
-    // 메뉴 양 평점 총합
-    public Integer menuTotalAmountRating(Menu menu) {
-        return menu.getReviews().getTotalAmountRating();
-    }
-
-    // 메뉴 맛 평점 총합
-    public Integer menuTotalTasteRating(Menu menu) {
-        return menu.getReviews().getTotalTasteRating();
-    }
 
 }

src/main/java/ssu/eatssu/domain/rating/entity/JpaProjectionRatingCalculator.java

@@ -42,18 +42,14 @@ public RatingAverages mealAverageRatings(Meal meal) {
         long totalReviewCount = mealTotalReviewCount(meal);
 
         if (totalReviewCount == 0)
-            return new RatingAverages(null, null, null);
+            return new RatingAverages(null);
 
         Collection<RatingsDto> mealRatings = reviewRepository.findByMenu_MealMenus_Meal(meal, RatingsDto.class);
 
         Integer totalMainRating = mealRatings.stream().mapToInt(RatingsDto::getMainRating).sum();
-        Integer totalTasteRating = mealRatings.stream().mapToInt(RatingsDto::getTasteRating).sum();
-        Integer totalAmountRating = mealRatings.stream().mapToInt(RatingsDto::getAmountRating).sum();
 
         return RatingAverages.builder()
                              .mainRating(averageRating(totalMainRating, totalReviewCount))
-                             .tasteRating(averageRating(totalTasteRating, totalReviewCount))
-                             .amountRating(averageRating(totalAmountRating, totalReviewCount))
                              .build();
     }
 

src/main/java/ssu/eatssu/domain/rating/entity/Ratings.java

@@ -12,20 +12,12 @@ public class Ratings {
 
     private Integer mainRating;
 
-    private Integer amountRating;
-
-    private Integer tasteRating;
-
-    private Ratings(Integer mainRating, Integer amountRating, Integer tasteRating) {
+    private Ratings(Integer mainRating) {
         Assert.isTrue(mainRating >= 0 && mainRating <= 5, "mainRating must be between 0 and 5");
-        Assert.isTrue(amountRating >= 0 && amountRating <= 5, "amountRating must be between 0 and 5");
-        Assert.isTrue(tasteRating >= 0 && tasteRating <= 5, "tasteRating must be between 0 and 5");
         this.mainRating = mainRating;
-        this.amountRating = amountRating;
-        this.tasteRating = tasteRating;
     }
 
-    public static Ratings of(Integer mainRating, Integer amountRating, Integer tasteRating) {
-        return new Ratings(mainRating, amountRating, tasteRating);
+    public static Ratings of(Integer mainRating) {
+        return new Ratings(mainRating);
     }
 }

src/main/java/ssu/eatssu/domain/review/dto/CreateMenuReviewRequest.java

@@ -21,13 +21,6 @@ public class CreateMenuReviewRequest {
     private Long menuId;
     @Schema(description = "평점-메인", example = "4")
     private Integer mainRating;
-
-    @Schema(description = "평점-양", example = "4")
-    private Integer amountRating;
-
-    @Schema(description = "평점-맛", example = "4")
-    private Integer tasteRating;
-
     @Max(150)
     @Schema(description = "한줄평", example = "맛있어용")
     private String content;
@@ -36,19 +29,8 @@ public class CreateMenuReviewRequest {
     private String imageUrl;
     private MenuLikeRequest menuLike;
 
-    public CreateMenuReviewRequest(int mainRating, int amountRating, int tasteRating, String content) {
-        Assert.isTrue(mainRating >= 1 && mainRating <= 5, "평점은 1에서 5 사이 여야 합니다.");
-        Assert.isTrue(amountRating >= 1 && amountRating <= 5, "평점은 1에서 5 사이 여야 합니다.");
-        Assert.isTrue(tasteRating >= 1 && tasteRating <= 5, "평점은 1에서 5 사이 여야 합니다.");
-        Assert.notNull(content, "리뷰는 null이 될 수 없습니다.");
-        this.mainRating = mainRating;
-        this.amountRating = amountRating;
-        this.tasteRating = tasteRating;
-        this.content = content;
-    }
-
     public Review toReviewEntity(User user, Menu menu) {
-        Ratings ratings = Ratings.of(this.mainRating, this.amountRating, this.tasteRating);
+        Ratings ratings = Ratings.of(this.mainRating);
         return Review.builder()
                      .user(user)
                      .content(this.content)

src/main/java/ssu/eatssu/domain/review/dto/MealReviewsResponse.java

@@ -37,8 +37,6 @@ public static MealReviewsResponse of(Long totalReviewCount, List<String> menuNam
         return MealReviewsResponse.builder()
                                   .menuNames(menuNames)
                                   .mainRating(ratingAverages.mainRating())
-                                  .amountRating(ratingAverages.amountRating())
-                                  .tasteRating(ratingAverages.tasteRating())
                                   .totalReviewCount(totalReviewCount)
                                   .reviewRatingCount(reviewRatingCount)
                                   .build();

src/main/java/ssu/eatssu/domain/review/dto/MenuLikeRequest.java

@@ -10,6 +10,6 @@
 public class MenuLikeRequest {
     @Schema(description = "메뉴 식별자", example = "123")
     private Long menuId;
-    @Schema(description = "좋아요 or 싫어요", example = "좋아요 : true or 싫어요 : false")
+    @Schema(description = "좋아요 선택", example = "좋아요 : true (기본값은 false)")
     private Boolean isLike;
 }