Merge pull request #83 from runtiime/revert-82-revert-81-feat/ai-ocr-integration

iamseojin · web-flow · commit 67cf98e50dd8 · 2025-05-22T00:21:17.000+09:00
[fix] revert rollback of AI OCR 기능 추가
diff --git a/yechef/src/main/java/sejong/capston/yechef/domain/Gpt/dto/RecipeParseResultDto.java b/yechef/src/main/java/sejong/capston/yechef/domain/Gpt/dto/RecipeParseResultDto.java
@@ -18,4 +18,20 @@ public class RecipeParseResultDto {
     private int servings;
     private List<IngredientDto> ingredients;
     private List<RecipeStepDto> steps;
+
+    private String sourceImageUrl;
+
+    public RecipeParseResultDto(    // TODO: 사용처를 빌더 패턴으로 수정하기
+        String title,
+        String text,
+        int servings,
+        List<IngredientDto> ingredients,
+        List<RecipeStepDto> steps
+    ) {
+        this.title = title;
+        this.text = text;
+        this.servings = servings;
+        this.ingredients = ingredients;
+        this.steps = steps;
+    }
 }
diff --git a/yechef/src/main/java/sejong/capston/yechef/domain/Image/service/ImageService.java b/yechef/src/main/java/sejong/capston/yechef/domain/Image/service/ImageService.java
@@ -3,13 +3,15 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 import sejong.capston.yechef.domain.Image.Image;
 import sejong.capston.yechef.domain.Image.repository.ImageRepository;
 import sejong.capston.yechef.domain.KakaoImage.service.KakaoImageService;
 import sejong.capston.yechef.domain.Recipe.Recipe;
 import sejong.capston.yechef.domain.Recipe.repository.RecipeRepository;
 import sejong.capston.yechef.global.exception.BaseException;
 import sejong.capston.yechef.global.exception.error.ErrorCode;
+import sejong.capston.yechef.global.s3.service.S3UploadService;
 
 @Service
 @RequiredArgsConstructor
@@ -18,6 +20,7 @@ public class ImageService {
   private final ImageRepository imageRepository;
   private final RecipeRepository recipeRepository;
   private final KakaoImageService kakaoImageService;
+  private final S3UploadService s3UploadService;
 
   @Transactional
   public void generateAndSaveThumbnail(Long recipeId) {
@@ -46,4 +49,17 @@ private String extractKeyFromUrl(String url) {
     return url.substring(url.indexOf(".com/") + 5);
   }
 
+  @Transactional
+  public Image saveImage(MultipartFile file) {
+    String s3Url = s3UploadService.uploadAndGenerateKey(file);
+    String s3Key = s3UploadService.extractKeyFromUrl(s3Url);
+
+    Image image = Image.builder()
+        .s3Url(s3Url)
+        .s3Key(s3Key)
+        .build();
+
+    return imageRepository.save(image);
+  }
+
 }
diff --git a/yechef/src/main/java/sejong/capston/yechef/domain/KakaoImage/service/KakaoImageService.java b/yechef/src/main/java/sejong/capston/yechef/domain/KakaoImage/service/KakaoImageService.java
@@ -1,6 +1,7 @@
 package sejong.capston.yechef.domain.KakaoImage.service;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -12,11 +13,14 @@
 import java.net.URL;
 
 @Service
-@RequiredArgsConstructor
 public class KakaoImageService {
 
   private final WebClient kakaoImageWebClient;
 
+  public KakaoImageService(@Qualifier("kakaoImageWebClient") WebClient kakaoImageWebClient) {
+    this.kakaoImageWebClient = kakaoImageWebClient;
+  }
+
   /**
    * 카카오 이미지 검색 API 호출
    */
diff --git a/yechef/src/main/java/sejong/capston/yechef/domain/Recipe/ai/OcrClient.java b/yechef/src/main/java/sejong/capston/yechef/domain/Recipe/ai/OcrClient.java
@@ -0,0 +1,36 @@
+package sejong.capston.yechef.domain.Recipe.ai;
+
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.MultipartBodyBuilder;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.reactive.function.client.WebClient;
+import sejong.capston.yechef.domain.Gpt.dto.RecipeParseResultDto;
+
+@Component
+public class OcrClient {
+
+  @Qualifier("aiWebClient")
+  private final WebClient webClient;
+
+  public OcrClient(@Qualifier("aiWebClient") WebClient webClient) {
+    this.webClient = webClient;
+  }
+
+
+  public RecipeParseResultDto extractText(MultipartFile imageFile) {
+    MultipartBodyBuilder builder = new MultipartBodyBuilder();
+    builder.part("file", imageFile.getResource());
+
+    return webClient.post()
+        .uri("/ocr/parse")
+        .contentType(MediaType.MULTIPART_FORM_DATA)
+        .bodyValue(builder.build())
+        .retrieve()
+        .bodyToMono(RecipeParseResultDto.class)
+        .block();
+  }
+
+}
diff --git a/yechef/src/main/java/sejong/capston/yechef/domain/Recipe/controller/RecipeController.java b/yechef/src/main/java/sejong/capston/yechef/domain/Recipe/controller/RecipeController.java
@@ -3,19 +3,14 @@
 import java.net.URI;
 import java.util.List;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
-
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
 
 import sejong.capston.yechef.domain.Gpt.dto.RecipeParseResultDto;
 import sejong.capston.yechef.domain.Recipe.Recipe;
@@ -30,32 +25,30 @@
 public class RecipeController {
 
   private final RecipeService recipeService;
-    @PostMapping(value = "/{memberId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<RecipeDto> createRecipe(
-            @Parameter(description = "회원 ID", required = true)
-            @PathVariable("memberId") Long memberId,
 
-            @Parameter(description = "GPT 파싱 결과 JSON (문자열 형태)", required = true)
-            @RequestPart("dto") String dtoText,  // String으로 먼저 받음
+  // ✅ 레시피 저장 (AI에서 받은 OCR 결과 저장)
+  @PostMapping(value = "/{memberId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+  public ResponseEntity<RecipeDto> createRecipe(
+      @Parameter(description = "회원 ID", required = true)
+      @PathVariable("memberId") Long memberId,
+
+      @RequestBody RecipeParseResultDto dto
+  ) {
+    RecipeDto result = recipeService.create(memberId, dto);
+    return ResponseEntity
+        .created(URI.create("/api/recipes/" + result.getId()))
+        .body(result);
+  }
 
-            @Parameter(description = "레시피 이미지 파일", required = true)
-            @RequestPart("sourceImageFile") MultipartFile sourceImageFile
-    ) {
-        try {
-            // 문자열 → 객체 변환
-            ObjectMapper objectMapper = new ObjectMapper();
-            RecipeParseResultDto dto = objectMapper.readValue(dtoText, RecipeParseResultDto.class);
+  @PostMapping(value = "/ocr/create", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+  public ResponseEntity<RecipeDto> createRecipeFromImage(
+      @RequestParam("memberId") Long memberId,
+      @RequestPart("image") MultipartFile imageFile) {
+    RecipeDto result = recipeService.createRecipeFromImage(memberId, imageFile);
+    return ResponseEntity.ok(result);
+  }
 
-            RecipeDto result = recipeService.create(memberId, dto, sourceImageFile);
-            return ResponseEntity
-                    .created(URI.create("/api/recipes/" + result.getId()))
-                    .body(result);
-        } catch (Exception e) {
-            // 파싱 실패 시 예외 처리
-            return ResponseEntity.badRequest().build();
-        }
-    }
-    
+  // 상세 조회
   @GetMapping("/{recipeId}")
   public ResponseEntity<DetailRecipeDto> getRecipe(
       @Parameter(description = "조회할 레시피 ID", required = true)
@@ -64,7 +57,7 @@ public ResponseEntity<DetailRecipeDto> getRecipe(
     return ResponseEntity.ok(recipeService.getRecipe(recipeId));
   }
 
-
+  // 삭제
   @DeleteMapping("/members/{memberId}/recipes/{recipeId}")
   public ResponseEntity<Void> deleteRecipe(
       @PathVariable("memberId") Long memberId,
@@ -74,9 +67,9 @@ public ResponseEntity<Void> deleteRecipe(
     return ResponseEntity.noContent().build();
   }
 
-
+  // 공개 목록 조회
   @GetMapping("/public")
   public ResponseEntity<List<Recipe>> getPublicRecipes() {
     return ResponseEntity.ok(recipeService.getPublicRecipes());
   }
-}
+}
diff --git a/yechef/src/main/java/sejong/capston/yechef/domain/Recipe/controller/RecipeProgressController.java b/yechef/src/main/java/sejong/capston/yechef/domain/Recipe/controller/RecipeProgressController.java
@@ -2,10 +2,12 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import sejong.capston.yechef.domain.Recipe.dto.RecipeStepDto;
 import sejong.capston.yechef.domain.Recipe.dto.VoiceInputDto;
@@ -18,14 +20,15 @@ public class RecipeProgressController {
 
   private final RecipeProgressService progressService;
 
-  @PostMapping("/{recipeId}/step/{stepNumber}/progress")
+  @GetMapping("/{recipeId}/step/{stepNumber}/progress")
   public RecipeStepDto progressStep(
-      @PathVariable("memberId") Long memberId,
+      @RequestParam("memberId") Long memberId,
       @PathVariable("recipeId") Long recipeId,
       @PathVariable("stepNumber") int stepNumber,
-      @RequestBody VoiceInputDto input
+      @RequestParam("text") String inputText
   ) {
-    return progressService.processStep(memberId, recipeId, stepNumber, input.getText());
+    return progressService.processStep(memberId, recipeId, stepNumber, inputText);
   }
+
 }
 
diff --git a/yechef/src/main/java/sejong/capston/yechef/domain/Recipe/service/RecipeService.java b/yechef/src/main/java/sejong/capston/yechef/domain/Recipe/service/RecipeService.java
diff --git a/yechef/src/main/java/sejong/capston/yechef/global/config/AiWebClientConfig.java b/yechef/src/main/java/sejong/capston/yechef/global/config/AiWebClientConfig.java
diff --git a/yechef/src/main/resources/application.yml b/yechef/src/main/resources/application.yml
