Merge pull request #88 from lotteon2/fix/product-review

fix: 가게 평점 조회 수정 및 상품 조회
lotteon2 · Jan 16, 2024 · f59f9e7 · f59f9e7
2 parents 6df1224 + 5e92bbf
commit f59f9e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/kr/bb/product/domain/product/adapter/out/mongo/ProductQueryRepository.java b/src/main/java/kr/bb/product/domain/product/adapter/out/mongo/ProductQueryRepository.java
@@ -237,10 +237,12 @@ public Map<Long, List<Product>> findProductsByProductsGroupByStoreId(List<String
 
   @Override
   public Map<Long, Double> findStoreAverageRating() {
+    AggregationOperation matchReviewsGreaterThanOne =
+        Aggregation.match(Criteria.where("reviewCount").gt(1));
     AggregationOperation groupByStoreId =
         Aggregation.group("storeId").avg("averageRating").as("averageRating");
     TypedAggregation<Product> aggregation =
-        Aggregation.newAggregation(Product.class, groupByStoreId);
+        Aggregation.newAggregation(Product.class, matchReviewsGreaterThanOne, groupByStoreId);
 
     // Execute the aggregation
     AggregationResults<AverageResult> aggregate =

diff --git a/src/main/java/kr/bb/product/domain/product/application/port/in/ProductQueryInputPort.java b/src/main/java/kr/bb/product/domain/product/application/port/in/ProductQueryInputPort.java
@@ -89,7 +89,7 @@ private static Pageable getPageable(Pageable pageable, ProductCommand.SortOption
     return PageRequest.of(
         pageable.getPageNumber(),
         pageable.getPageSize(),
-        Sort.by(Direction.DESC, "product_sale_status")
+        Sort.by(Direction.DESC, "productSaleStatus")
             .and(Sort.by(direction, sortOption.getSortOption())));
   }
 
@@ -346,10 +346,6 @@ public StoreAverageDto getStoreAverageRating() {
 
   @Override
   public List<StockChangeDto> getFlowerAmountGroupByStoreId(ProcessOrderDto processOrderDto) {
-    processOrderDto
-        .getProducts()
-        .keySet()
-        .forEach(key -> log.info("!!!!!!!!! {}", processOrderDto.getProducts().get(key)));
     Map<Long, List<Product>> productsByProductsGroupByStoreId =
         productQueryOutPort.findProductsByProductsGroupByStoreId(
             new ArrayList<>(processOrderDto.getProducts().keySet()));

diff --git a/src/main/java/kr/bb/product/domain/product/mapper/ProductCommand.java b/src/main/java/kr/bb/product/domain/product/mapper/ProductCommand.java
@@ -166,6 +166,7 @@ public static List<StockChangeDto> getFlowerAmountOfStore(
   @Getter
   public enum SortOption {
     TOP_SALE("productSaleAmount"),
+    SALE("productSaleAmount"),
     BOTTOM_SALE("productSaleAmount"),
     NEW("createdAt"),
     OLD("createdAt"),