Merge pull request #68 from Uni-Made/feature/#63

🐛 [BUG] 판매 상품 리스트 필터링 버그 수정 #63
Uni-Made · Jul 24, 2024 · a674979 · a674979
2 parents 1644b30 + dcbdd81
commit a674979
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/src/main/java/umc/unimade/domain/products/repository/ProductsRepositoryCustomImpl.java b/src/main/java/umc/unimade/domain/products/repository/ProductsRepositoryCustomImpl.java
@@ -6,11 +6,12 @@
 import umc.unimade.domain.products.entity.Products;
 import umc.unimade.domain.products.entity.QProducts;
 import umc.unimade.domain.favorite.entity.QFavoriteProduct;
+import com.querydsl.core.types.OrderSpecifier;
 
 import java.util.List;
 
 @RequiredArgsConstructor
-public class ProductsRepositoryCustomImpl implements ProductsRepositoryCustom{
+public class ProductsRepositoryCustomImpl implements ProductsRepositoryCustom {
     private final JPAQueryFactory queryFactory;
 
     @Override
@@ -20,12 +21,14 @@ public List<Products> findProductsByFilters(String category, String keyword, Lon
 
         return queryFactory
                 .selectFrom(products)
+                .leftJoin(favoriteProduct).on(favoriteProduct.product.eq(products))
                 .where(
                         categoryEq(category),
                         keywordContains(keyword),
                         priceBetween(minPrice, maxPrice),
                         cursorLessThan(cursor)
                 )
+                .groupBy(products.id)
                 .orderBy(getSortOrder(sort, products, favoriteProduct))
                 .limit(pageSize)
                 .fetch();
@@ -41,17 +44,29 @@ private BooleanExpression keywordContains(String keyword) {
     }
 
     private BooleanExpression priceBetween(Long minPrice, Long maxPrice) {
-        return minPrice != null && maxPrice != null ? QProducts.products.price.between(minPrice, maxPrice) : null;
+        if (minPrice == null && maxPrice == null) {
+            return null;
+        }
+        if (minPrice == null) {
+            return QProducts.products.price.loe(maxPrice);
+        }
+        if (maxPrice == null) {
+            return QProducts.products.price.goe(minPrice);
+        }
+        return QProducts.products.price.between(minPrice, maxPrice);
     }
 
     private BooleanExpression cursorLessThan(Long cursor) {
         return cursor != null ? QProducts.products.id.lt(cursor) : null;
     }
 
-    private com.querydsl.core.types.OrderSpecifier<?> getSortOrder(String sort, QProducts products, QFavoriteProduct favoriteProduct) {
+    private OrderSpecifier<?> getSortOrder(String sort, QProducts products, QFavoriteProduct favoriteProduct) {
+        if (sort == null || sort.isEmpty()) {
+            sort = "favorite";
+        }
         switch (sort) {
             case "favorite":
-                return favoriteProduct.count().desc();
+                return favoriteProduct.id.count().desc();
             case "latest":
                 return products.createdAt.desc();
             case "deadline":
@@ -60,4 +75,4 @@ private com.querydsl.core.types.OrderSpecifier<?> getSortOrder(String sort, QPro
                 return products.id.desc();
         }
     }
-}
+}