First fixed Commit

Author: JHLEE0617

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

@@ -90,12 +90,11 @@ public String getName() {
             return name;
         }
 
-        public String getParts() {
-            return parts;
-        }
-
-        public String getDescription() {
-            return parts;
+        public String[] getParts() {
+            if (parts == null || parts.isBlank()) {
+                return new String[0]; // 빈 배열 반환
+            }
+            return parts.split("[,\\n]+");
         }
 
         public String getImageUrl() {

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

@@ -40,10 +40,6 @@ public class Recipe {
     @Column(nullable = false, columnDefinition = "LONGTEXT")
     private String instructions;
 
-    @Lob
-    @Column(columnDefinition = "TEXT")
-    private String neededIngredients;
-
     private String imageUrl;
 
 	@Column(nullable = false)

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

@@ -0,0 +1,7 @@
+package com.webservice.algorithmchef.repository;
+
+import com.webservice.algorithmchef.model.RecipeIngredient;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface RecipeIngredientRepository extends JpaRepository<RecipeIngredient, Long> {
+}

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

@@ -3,7 +3,7 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
-@Component("recipeDataInitializer")
+@Component
 public class RecipeDataInitializer implements CommandLineRunner {
 
     private final RecipeImportService importService;

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

@@ -3,22 +3,36 @@
 import com.webservice.algorithmchef.client.FoodSafetyApiClient;
 import com.webservice.algorithmchef.dto.recipe.CookRcpResponse;
 import com.webservice.algorithmchef.model.Recipe;
+import com.webservice.algorithmchef.model.RecipeIngredient;
+import com.webservice.algorithmchef.model.Ingredient;
 import com.webservice.algorithmchef.repository.RecipeRepository;
+import com.webservice.algorithmchef.repository.RecipeIngredientRepository;
+import com.webservice.algorithmchef.repository.IngredientRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.ArrayList;
 
 @Service
 public class RecipeImportService {
 
     private final FoodSafetyApiClient apiClient;
     private final RecipeRepository recipeRepository;
+    private final RecipeIngredientRepository recipeIngredientRepository;
+    private final IngredientRepository ingredientRepository;
 
     public RecipeImportService(FoodSafetyApiClient apiClient,
-                               RecipeRepository recipeRepository) {
+                               RecipeRepository recipeRepository,
+                               RecipeIngredientRepository recipeIngredientRepository,
+                               IngredientRepository ingredientRepository) {
         this.apiClient = apiClient;
         this.recipeRepository = recipeRepository;
+        this.recipeIngredientRepository = recipeIngredientRepository;
+        this.ingredientRepository = ingredientRepository;
     }
 
     @Transactional
@@ -61,16 +75,15 @@ public void importAllFromFoodSafety() {
                     continue;
                 }
 
-                // 이미 같은 이름이 있으면 스킵
                 if (recipeRepository.existsByName(name)) {
                     System.out.println("    -> exist recipe, skip");
                     continue;
                 }
 
+
                 Recipe r = new Recipe();
                 r.setName(name);
                 r.setDescription(null);
-                r.setNeededIngredients(item.getParts());
                 r.setInstructions(item.getInstructions());
                 r.setImageUrl(item.getImageUrl());
                 r.setKcal(item.getKcal());
@@ -80,15 +93,63 @@ public void importAllFromFoodSafety() {
                 }
                 r.setType(type);
 
+
                 recipeRepository.save(r);
+
+
+                List<RecipeIngredient> recipeIngredients = new ArrayList<>();
+                for (String ingredientWithUnit : item.getParts()) {
+                    String ingredientName = extractIngredientName(ingredientWithUnit);
+                    if (ingredientName == null || ingredientName.isBlank()) {
+                        continue;
+                    }
+
+
+                    Ingredient ingredient = findMatchingIngredient(ingredientName.trim());
+                    if (ingredient == null) {
+                        System.out.println("Ingredient not found for: " + ingredientName);
+                    }
+
+                    RecipeIngredient recipeIngredient = new RecipeIngredient();
+                    recipeIngredient.setRecipe(r);
+                    recipeIngredient.setNeededIngredients(ingredientWithUnit.trim());
+                    recipeIngredient.setIngredient(ingredient);
+
+                    recipeIngredients.add(recipeIngredient);
+                }
+
+                // Save RecipeIngredients to DB
+                recipeIngredientRepository.saveAll(recipeIngredients);
                 totalSaved++;
                 System.out.println("    -> DB save complete (current new save: " + totalSaved + ")");
             }
 
             start += BATCH_SIZE;
         }
 
-        System.out.println("[IMPORT] every import complete.  A total" + totalSaved + " new saved");
+        System.out.println("[IMPORT] every import complete. A total " + totalSaved + " new saved");
+    }
+
+    private String extractIngredientName(String ingredientWithUnit) {
+        String ingredientName = ingredientWithUnit.replaceAll("\\d+\\s*[a-zA-Z가-힣]+", "").trim();
+        return ingredientName.isEmpty() ? null : ingredientName;
+    }
+
+    private Ingredient findMatchingIngredient(String ingredientName) {
+        ingredientName = ingredientName.trim();
+
+        Ingredient ingredient = ingredientRepository.findByName(ingredientName).orElse(null);
+        if (ingredient == null) {
+            Pageable pageable = PageRequest.of(0, 10);
+
+            Page<Ingredient> ingredientsPage = ingredientRepository.findByNameContaining(ingredientName, pageable);
+
+            if (!ingredientsPage.isEmpty()) {
+                ingredient = ingredientsPage.getContent().get(0);
+            }
+        }
+
+        return ingredient;
     }
 
 }