Merge pull request #90 from SynergyX-AI-Pattern/feat/#80_image_search_non_kospi100_support

Feat/#80 image search non kospi100 support

Author: eldeoddt

src/main/java/com/synergyx/trading/controller/StockController.java

@@ -6,6 +6,7 @@
 import com.synergyx.trading.dto.stockDetail.RankedStockDTO;
 import com.synergyx.trading.dto.stockDetail.StockCandleResponseDTO;
 import com.synergyx.trading.dto.stockDetail.StockDetailResponseDTO;
+import com.synergyx.trading.dto.stockSearch.StockSearchFastApiResponseDTO;
 import com.synergyx.trading.dto.stockSearch.StockSearchResponseDTO;
 import com.synergyx.trading.service.stockService.candle.StockCandleQueryService;
 import com.synergyx.trading.service.stockService.detail.StockDetailQueryService;
@@ -72,7 +73,6 @@ public ResponseEntity<?> getStockCandles(
                 SuccessStatus.SUCCESS_CHART_DATA.getMessage()
         ));
     }
-
     @Operation(summary = "TOP 20 종목 조회", description = "TOP 20 종목을 조회합니다. (거래대금 기준)")
     @GetMapping("/top20")
     public ResponseEntity<?> getTop20Stocks() {
@@ -95,7 +95,7 @@ public ResponseEntity<?> searchStockByImage(
                     required = true
             )
             @RequestParam("image") MultipartFile image) {
-        StockSearchResponseDTO result = stockSearchQueryService.searchStockByImage(image);
+        StockSearchFastApiResponseDTO.StockSearchFastApiInfoResponseDTO result = stockSearchQueryService.searchStockByImage(image);
         return ResponseEntity.ok(ApiResponse.onSuccess(result));
     }
 }

src/main/java/com/synergyx/trading/dto/stockSearch/StockSearchFastApiResponseDTO.java

@@ -0,0 +1,39 @@
+package com.synergyx.trading.dto.stockSearch;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.synergyx.trading.enums.StockStatus;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+public class StockSearchFastApiResponseDTO  {
+
+    // FastAPI에서 받은 응답을 감싸는 Wrapper DTO
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class StockSearchFastApiWrapperDTO {
+
+        // camelCase로 매핑
+        @JsonProperty("is_success")
+        private boolean isSuccess;
+
+        private String code;
+        private String message;
+        private StockSearchFastApiInfoResponseDTO data;
+    }
+
+    // 반환 응답
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class StockSearchFastApiInfoResponseDTO {
+        private Long id; // stock id
+        private String name; // 종목명
+        private String imageUrl; // 종목 이미지
+        private StockStatus status; // 종목 상태
+    }
+}

src/main/java/com/synergyx/trading/dto/stockSearch/StockSearchFastApiWrapperDTO.java

@@ -0,0 +1,8 @@
+package com.synergyx.trading.enums;
+
+public enum StockStatus {
+    LISTED,         // KOSPI100 종목
+    LISTED_OUTSIDE, // db에 없는 상장 기업
+    UNLISTED,       // 비상장 브랜드/기업
+    UNKNOWN         // 판단 불가
+}

src/main/java/com/synergyx/trading/enums/StockStatus.java

@@ -1,12 +1,14 @@
 package com.synergyx.trading.service.stockService.search;
 
+import com.synergyx.trading.dto.stockSearch.StockSearchFastApiResponseDTO;
 import com.synergyx.trading.dto.stockSearch.StockSearchResponseDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
 public interface StockSearchQueryService {
     List<StockSearchResponseDTO> searchStocksByName(String keyword);
+
     // 이미지 기반 검색
-    StockSearchResponseDTO searchStockByImage(MultipartFile image);
+    StockSearchFastApiResponseDTO.StockSearchFastApiInfoResponseDTO searchStockByImage(MultipartFile image);
 }

src/main/java/com/synergyx/trading/service/stockService/search/StockSearchQueryService.java

@@ -1,10 +1,9 @@
 package com.synergyx.trading.service.stockService.search;
 
-import com.synergyx.trading.dto.stockSearch.StockSearchFastApiWrapperDTO;
+import com.synergyx.trading.dto.stockSearch.StockSearchFastApiResponseDTO;
 import com.synergyx.trading.apiPayload.code.status.ErrorStatus;
 import com.synergyx.trading.apiPayload.exception.GeneralException;
 import com.synergyx.trading.dto.stockSearch.StockSearchResponseDTO;
-import com.synergyx.trading.model.Stock;
 import com.synergyx.trading.repository.StockRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
@@ -46,7 +45,7 @@ public List<StockSearchResponseDTO> searchStocksByName(String keyword) {
      * @return StockSearchResponseDTO
      */
     @Override
-    public StockSearchResponseDTO searchStockByImage(MultipartFile image) {
+    public StockSearchFastApiResponseDTO.StockSearchFastApiInfoResponseDTO searchStockByImage(MultipartFile image) {
         // 파일 검증
         if (image.isEmpty()) {
             throw new GeneralException(ErrorStatus.IMAGE_FILE_MISSING);
@@ -67,26 +66,23 @@ public StockSearchResponseDTO searchStockByImage(MultipartFile image) {
             MultipartBodyBuilder builder = new MultipartBodyBuilder();
             builder.part("image", image.getResource());
 
-            StockSearchFastApiWrapperDTO response = fastApiWebClient.post()
+            StockSearchFastApiResponseDTO.StockSearchFastApiWrapperDTO response = fastApiWebClient.post()
                     .uri("/api/v1/stocks/search-by-image")
                     .contentType(MediaType.MULTIPART_FORM_DATA)
                     .bodyValue(builder.build())
                     .retrieve()
-                    .bodyToMono(StockSearchFastApiWrapperDTO.class)
+                    .bodyToMono(StockSearchFastApiResponseDTO.StockSearchFastApiWrapperDTO.class)
                     .block();
 
             if (response == null || !response.isSuccess()) {
                 throw new GeneralException(ErrorStatus.IMAGE_STOCK_NOT_FOUND);
             }
 
-            Long stockId = response.getData().getId();
-            Stock stock = stockRepository.findById(stockId)
-                    .orElseThrow(() -> new GeneralException(ErrorStatus.STOCK_NOT_FOUND));
-
-            return StockSearchResponseDTO.builder()
-                    .id(stock.getId())
-                    .name(stock.getName())
-                    .imageUrl(stock.getImageUrl())
+            return StockSearchFastApiResponseDTO.StockSearchFastApiInfoResponseDTO.builder()
+                    .id(response.getData().getId())
+                    .name(response.getData().getName())
+                    .imageUrl(response.getData().getImageUrl())
+                    .status(response.getData().getStatus())
                     .build();
 
         } catch (Exception e) {