feat : cocktailSearch

Author: lkw9241

db_dev.mv.db

@@ -1,9 +1,10 @@
 package com.back.domain.cocktail.repository;
 
 import com.back.domain.cocktail.entity.Cocktail;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import org.springframework.data.domain.Pageable;
+
 import java.util.List;
 
 @Repository
@@ -14,4 +15,6 @@ public interface CocktailRepository extends JpaRepository<Cocktail, Long> {
 
     // 무한스크롤 → lastId보다 작은 ID들 가져오기
     List<Cocktail> findByCocktailIdLessThanOrderByCocktailIdDesc(Long lastId, Pageable pageable);
+
+    List<Cocktail> findByCocktailNameContainingIgnoreCaseOrIngredientContainingIgnoreCase(String cocktailName, String ingredient);
 }

src/main/java/com/back/domain/cocktail/repository/CocktailRepository.java

@@ -7,7 +7,6 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -25,6 +24,7 @@ public Cocktail getCocktailById(Long id) {
                 .orElseThrow(() -> new IllegalArgumentException("User not found. id=" + id));
     }
 
+    // 칵테일 무한스크롤 조회
     @Transactional(readOnly = true)
     public List<CocktailSummaryDto> getCocktails(Long lastId, Integer size) { // 무한스크롤 조회, 클라이언트 쪽에서 lastId와 size 정보를 받음.(스크롤 이벤트)
         int fetchSize = (size != null) ? size : DEFAULT_SIZE;
@@ -42,4 +42,16 @@ public List<CocktailSummaryDto> getCocktails(Long lastId, Integer size) { // 무
                 .map(c -> new CocktailSummaryDto(c.getCocktailId(), c.getCocktailName(), c.getCocktailImgUrl()))
                 .collect(Collectors.toList());
     }
+
+    // 칵테일 검색기능
+    public List<Cocktail> cocktailSearch(String keyword) {
+        // cockTailName, ingredient이 하나만 있을 수도 있고 둘 다 있을 수도 있음
+        if (keyword == null || keyword.trim().isEmpty()) {
+            // 아무 검색어 없으면 전체 반환 처리
+            return cocktailRepository.findAll();
+        } else {
+            // 이름 또는 재료 둘 중 하나라도 매칭되면 결과 반환
+            return cocktailRepository.findByCocktailNameContainingIgnoreCaseOrIngredientContainingIgnoreCase(keyword, keyword);
+        }
+    }
 }

src/main/java/com/back/domain/cocktail/service/CocktailService.java

@@ -43,12 +43,14 @@ public void cocktailInit() {
             cocktailRepository.save(Cocktail.builder()
                     .cocktailName("Cocktail " + i)
                     .cocktailImgUrl("http://example.com/img" + i + ".jpg")
-                    .ingredient("Ingredient1")
+                    .ingredient("Ingredient "+ i)
                     .alcoholStrength(AlcoholStrength.NON_ALCOHOLIC)
                     .build());
         }
         System.out.println("DevInitData: 테스트 칵테일 20개 삽입");
-        System.out.println(cocktailService.getCocktailById(1l));
+        System.out.println(cocktailService.getCocktailById(2l));
+        System.out.println(cocktailService.cocktailSearch("cocktail 3"));
+        System.out.println(cocktailService.cocktailSearch("Ingredient 4"));
     }
 }