Merge pull request #188 from nhnacademy-be5-T3Team/feature/elastic

Feature/elastic
nhnacademy-be5-T3Team · May 16, 2024 · d70be29 · d70be29
2 parents 734ecbc + 7466f4d
commit d70be29
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/com/t3t/bookstoreapi/elastic/controller/ElasticController.java b/src/main/java/com/t3t/bookstoreapi/elastic/controller/ElasticController.java
@@ -17,6 +17,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 @RestController
 @RequiredArgsConstructor
@@ -48,7 +49,12 @@ public ResponseEntity<BaseResponse<PageResponse<ElasticResponse>>> getSearchPage
             return ResponseEntity.badRequest().body(new BaseResponse<>());
         }
 
-        Pageable pageable = PageRequest.of(pageNo, pageSize, Sort.by(sortBy));
+        Pageable pageable;
+        if(Objects.equals(sortBy, "discounted_price")){
+            pageable = PageRequest.of(pageNo, pageSize, Sort.by(sortBy));
+        }else{
+            pageable = PageRequest.of(pageNo, pageSize, Sort.by(sortBy).descending());
+        }
         PageResponse<ElasticResponse> searchList = elasticService.search(query, searchType, pageable);
 
         BaseResponse<PageResponse<ElasticResponse>> responseBody = new BaseResponse<>();
@@ -81,7 +87,13 @@ public ResponseEntity<BaseResponse<PageResponse<ElasticResponse>>> getCategorySe
             return ResponseEntity.badRequest().body(new BaseResponse<>());
         }
 
-        Pageable pageable = PageRequest.of(pageNo, pageSize, Sort.by(sortBy));
+        Pageable pageable;
+        if(Objects.equals(sortBy, "discounted_price")){
+            pageable = PageRequest.of(pageNo, pageSize, Sort.by(sortBy));
+        }else{
+            pageable = PageRequest.of(pageNo, pageSize, Sort.by(sortBy).descending());
+        }
+
         PageResponse<ElasticResponse> searchList =
                 elasticCategoryService.search(query, searchType, categoryId, pageable);