recipe_domain include search

Author: JHLEE0617

src/main/java/com/webservice/algorithmchef/config/JwtAuthenticationFilter.java

@@ -13,7 +13,7 @@
 import org.springframework.web.filter.OncePerRequestFilter;
 
 // (⭐수정) algorithmchef 프로젝트의 의존성으로 변경
-import com.webservice.algorithmchef.service.UserService; 
+import com.webservice.algorithmchef.service.UserService;
 import com.webservice.algorithmchef.util.JwtUtil;
 
 import io.jsonwebtoken.Claims;
@@ -60,13 +60,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             claims = jwtUtil.getClaims(token);
         } catch (Exception e) {
             log.warn("유효하지 않은 JWT 토큰: {}", e.getMessage());
-            // (참고) 여기서 401 Unauthorized를 바로 반환할 수도 있으나, 
+            // (참고) 여기서 401 Unauthorized를 바로 반환할 수도 있으나,
             //       SecurityConfig의 exceptionHandling에서 처리하도록 위임하는 것이 일반적입니다.
         }
 
         // 3. 토큰이 유효하고, 아직 SecurityContext에 인증 정보가 없는 경우
         if (claims != null && SecurityContextHolder.getContext().getAuthentication() == null) {
-            
+
             // claims.getSubject()는 User 엔티티의 "userLoginId" (로그인 ID)여야 합니다.
             String userLoginId = claims.getSubject();
             String status = claims.get("status", String.class); // "status" 클레임 추출
@@ -84,11 +84,11 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                     return; // 필터 체인 중단
                 }
             }
-            
+
             // 6. (정상 사용자) 또는 (임시 사용자가 허용된 URL에 접근한 경우)
             //    UserDetails를 DB에서 조회하여 인증 토큰 생성
             UserDetails userDetails = userService.loadUserByUsername(userLoginId);
-            
+
             UsernamePasswordAuthenticationToken authenticationToken =
                     new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
             authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
@@ -97,7 +97,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             SecurityContextHolder.getContext().setAuthentication(authenticationToken);
             log.info("SecurityContext에 인증 정보 저장 완료: {}", userLoginId);
         }
-        
+
         // 8. 다음 필터로 체인 넘김
         filterChain.doFilter(request, response);
     }

src/main/java/com/webservice/algorithmchef/config/MailConfig.java

@@ -17,8 +17,8 @@
 @EnableWebSecurity
 @RequiredArgsConstructor
 public class SecurityConfig {
-    
-	private final JwtAuthenticationFilter jwtAuthenticationFilter;
+
+    private final JwtAuthenticationFilter jwtAuthenticationFilter;
 
 
     @Bean
@@ -34,8 +34,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 
         http
                 .authorizeHttpRequests(authorize -> authorize
-                        .requestMatchers("/auth/login", "/auth/signUp", 
-                        		"/auth/findPassword", "/auth/findUserId").permitAll()
+                        .requestMatchers("/auth/login", "/auth/signUp",
+                                "/auth/findPassword", "/auth/findUserId").permitAll()
                         .anyRequest().authenticated());
 
         http

src/main/java/com/webservice/algorithmchef/config/SecurityConfig.java

@@ -0,0 +1,50 @@
+package com.webservice.algorithmchef.controller;
+
+import com.webservice.algorithmchef.model.Recipe;
+import com.webservice.algorithmchef.service.RecipeService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/recipes")
+@CrossOrigin(origins = "http://localhost:3000")
+public class RecipeSearchController {
+
+    private final RecipeService recipeService;
+
+    public RecipeSearchController(RecipeService recipeService) {
+        this.recipeService = recipeService;
+    }
+
+    @GetMapping("/search")
+    public ResponseEntity<?> getRandomRecipe(@RequestParam String ingredient) {
+
+        Recipe recipe = recipeService.getRandomRecipeByIngredient(ingredient);
+
+        if (recipe == null) {
+            return ResponseEntity.ok("검색된 레시피가 없습니다.");
+        }
+
+        return ResponseEntity.ok(recipe);
+    }
+
+    @GetMapping("/search-multi")
+    public ResponseEntity<?> getRandomRecipeMultiple(@RequestParam String ingredients) {
+
+        List<String> ingList =
+                Arrays.stream(ingredients.split(","))
+                        .map(String::trim)
+                        .toList();
+
+        Recipe recipe = recipeService.getRandomRecipeByIngredients(ingList);
+
+        if (recipe == null) {
+            return ResponseEntity.ok("해당 재료들을 모두 포함한 레시피가 없습니다.");
+        }
+
+        return ResponseEntity.ok(recipe);
+    }
+}

src/main/java/com/webservice/algorithmchef/controller/RecipeSearchController.java

@@ -85,6 +85,9 @@ public static class Item {
         @JsonProperty("MANUAL19") private String manual19;
         @JsonProperty("MANUAL20") private String manual20;
 
+        @JsonProperty("RCP_NA_TIP")
+        private String naTip;
+
 
         public String getName() {
             return name;
@@ -158,5 +161,8 @@ public String getInstructions() {
 
             return String.join("\n", steps);
         }
+        public String getTip() {
+            return naTip;
+        }
     }
 }

src/main/java/com/webservice/algorithmchef/dto/recipe/CookRcpResponse.java

@@ -37,7 +37,7 @@ public class Recipe {
     private String description;
 
     @Lob
-    @Column(nullable = false)
+    @Column(nullable = false, columnDefinition = "LONGTEXT")
     private String instructions;
 
     private String imageUrl;

src/main/java/com/webservice/algorithmchef/model/Recipe.java

@@ -2,6 +2,8 @@
 
 import com.webservice.algorithmchef.model.Recipe;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 import java.util.List;
@@ -12,5 +14,23 @@ public interface RecipeRepository extends JpaRepository<Recipe, Long> {
 
     boolean existsByName(String name);
 
-    List<Recipe> findByNeededIngredientsContaining(String ingredient);
+    @Query("""
+        SELECT r FROM Recipe r
+        WHERE (:i1 = '' OR r.neededIngredients LIKE %:i1%)
+          AND (:i2 = '' OR r.neededIngredients LIKE %:i2%)
+          AND (:i3 = '' OR r.neededIngredients LIKE %:i3%)
+          AND (:i4 = '' OR r.neededIngredients LIKE %:i4%)
+          AND (:i5 = '' OR r.neededIngredients LIKE %:i5%)
+        """)
+    List<Recipe> findByIngredientsMulti(
+            @Param("i1") String i1,
+            @Param("i2") String i2,
+            @Param("i3") String i3,
+            @Param("i4") String i4,
+            @Param("i5") String i5
+    );
+
+    @Query("SELECT r FROM Recipe r " +
+            "WHERE r.neededIngredients LIKE %:ingredient%")
+    List<Recipe> findByIngredientKeyword(@Param("ingredient") String ingredient);
 }

src/main/java/com/webservice/algorithmchef/repository/RecipeRepository.java

@@ -68,26 +68,21 @@ public void importAllFromFoodSafety() {
 
                 Recipe r = new Recipe();
                 r.setName(name);
-
-                // description은 당분간 null 유지
                 r.setDescription(null);
-
                 r.setInstructions(item.getInstructions());
                 r.setImageUrl(item.getImageUrl());
-
-                // kcal이 null일 수 있으니까 방어 코드
                 Double kcal = item.getKcalOrNull();
                 r.setKcal(kcal != null ? kcal : 0.0);
 
-                String type = item.getType();
-                if (type == null || type.isBlank()) {
-                    type = "기타";
+                String originalType = item.getType();
+                if (originalType == null || originalType.isBlank()) {
+                    originalType = "기타";
                 }
-                r.setType(type);
-
-                // ✅ 재료 전체 문자열 그대로 저장
+                r.setTag(originalType);
+                r.setType("식품안전나라");
+                r.setTime(null);
+                r.setTip(item.getTip());
                 r.setNeededIngredients(item.getParts());
-
                 recipeRepository.save(r);
                 totalSaved++;
                 System.out.println("    -> DB save complete (current new save: " + totalSaved + ")");
@@ -98,5 +93,4 @@ public void importAllFromFoodSafety() {
 
         System.out.println("[IMPORT] every import complete. A total " + totalSaved + " new saved");
     }
-
 }

src/main/java/com/webservice/algorithmchef/service/RecipeImportService.java

@@ -0,0 +1,54 @@
+package com.webservice.algorithmchef.service;
+
+import com.webservice.algorithmchef.model.Recipe;
+import com.webservice.algorithmchef.repository.RecipeRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+@Service
+public class RecipeService {
+
+    private final RecipeRepository recipeRepository;
+    private final Random random = new Random();
+
+    public RecipeService(RecipeRepository recipeRepository) {
+        this.recipeRepository = recipeRepository;
+    }
+
+    public Recipe getRandomRecipeByIngredient(String ingredient) {
+        List<Recipe> list = recipeRepository.findByIngredientKeyword(ingredient);
+
+        if (list.isEmpty()) {
+            return null;
+        }
+
+        int idx = (int) (Math.random() * list.size());
+        return list.get(idx);
+    }
+
+    public Recipe getRandomRecipeByIngredients(List<String> ingredients) {
+
+        if (ingredients == null || ingredients.isEmpty()) {
+            throw new IllegalArgumentException("재료 리스트가 필요합니다.");
+        }
+
+        String i1 = ingredients.size() > 0 ? ingredients.get(0) : "";
+        String i2 = ingredients.size() > 1 ? ingredients.get(1) : "";
+        String i3 = ingredients.size() > 2 ? ingredients.get(2) : "";
+        String i4 = ingredients.size() > 3 ? ingredients.get(3) : "";
+        String i5 = ingredients.size() > 4 ? ingredients.get(4) : "";
+
+        List<Recipe> list =
+                recipeRepository.findByIngredientsMulti(i1, i2, i3, i4, i5);
+
+        if (list.isEmpty()) {
+            return null;
+        }
+
+        return list.get(random.nextInt(list.size()));
+    }
+}