Merge pull request #75 from 28th-meetup/fix/typeChange

feat: 가게 평점 double 타입으로 변경
28th-meetup · Nov 22, 2023 · 9e6c70a · 9e6c70a
2 parents 9f430a9 + f915793
commit 9e6c70a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/src/main/java/com/kusitms/jipbap/food/FoodService.java b/src/main/java/com/kusitms/jipbap/food/FoodService.java
@@ -43,7 +43,6 @@ public class FoodService {
     private final StoreRepository storeRepository;
     private final FoodRepository foodRepository;
     private final CategoryRepository categoryRepository;
-    private final OrderRepository orderRepository;
     private final FoodOptionRepository foodOptionRepository;
     private final OrderDetailRepository orderDetailRepository;
 
@@ -142,7 +141,7 @@ public FoodDetailResponse getFoodDetail(Long foodId) {
                 .foodPackage(food.getFoodPackage())
                 .informationDescription(food.getInformationDescription())
                 .ingredient(food.getIngredient())
-                .minOrderAmount(food.getStore().getMinOrderAmount())
+                .minOrderAmount(roundToTwoDecimals(food.getStore().getMinOrderAmount()))
                 .foodOptionResponseList(foodOptionResponseList)
                 .build();
     }
@@ -180,17 +179,17 @@ private List<FoodPreviewResponse> getBestSellingFoodByRegion(Long globalRegionId
                 .collect(Collectors.toList());
 
         List<FoodPreviewResponse> bestSellingFoodResponseList = top10FoodList.stream()
-        .map(food -> new FoodPreviewResponse (
-                food.getId(),
-                food.getName(),
-                food.getStore().getId(),
-                food.getStore().getName(),
-                roundToTwoDecimals(food.getDollarPrice()),
-                roundToTwoDecimals(food.getCanadaPrice()),
-                food.getImage(),
-                food.getStore().getAvgRate()
-        ))
-        .collect(Collectors.toList());
+            .map(food -> new FoodPreviewResponse (
+                    food.getId(),
+                    food.getName(),
+                    food.getStore().getId(),
+                    food.getStore().getName(),
+                    roundToTwoDecimals(food.getDollarPrice()),
+                    roundToTwoDecimals(food.getCanadaPrice()),
+                    food.getImage(),
+                    roundToTwoDecimals(food.getStore().getAvgRate())
+            ))
+            .collect(Collectors.toList());
 
         return bestSellingFoodResponseList;
     }
@@ -214,7 +213,7 @@ private List<FoodPreviewResponse> getLatestSellingFoodByRegion(Long globalRegion
                         roundToTwoDecimals(food.getDollarPrice()),
                         roundToTwoDecimals(food.getCanadaPrice()),
                         food.getImage(),
-                        food.getStore().getAvgRate()
+                        roundToTwoDecimals(food.getStore().getAvgRate())
                 ))
                 .collect(Collectors.toList());
         return latestSellingFoodResponseList;
@@ -242,7 +241,7 @@ public List<FoodPreviewResponse> getFoodByCategory(AuthInfo authInfo, Long categ
                         roundToTwoDecimals(food.getDollarPrice()),
                         roundToTwoDecimals(food.getCanadaPrice()),
                         food.getImage(),
-                        food.getStore().getAvgRate()
+                        roundToTwoDecimals(food.getStore().getAvgRate())
                 ))
                 .collect(Collectors.toList());
 

diff --git a/src/main/java/com/kusitms/jipbap/store/Store.java b/src/main/java/com/kusitms/jipbap/store/Store.java
@@ -81,6 +81,10 @@ public void increaseReviewCount() {
     }
 
     public void updateAvgRate(Double newRate) {
-        this.avgRate = (avgRate*rateCount+newRate)/(++rateCount);
+        this.avgRate = roundToTwoDecimals((avgRate*rateCount+newRate)/(++rateCount));
+    }
+
+    private double roundToTwoDecimals(double value) {
+        return Math.round(value * 100) / 100.0;
     }
 }
diff --git a/src/main/java/com/kusitms/jipbap/store/StoreService.java b/src/main/java/com/kusitms/jipbap/store/StoreService.java
@@ -110,7 +110,7 @@ public StoreDto getMyStore(String email){
                 store.getName(),
                 store.getDescription(),
                 store.getKoreanYn(),
-                store.getAvgRate(),
+                roundToTwoDecimals(store.getAvgRate()),
                 roundToTwoDecimals(store.getMinOrderAmount()),
                 new String[]{store.getImage(), store.getImage2(), store.getImage3()}
         );
@@ -134,7 +134,7 @@ public StoreFoodResponseDto searchStoresAndFoods(String email, Pageable pageable
         List<StoreDetailResponseDto> storeList = storeRepository.searchByNameOrderBySort(user, pageable, keyword, standard, order)
                 .stream().map(s -> new StoreDetailResponseDto(
                         new StoreDto(
-                                s.getId(), s.getName(), s.getDescription(), s.getKoreanYn(), s.getAvgRate(), roundToTwoDecimals(s.getMinOrderAmount()),
+                                s.getId(), s.getName(), s.getDescription(), s.getKoreanYn(), roundToTwoDecimals(s.getAvgRate()), roundToTwoDecimals(s.getMinOrderAmount()),
                                 new String[]{s.getImage(), s.getImage2(), s.getImage3()}
                             )
                         , storeBookmarkRepository.existsByUserAndStore(user, s)
@@ -144,7 +144,7 @@ public StoreFoodResponseDto searchStoresAndFoods(String email, Pageable pageable
                 .collect(Collectors.toList());
 
         List<FoodPreviewResponse> foodList = foodRepository.searchByNameOrderBySort(user, pageable, keyword, standard, order)
-                .stream().map(f -> new FoodPreviewResponse(f.getId(), f.getName(), f.getStore().getId(), f.getStore().getName(), roundToTwoDecimals(f.getDollarPrice()), roundToTwoDecimals(f.getCanadaPrice()), f.getImage(), f.getStore().getAvgRate()))
+                .stream().map(f -> new FoodPreviewResponse(f.getId(), f.getName(), f.getStore().getId(), f.getStore().getName(), roundToTwoDecimals(f.getDollarPrice()), roundToTwoDecimals(f.getCanadaPrice()), f.getImage(), roundToTwoDecimals(f.getStore().getAvgRate())))
                 .collect(Collectors.toList());
 
 
@@ -164,7 +164,7 @@ public StoreDetailResponseDto getStoreDetail(String email, Long storeId) {
                     store.getName(),
                     store.getDescription(),
                     store.getKoreanYn(),
-                    store.getAvgRate(),
+                    roundToTwoDecimals(store.getAvgRate()),
                     roundToTwoDecimals(store.getMinOrderAmount()),
                     new String[]{store.getImage(), store.getImage2(), store.getImage3()}
                 )
@@ -188,7 +188,7 @@ public StoreDto bookmarkStore(String email, Long storeId) {
                 store.getName(),
                 store.getDescription(),
                 store.getKoreanYn(),
-                store.getAvgRate(),
+                roundToTwoDecimals(store.getAvgRate()),
                 roundToTwoDecimals(store.getMinOrderAmount()),
                 new String[]{store.getImage(), store.getImage2(), store.getImage3()}
                 );
@@ -208,7 +208,7 @@ public BookmarkedStoreListResponseDto findBookmarkedStore(String email) {
                     sb.getStore().getName(),
                     sb.getStore().getDescription(),
                     sb.getStore().getKoreanYn(),
-                    sb.getStore().getAvgRate(),
+                    roundToTwoDecimals(sb.getStore().getAvgRate()),
                     roundToTwoDecimals(sb.getStore().getMinOrderAmount()),
                     new String[]{sb.getStore().getImage(), sb.getStore().getImage2(), sb.getStore().getImage3()}
                 )

diff --git a/src/main/java/com/kusitms/jipbap/store/dto/StoreInfoDto.java b/src/main/java/com/kusitms/jipbap/store/dto/StoreInfoDto.java
@@ -27,7 +27,7 @@ public StoreInfoDto(Store store) {
         this.name = store.getName();
         this.description = store.getDescription();
         this.koreanYn = store.getKoreanYn();
-        this.avgRate = store.getAvgRate();
+        this.avgRate = roundToTwoDecimals(store.getAvgRate());
         this.minOrderAmount = roundToTwoDecimals(store.getMinOrderAmount());
         this.images = new String[]{store.getImage(), store.getImage2(), store.getImage3()};
         this.address = store.getAddress();