[CHORE] 큐레이션 로직 구현

src/main/java/or/sopt/houme/domain/furniture/infrastructure/dto/external/naverShop/FurnitureProductsInfoResponse.java

@@ -17,7 +17,14 @@ public record FurnitureProductInfo(
             String furnitureProductName,
             String furnitureProductMallName,
             Long furnitureProductId,
-            double similarity
+            double similarity,
+            List<String> colors,
+            List<String> clientColors,
+            Long listPrice,
+            Integer discountRate,
+            Long discountPrice,
+            String brandName,
+            Long jjymCount
     ) {
         public static FurnitureProductInfo of(
                 Long id,
@@ -35,7 +42,48 @@ public static FurnitureProductInfo of(
                     furnitureProductName,
                     furnitureProductMallName,
                     furnitureProductId,
-                    similarity
+                    similarity,
+                    List.of(),
+                    List.of(),
+                    null,
+                    null,
+                    null,
+                    null,
+                    0L
+            );
+        }
+
+        public static FurnitureProductInfo of(
+                Long id,
+                String furnitureProductImageUrl,
+                String furnitureProductSiteUrl,
+                String furnitureProductName,
+                String furnitureProductMallName,
+                Long furnitureProductId,
+                double similarity,
+                List<String> colors,
+                List<String> clientColors,
+                Long listPrice,
+                Integer discountRate,
+                Long discountPrice,
+                String brandName,
+                Long jjymCount
+        ) {
+            return new FurnitureProductInfo(
+                    id,
+                    furnitureProductImageUrl,
+                    furnitureProductSiteUrl,
+                    furnitureProductName,
+                    furnitureProductMallName,
+                    furnitureProductId,
+                    similarity,
+                    colors,
+                    clientColors,
+                    listPrice,
+                    discountRate,
+                    discountPrice,
+                    brandName,
+                    jjymCount
             );
         }
     }

src/main/java/or/sopt/houme/domain/furniture/infrastructure/scheduler/CurationFurnitureScheduler.java

@@ -4,9 +4,11 @@
 import lombok.extern.slf4j.Slf4j;
 import or.sopt.houme.domain.furniture.infrastructure.dto.external.naverShop.FurnitureProductsInfoResponse;
 import or.sopt.houme.domain.furniture.infrastructure.dto.external.naverShop.NaverFurnitureProductDto;
+import or.sopt.houme.domain.furniture.model.entity.CurationSource;
 import or.sopt.houme.domain.furniture.model.entity.FurnitureTag;
 import or.sopt.houme.domain.furniture.repository.FurnitureTagRepository;
 import or.sopt.houme.domain.furniture.service.CurationFurnitureService;
+import or.sopt.houme.domain.furniture.service.CurationRawProductService;
 import or.sopt.houme.domain.furniture.service.ImageHashService;
 import or.sopt.houme.domain.furniture.service.NaverShopService;
 import or.sopt.houme.global.discord.DiscordWebhookService;
@@ -32,6 +34,7 @@ public class CurationFurnitureScheduler {
     private final NaverShopService naverShopService;
     private final ImageHashService imageHashService;
     private final CurationFurnitureService curationFurnitureService;
+    private final CurationRawProductService curationRawProductService;
     private final DiscordWebhookService discordWebhookService;
 
     @Scheduled(cron = "0 0 2 * * *", zone = "Asia/Seoul")
@@ -58,15 +61,27 @@ public void refreshCurationResults() {
                 }
 
                 FurnitureTag furnitureTag = furnitureTags.get(i);
-                List<FurnitureProductsInfoResponse.FurnitureProductInfo> infos = fetchCurationWithRetry(furnitureTag);
-                if (infos.isEmpty()) {
-                    emptyTags++;
-                    log.warn("큐레이션 배치: 결과 없음 tagId={}", furnitureTag.getId());
+                boolean hasResult = false;
+
+                List<FurnitureProductsInfoResponse.FurnitureProductInfo> naverInfos = fetchNaverCurationWithRetry(furnitureTag);
+                if (!naverInfos.isEmpty()) {
+                    curationFurnitureService.saveCurationResults(furnitureTag, naverInfos, CurationSource.NAVER);
+                    hasResult = true;
+                }
+
+                List<FurnitureProductsInfoResponse.FurnitureProductInfo> rawInfos = fetchRawCurationWithRetry(furnitureTag);
+                if (!rawInfos.isEmpty()) {
+                    curationFurnitureService.saveCurationResults(furnitureTag, rawInfos, CurationSource.RAW);
+                    hasResult = true;
+                }
+
+                if (hasResult) {
+                    successTags++;
                     continue;
                 }
 
-                curationFurnitureService.saveCurationResults(furnitureTag, infos);
-                successTags++;
+                emptyTags++;
+                log.warn("큐레이션 배치: NAVER/RAW 모두 결과 없음 tagId={}", furnitureTag.getId());
             }
         } catch (Exception e) {
             status = "실패";
@@ -91,24 +106,46 @@ public void refreshCurationResults() {
         }
     }
 
-    private List<FurnitureProductsInfoResponse.FurnitureProductInfo> fetchCurationWithRetry(FurnitureTag furnitureTag) {
+    private List<FurnitureProductsInfoResponse.FurnitureProductInfo> fetchNaverCurationWithRetry(FurnitureTag furnitureTag) {
         for (int attempt = 1; attempt <= MAX_RETRY; attempt++) {
             try {
-                return fetchCurationInfos(furnitureTag);
+                return fetchNaverCurationInfos(furnitureTag);
             } catch (Exception e) {
-                log.warn("큐레이션 배치 실패: tagId={}, attempt={}", furnitureTag.getId(), attempt, e);
+                log.warn("네이버 큐레이션 배치 실패: tagId={}, attempt={}", furnitureTag.getId(), attempt, e);
                 sleep(RETRY_BACKOFF_MILLIS * attempt);
             }
         }
 
         return List.of();
     }
 
-    private List<FurnitureProductsInfoResponse.FurnitureProductInfo> fetchCurationInfos(FurnitureTag furnitureTag) {
+    private List<FurnitureProductsInfoResponse.FurnitureProductInfo> fetchRawCurationWithRetry(FurnitureTag furnitureTag) {
+        for (int attempt = 1; attempt <= MAX_RETRY; attempt++) {
+            try {
+                return fetchRawCurationInfos(furnitureTag);
+            } catch (Exception e) {
+                log.warn("RAW 큐레이션 배치 실패: tagId={}, attempt={}", furnitureTag.getId(), attempt, e);
+                sleep(RETRY_BACKOFF_MILLIS * attempt);
+            }
+        }
+
+        return List.of();
+    }
+
+    private List<FurnitureProductsInfoResponse.FurnitureProductInfo> fetchNaverCurationInfos(FurnitureTag furnitureTag) {
         List<NaverFurnitureProductDto> products = naverShopService.search(furnitureTag.getSearchKeyword(), NAVER_DISPLAY);
         return imageHashService.rankByImageSimilarity(furnitureTag.getFurnitureUrl(), products, TOP_N);
     }
 
+    private List<FurnitureProductsInfoResponse.FurnitureProductInfo> fetchRawCurationInfos(FurnitureTag furnitureTag) {
+        List<NaverFurnitureProductDto> candidates = curationRawProductService.getCandidatesByFurnitureTag(furnitureTag);
+        if (candidates.isEmpty()) {
+            return List.of();
+        }
+
+        return imageHashService.rankByImageSimilarity(furnitureTag.getFurnitureUrl(), candidates, TOP_N);
+    }
+
     private void sleep(long millis) {
         try {
             Thread.sleep(millis);

src/main/java/or/sopt/houme/domain/furniture/model/entity/CurationFurniture.java

@@ -19,8 +19,8 @@
         },
         uniqueConstraints = {
                 @UniqueConstraint(
-                        name = "uk_curation_furniture_tag_rank",
-                        columnNames = {"furniture_tag_id", "rank"}
+                        name = "uk_curation_furniture_tag_source_rank",
+                        columnNames = {"furniture_tag_id", "source", "rank"}
                 )
         }
 )
@@ -42,6 +42,10 @@ public class CurationFurniture {
     @Column(name = "rank", nullable = false)
     private Integer rank;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = "source", nullable = false)
+    private CurationSource source;
+
     @Column(name = "similarity", nullable = false)
     private Double similarity;
 
@@ -52,13 +56,15 @@ public static CurationFurniture of(
             FurnitureTag furnitureTag,
             RecommendFurniture recommendFurniture,
             int rank,
+            CurationSource source,
             double similarity,
             LocalDateTime fetchedAt
     ) {
         return CurationFurniture.builder()
                 .furnitureTag(furnitureTag)
                 .recommendFurniture(recommendFurniture)
                 .rank(rank)
+                .source(source)
                 .similarity(similarity)
                 .fetchedAt(fetchedAt)
                 .build();

src/main/java/or/sopt/houme/domain/furniture/model/entity/CurationRawProduct.java

@@ -4,10 +4,13 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
@@ -29,7 +32,8 @@
         indexes = {
                 @Index(name = "idx_raw_source", columnList = "source"),
                 @Index(name = "idx_raw_category", columnList = "category"),
-                @Index(name = "idx_raw_fetched_at", columnList = "fetched_at")
+                @Index(name = "idx_raw_fetched_at", columnList = "fetched_at"),
+                @Index(name = "idx_raw_furniture_tag_id", columnList = "furniture_tag_id")
         },
         uniqueConstraints = {
                 @UniqueConstraint(
@@ -75,22 +79,39 @@ public class CurationRawProduct {
     @Comment("판매 몰 이름")
     private String productMallName;
 
+    @Column(name = "brand")
+    @Comment("브랜드")
+    private String brand;
+
     @Column(name = "list_price")
-    @Comment("정가")
+    @Comment("임의 정가")
     private Long listPrice;
 
     @Column(name = "discount_rate")
     @Comment("할인률(%)")
     private Integer discountRate;
 
     @Column(name = "discount_price")
-    @Comment("할인가")
+    @Comment("판매가")
     private Long discountPrice;
 
+    @Column(name = "base_shipping_fee")
+    @Comment("기본 배송비")
+    private Long baseShippingFee;
+
+    @Column(name = "free_shipping_condition")
+    @Comment("무료 배송 조건")
+    private Long freeShippingCondition;
+
     @Column(name = "fetched_at", nullable = false)
     @Comment("수집 시각")
     private LocalDateTime fetchedAt;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "furniture_tag_id")
+    @Comment("수동 매핑된 가구 태그")
+    private FurnitureTag furnitureTag;
+
     public static CurationRawProduct of(
             String source,
             SoozipCategory category,
@@ -136,4 +157,8 @@ public void updateFrom(
             this.fetchedAt = fetchedAt;
         }
     }
+
+    public void updateFurnitureTag(FurnitureTag furnitureTag) {
+        this.furnitureTag = furnitureTag;
+    }
 }

src/main/java/or/sopt/houme/domain/furniture/model/entity/CurationSource.java

@@ -0,0 +1,6 @@
+package or.sopt.houme.domain.furniture.model.entity;
+
+public enum CurationSource {
+    NAVER,
+    RAW
+}

src/main/java/or/sopt/houme/domain/furniture/model/entity/RecommendFurniture.java

@@ -12,12 +12,13 @@
 @Table(
         name = "recommend_furnitures",
         indexes = {
-                @Index(name = "idx_furniture_product_id", columnList = "furniture_product_id")
+                @Index(name = "idx_furniture_product_id", columnList = "furniture_product_id"),
+                @Index(name = "idx_recommend_source", columnList = "source")
         },
         uniqueConstraints = {
                 @UniqueConstraint(
-                        name = "uk_furniture_product_id",
-                        columnNames = {"furniture_product_id"}
+                        name = "uk_source_furniture_product_id",
+                        columnNames = {"source", "furniture_product_id"}
                 )
         }
 )
@@ -47,21 +48,27 @@ public class RecommendFurniture {
     @Comment("추천 가구 식별자")
     private Long furnitureProductId;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = "source", nullable = false)
+    @Comment("큐레이션 소스")
+    private CurationSource source;
 
 
     public static RecommendFurniture from(
             String furnitureProductImageUrl,
             String furnitureProductSiteUrl,
             String furnitureProductName,
             String furnitureProductMallName,
-            Long furnitureProductId
+            Long furnitureProductId,
+            CurationSource source
     ){
         return RecommendFurniture.builder()
                 .furnitureProductImageUrl(furnitureProductImageUrl)
                 .furnitureProductSiteUrl(furnitureProductSiteUrl)
                 .furnitureProductName(furnitureProductName)
                 .furnitureProductMallName(furnitureProductMallName)
                 .furnitureProductId(furnitureProductId)
+                .source(source)
                 .build();
     }
 }

src/main/java/or/sopt/houme/domain/furniture/repository/CurationFurnitureRepository.java

@@ -1,6 +1,7 @@
 package or.sopt.houme.domain.furniture.repository;
 
 import or.sopt.houme.domain.furniture.model.entity.CurationFurniture;
+import or.sopt.houme.domain.furniture.model.entity.CurationSource;
 import or.sopt.houme.domain.furniture.model.entity.FurnitureTag;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -12,7 +13,7 @@
 public interface CurationFurnitureRepository extends JpaRepository<CurationFurniture, Long> {
 
     @EntityGraph(attributePaths = "recommendFurniture")
-    List<CurationFurniture> findAllByFurnitureTagOrderByRankAsc(FurnitureTag furnitureTag);
+    List<CurationFurniture> findAllByFurnitureTagAndSourceOrderByRankAsc(FurnitureTag furnitureTag, CurationSource source);
 
-    void deleteByFurnitureTag(FurnitureTag furnitureTag);
+    void deleteByFurnitureTagAndSource(FurnitureTag furnitureTag, CurationSource source);
 }

src/main/java/or/sopt/houme/domain/furniture/repository/CurationRawProductColorRepository.java

@@ -0,0 +1,12 @@
+package or.sopt.houme.domain.furniture.repository;
+
+import or.sopt.houme.domain.furniture.model.entity.CurationRawProductColor;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CurationRawProductColorRepository extends JpaRepository<CurationRawProductColor, Long> {
+    List<CurationRawProductColor> findAllByCurationRawProductIdIn(List<Long> curationRawProductIds);
+}

src/main/java/or/sopt/houme/domain/furniture/repository/CurationRawProductRepository.java

@@ -1,6 +1,7 @@
 package or.sopt.houme.domain.furniture.repository;
 
 import or.sopt.houme.domain.furniture.model.entity.CurationRawProduct;
+import or.sopt.houme.domain.furniture.model.entity.FurnitureTag;
 import or.sopt.houme.domain.furniture.model.entity.SoozipCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -14,4 +15,8 @@ List<CurationRawProduct> findAllBySourceAndCategoryAndProductIdIn(
             SoozipCategory category,
             List<Long> productIds
     );
+
+    List<CurationRawProduct> findAllByFurnitureTag(FurnitureTag furnitureTag);
+
+    List<CurationRawProduct> findAllByFurnitureTagAndProductIdIn(FurnitureTag furnitureTag, List<Long> productIds);
 }

src/main/java/or/sopt/houme/domain/furniture/repository/JjymRepositoryCustom.java

@@ -3,10 +3,13 @@
 import or.sopt.houme.domain.furniture.model.entity.Jjym;
 
 import java.util.List;
+import java.util.Map;
 
 public interface JjymRepositoryCustom {
 
     List<Jjym> findAllByUserIdWithFurnitureOrderByCreatedAtDesc(Long userId);
 
     java.util.Optional<Jjym> findByUserIdAndRecommendFurnitureId(Long userId, Long recommendFurnitureId);
+
+    Map<Long, Long> countByRecommendFurnitureIds(List<Long> recommendFurnitureIds);
 }