Merge pull request #89 from lotteon2/fix/admin-products-order-by

fix: 관리자 상품 조회 순서 수정
lotteon2 · Jan 17, 2024 · 6fa3bfb · 6fa3bfb
2 parents f59f9e7 + c842277
commit 6fa3bfb
Showing 1 changed file with 3 additions and 3 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
@@ -265,13 +265,13 @@ public Page<Product> findProductsForAdmin(
       ProductCommand.AdminSelectOption adminSelectOption, Pageable pageable) {
     Query query = new Query();
     query.addCriteria(Criteria.where("is_subscription").is(false));
-    if (adminSelectOption.getStatus() != null)
-      query.addCriteria(Criteria.where("product_sale_status").is(adminSelectOption.getStatus()));
-
     if (adminSelectOption.getSalesAmount().equals(SortOption.HIGH))
       query.with(Sort.by(Order.desc(adminSelectOption.getSalesAmount().getSortOption())));
     else query.with(Sort.by(Order.asc(adminSelectOption.getSalesAmount().getSortOption())));
 
+    if (adminSelectOption.getStatus() != null)
+      query.addCriteria(Criteria.where("product_sale_status").is(adminSelectOption.getStatus()));
+
     if (adminSelectOption.getDate().equals(SortOption.NEW))
       query.with(Sort.by(Order.desc(adminSelectOption.getDate().getSortOption())));
     else query.with(Sort.by(Order.asc(adminSelectOption.getDate().getSortOption())));