Feat: 식재료 이름으로 검색하여 소비기한 여유순으로 조회 API 구현

DuruDuru-UMC-7th · Feb 12, 2025 · 50dac2b · 50dac2b
1 parent 5800bc8
commit 50dac2b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/main/java/com/backend/DuruDuru/global/repository/IngredientRepository.java b/src/main/java/com/backend/DuruDuru/global/repository/IngredientRepository.java
@@ -43,4 +43,9 @@ public interface IngredientRepository extends JpaRepository<Ingredient, Long> {
     // 사용자가 식재료 검색어가 포함된 식재료 소비기한 임박순 조회
     @Query("SELECT i FROM Ingredient i WHERE i.fridge.member.memberId = :memberId AND i.ingredientName LIKE %:search% ORDER BY i.dDay ASC")
     List<Ingredient> findAllByFridge_Member_MemberIdAndIngredientNameContainingIgnoreCaseOrderByDDayAsc(Long memberId, String search);
+    // 사용자가 식재료 검색어가 포함된 식재료 소비기한 여유순 조회
+    @Query("SELECT i FROM Ingredient i WHERE i.fridge.member.memberId = :memberId AND i.ingredientName LIKE %:search% ORDER BY i.dDay DESC")
+    List<Ingredient> findAllByFridge_Member_MemberIdAndIngredientNameContainingIgnoreCaseOrderByDDayDesc(Long memberId, String search);
+
+
 }
diff --git a/src/main/java/com/backend/DuruDuru/global/service/FridgeService/FridgeQueryService.java b/src/main/java/com/backend/DuruDuru/global/service/FridgeService/FridgeQueryService.java
@@ -18,4 +18,5 @@ public interface FridgeQueryService {
 
     List<Ingredient> getIngredientsByNameRecent(Long memberId, Optional<String> optSearch);
     List<Ingredient> getIngredientsByNameNearExpiry(Long memberId, Optional<String> optSearch);
+    List<Ingredient> getIngredientsByNameFarExpiry(Long memberId, Optional<String> optSearch);
 }
diff --git a/src/main/java/com/backend/DuruDuru/global/service/FridgeService/FridgeQueryServiceImpl.java b/src/main/java/com/backend/DuruDuru/global/service/FridgeService/FridgeQueryServiceImpl.java
@@ -105,6 +105,20 @@ public List<Ingredient> getIngredientsByNameNearExpiry(Long memberId, Optional<S
         return ingredients;
     }
 
+    @Override
+    public List<Ingredient> getIngredientsByNameFarExpiry(Long memberId, Optional<String> optSearch) {
+        findMemberById(memberId);
+        List<Ingredient> ingredients;
+        if (optSearch.isPresent() && !optSearch.get().trim().isEmpty()) {
+            String search = optSearch.get();
+            ingredients = ingredientRepository.findAllByFridge_Member_MemberIdAndIngredientNameContainingIgnoreCaseOrderByDDayDesc(memberId, search);
+        } else {
+            ingredients = ingredientRepository.findAllByFridge_Member_MemberIdOrderByDDayDesc(memberId);
+        }
+        validateIngredientProperties(ingredients);
+        return ingredients;
+    }
+
 
     // 식재료 필수 속성 미설정 예외처리 (카테고리, 보관방식, 구매날짜, 소비기한)
     private void validateIngredientProperties(List<Ingredient> ingredients) {

diff --git a/src/main/java/com/backend/DuruDuru/global/web/controller/FridgeController.java b/src/main/java/com/backend/DuruDuru/global/web/controller/FridgeController.java
@@ -98,9 +98,8 @@ public ApiResponse<FridgeResponseDTO.IngredientDetailListDTO> findByNameNearExpi
     @GetMapping("/name/far-expiry")
     @Operation(summary = "식재료 이름으로 검색 (소비기한 여유순) API", description = "식재료 이름으로 검색하여 소비기한이 여유로운 순으로 조회하는 API 입니다.")
     public ApiResponse<FridgeResponseDTO.IngredientDetailListDTO> findByNameFarExpiry(@RequestParam Long memberId, @RequestParam Optional<String> search) {
-        //List<Ingredient> ingredients = fridgeQueryService.getIngredientsByNameFarExpiry(memberId, search);
-        //return ApiResponse.onSuccess(SuccessStatus.FRIDGE_OK, FridgeConverter.toIngredientDetailListDTO(ingredients));
-        return null;
+        List<Ingredient> ingredients = fridgeQueryService.getIngredientsByNameFarExpiry(memberId, search);
+        return ApiResponse.onSuccess(SuccessStatus.FRIDGE_OK, FridgeConverter.toIngredientDetailListDTO(ingredients));
     }