[LLM] Qdrant 연결 오류 해결

src/main/java/io/github/petty/llm/common/ContentType.java

@@ -8,11 +8,11 @@
 public enum ContentType {
     TOUR(12, "관광지"),
     CULTURE(14, "문화시설"),
-    FESTIVAL(15, "축제/공연/행사"),
-    SPORTS(28, "레포츠/레저"),
-    STAY(32, "숙박/숙소/호텔/모텔/펜션"),
+    FESTIVAL(15, "축제, 공연, 행사"),
+    SPORTS(28, "레포츠, 레저"),
+    STAY(32, "숙박, 숙소, 호텔, 모텔, 펜션"),
     SHOPPING(38, "쇼핑"),
-    FOOD(39, "음식점/식당"),
+    FOOD(39, "음식점, 식당"),
     ETC(0, "기타");
 
     private final int code;

src/main/java/io/github/petty/llm/controller/EmbeddingBatchController.java

@@ -0,0 +1,31 @@
+package io.github.petty.llm.controller;
+
+import io.github.petty.llm.service.EmbeddingBatchService;
+import lombok.RequiredArgsConstructor;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/embedding-batch")
+@RequiredArgsConstructor
+public class EmbeddingBatchController {
+    private final EmbeddingBatchService embeddingBatchService;
+
+    // 기본 저장
+    @PostMapping("/run")
+    public String runBatch() {
+        embeddingBatchService.saveAllContentsInBatch();
+        return "Vector DB 구성 완료";
+    }
+
+    // 실패 ID 재저장
+//    @PostMapping("/retry")
+//    public String retryFailedEmbeddings(@RequestBody List<Long> failedContentIds) {
+//        embeddingBatchService.retryFailedContents(failedContentIds);
+//        return "재시도 완료!";
+//    }
+}

src/main/java/io/github/petty/llm/controller/RecommendController.java

@@ -1,7 +1,7 @@
 package io.github.petty.llm.controller;
 
 import io.github.petty.llm.common.AreaCode;
-import io.github.petty.llm.service.ChatService;
+import io.github.petty.llm.dto.RecommendResponseDTO;
 import io.github.petty.llm.service.RecommendService;
 import io.github.petty.llm.service.VectorStoreService;
 import lombok.RequiredArgsConstructor;
@@ -23,9 +23,9 @@ public class RecommendController {
     private final RecommendService recommendService;
 
     @PostMapping
-    public ResponseEntity<String> recommend(@RequestBody Map<String, String> promptMap) {
-        String result = recommendService.recommend(promptMap);
+    public ResponseEntity<RecommendResponseDTO> recommend(@RequestBody Map<String, String> promptMap) {
+        RecommendResponseDTO result = recommendService.recommend(promptMap);
         return ResponseEntity.ok(result);
     }
 
-}
+}

src/main/java/io/github/petty/llm/dto/RecommendResponseDTO.java

@@ -0,0 +1,18 @@
+package io.github.petty.llm.dto;
+
+import java.util.List;
+
+// 추천 응답 반환
+public record RecommendResponseDTO (
+        List<PlaceRecommend> recommend
+) {
+    public record PlaceRecommend (
+            String contentId,
+            String title,
+            String addr,
+            String description,
+            String imageUrl,
+            String acmpyTypeCd,
+            String acmpyPsblCpam,
+            String acmpyNeedMtr ) {}
+}

src/main/java/io/github/petty/llm/service/ContentService.java

@@ -0,0 +1,109 @@
+package io.github.petty.llm.service;
+
+
+import io.github.petty.tour.dto.DetailPetDto;
+import io.github.petty.tour.entity.Content;
+import io.github.petty.tour.entity.ContentImage;
+import io.github.petty.tour.repository.ContentImageRepository;
+import io.github.petty.tour.repository.ContentRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ContentService {
+    // content ID 받아서 추가 정보 받기
+    private final ContentRepository contentRepository;
+    private final ContentImageRepository contentImageRepository;
+
+    private static final String DEFAULT_IMAGE_URL = "/assets/noimg.png";
+
+    public Optional<Content> findByContentId(String contentId){
+        try {
+            Long id = Long.parseLong(contentId);
+            return contentRepository.findById(id);
+        } catch (NumberFormatException e) {
+            // contentid가 없을 때
+            log.error("Invalid contentId format: {}", contentId, e);
+            return Optional.empty();
+        }
+    }
+
+
+
+
+    public String getImageUrl(String contentId){
+        try {
+            Long id = Long.parseLong(contentId);
+
+            // 1. Content 엔티티에서 이미지 확인
+            Optional<Content> contentOpt = contentRepository.findById(id);
+            if (contentOpt.isPresent()) {
+                Content content = contentOpt.get();
+
+                // firstimage 필드가 있다고 가정 (필드명은 실제 엔티티에 맞게 조정 필요)
+                String contentImage = content.getFirstImage();
+                if (contentImage != null && !contentImage.isEmpty()) {
+                    return contentImage;
+                }
+            }
+
+            // 2. ContentImageRepository에서 이미지 검색
+            List<ContentImage> images = contentImageRepository.findByContent_ContentId(id);
+            if (images != null && !images.isEmpty()) {
+                // 첫 번째 이미지의 URL 반환 (필드명은 실제 엔티티에 맞게 조정 필요)
+                return images.get(0).getOriginImgUrl();
+            }
+
+            // 3. 이미지가 없는 경우 기본 이미지 반환
+            return DEFAULT_IMAGE_URL;
+
+        } catch (NumberFormatException e) {
+            log.error("Invalid contentId format: {}", contentId, e);
+            return DEFAULT_IMAGE_URL;
+        }
+    }
+
+
+    /*
+        if (pet != null) {
+            sb.append("반려 동물 정보: ");
+            if (pet.getAcmpyTypeCd() != null)
+                sb.append("동반 유형은 ").append(pet.getAcmpyTypeCd()).append(", ");
+            if (pet.getEtcAcmpyInfo() != null)
+                sb.append("가능 동물: ").append(pet.getEtcAcmpyInfo()).append(", ");
+            if (pet.getAcmpyPsblCpam() != null)
+                sb.append("추가 정보: ").append(pet.getAcmpyPsblCpam()).append(", ");
+            if (pet.getAcmpyNeedMtr() != null)
+                sb.append("준비물: ").append(pet.getAcmpyNeedMtr()).append(". ");
+            sb.append("\n");
+        }
+ */
+    public Optional<DetailPetDto> getPetInfo(String contentId) {
+        try {
+            Long id = Long.parseLong(contentId);
+            Optional<Content> contentOpt = contentRepository.findById(id);
+
+            if (contentOpt.isPresent()) {
+                Content content = contentOpt.get();
+                if (content.getPetTourInfo() != null) {
+                    DetailPetDto dto = new DetailPetDto();
+                    dto.setContentId(id);
+                    dto.setAcmpyTypeCd(content.getPetTourInfo().getAcmpyTypeCd());
+                    dto.setAcmpyPsblCpam(content.getPetTourInfo().getAcmpyPsblCpam());
+                    dto.setAcmpyNeedMtr(content.getPetTourInfo().getAcmpyNeedMtr());
+                    return Optional.of(dto);
+                }
+            }
+            return Optional.empty();
+        } catch (NumberFormatException e) {
+            log.error("반려동물 정보 관련 오류: {}", contentId, e);
+            return Optional.empty();
+        }
+    }
+}

src/main/java/io/github/petty/llm/service/EmbeddingBatchService.java

@@ -0,0 +1,83 @@
+package io.github.petty.llm.service;
+
+import io.github.petty.tour.entity.Content;
+import io.github.petty.tour.repository.ContentRepository;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class EmbeddingBatchService {
+    private final ContentRepository contentRepository;
+    private final VectorStoreService vectorStoreService;
+
+    // Content 50개 저장
+    public void saveAllContentsInBatch() {
+        // 1. 상위 50개 Content 조회
+        List<Content> top50Contents = contentRepository.findTop20ByOrderByContentIdAsc();
+
+        log.info("Content 20개 가져오기 완료. 저장 시작!");
+
+        // 2. 바로 저장 (중복 검사 없이)
+        vectorStoreService.saveContents(top50Contents);
+
+        log.info("Content 20개 저장 완료!");
+    }
+
+    // 기본 리스트 저장
+//    public void saveAllContentsInBatch() {
+//        List<Content> allContents = contentRepository.findAll();
+//        int batchSize = 50;
+//        int totalSize = allContents.size();
+//
+//        // 중간에 끊긴 번호부터 시작
+////        int startIndex = 450;
+////
+////        // 중복 검사 = 현재 VectorStore에 저장된 contentId 리스트 가져오기
+////        List<String> existingContentIds = vectorStoreService.findAllContentIds();
+////
+////        log.info("총 {}개 데이터, {}번부터 배치 크기 {}로 저장 시작", totalSize, startIndex, batchSize);
+////
+////        for (int i = startIndex; i < totalSize; i += batchSize) {
+////            int end = Math.min(i + batchSize, totalSize);
+////            List<Content> batchList = allContents.subList(i, end);
+////
+////            log.info("{}번째 batch 시작 ({} ~ {})", (i / batchSize) + 1, i, end);
+////
+////            // 중복이면 제거하기
+////            List<Content> filteredBatch = batchList.stream()
+////                    .filter(content -> {
+////                        String contentId = content.getContentId().toString();
+////                        return !existingContentIds.contains(contentId);
+////                    })
+////                    .toList();
+////
+////            if (filteredBatch.isEmpty()) {
+////                log.info("{}번째 batch: 저장할 새 데이터 없음 (모두 중복)", (i / batchSize) + 1);
+////                continue;
+////            }
+////
+////            // 3. 저장
+////            vectorStoreService.saveContents(filteredBatch);
+////
+////            log.info("{}번째 batch 저장 완료 ({}개 저장)", (i / batchSize) + 1, filteredBatch.size());
+////        }
+////    }
+//
+//    // 실패한 리스트 저장
+////    public void retryFailedContents(List<Long> failedContentIds) {
+////        List<Content> failedContents = contentRepository.findAllById(failedContentIds);
+////
+////        log.info("재시도할 Content 수: {}", failedContents.size());
+////
+////        vectorStoreService.saveContents(failedContents);
+////
+////        log.info("재시도 저장 완료");
+////    }
+}
+