Merge pull request #31 from CarToi/dev

kimD0ngjun · web-flow · commit d597bfc27910 · 2025-07-11T11:22:31.000+09:00
[Refactor/embedding qpm] 기존 POST 요청 로직 GET 요청 추가 분리 + 캐싱 적용
diff --git a/src/main/java/org/jun/saemangeum/consume/controller/SurveyController.java b/src/main/java/org/jun/saemangeum/consume/controller/SurveyController.java
@@ -19,20 +19,30 @@ public class SurveyController {
     private final SurveyRecommendationService surveyRecommendationService;
 
     /**
-     * 사용자 설문 결과 추천 응답 데이터 리스트 반환
+     * 사용자 설문 결과 추천 응답 데이터 리스트 생성
      */
     @PostMapping("/recommendation")
-    public List<RecommendationResponse> createSurvey(@RequestBody SurveyCreateRequest request) {
-        log.info("{} - 데이터 소비 요청응답", Thread.currentThread().getName());
-        return surveyRecommendationService.createRecommendationsBySurvey(request);
+    public void createSurvey(@RequestBody SurveyCreateRequest request) {
+        log.info("{} - 데이터 소비 POST 요청", Thread.currentThread().getName());
+        surveyRecommendationService.createRecommendationsBySurvey(request);
     }
 
+    /**
+     * 사용자 설문 결과 추천 응답 데이터 리스트 반환
+     */
+    @GetMapping
+    public List<RecommendationResponse> getSurveyResults(@RequestParam("clientId") String clientId) {
+        log.info("{} - 데이터 조회 GET 요청응답", Thread.currentThread().getName());
+        return surveyRecommendationService.getSurveyRecommendationResults(clientId);
+    }
+
+
     /**
      * 사용자 설문 결과 만족도 반영 요청
      */
     @PatchMapping("/update")
     public void updateSurvey(@RequestBody SurveyUpdateRequest request) {
-        log.info("{} - 데이터 소비 업데이트", Thread.currentThread().getName());
+        log.info("{} - 데이터 업데이트 PATCH 요청", Thread.currentThread().getName());
         surveyRecommendationService.updateSurvey(request);
     }
 }
diff --git a/src/main/java/org/jun/saemangeum/consume/domain/entity/RecommendationLog.java b/src/main/java/org/jun/saemangeum/consume/domain/entity/RecommendationLog.java
@@ -21,11 +21,11 @@ public class RecommendationLog {
     @Column(name = "content_title")
     private String contentTitle;
 
-    @Column(name = "survey_id")
-    private Long surveyId;
+    @Column(name = "survey_client_id")
+    private String surveyClientId;
 
     public RecommendationLog(IContent content, Survey survey) {
         this.contentTitle = content.getTitle();
-        this.surveyId = survey.getId();
+        this.surveyClientId = survey.getClientId();
     }
 }
diff --git a/src/main/java/org/jun/saemangeum/consume/domain/entity/Survey.java b/src/main/java/org/jun/saemangeum/consume/domain/entity/Survey.java
@@ -19,7 +19,7 @@ public class Survey {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "client_id")
+    @Column(name = "client_id", unique = true)
     private String clientId; // UUID 클라이언트 id
 
     // 설문 응답
diff --git a/src/main/java/org/jun/saemangeum/consume/repository/swap/ContentViewRepository.java b/src/main/java/org/jun/saemangeum/consume/repository/swap/ContentViewRepository.java
@@ -1,9 +1,19 @@
 package org.jun.saemangeum.consume.repository.swap;
 
+import java.util.List;
 import org.jun.saemangeum.consume.domain.swap.ContentView;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface ContentViewRepository extends JpaRepository<ContentView, Long> {
+    @Query(value = """
+        SELECT cv.*
+        FROM recommendation_logs rl
+        JOIN contents_view cv ON rl.content_title = cv.title
+        WHERE rl.survey_client_id = :clientId
+        """, nativeQuery = true)
+    List<ContentView> findRecommendedContentViewsByClientId(@Param("clientId") String clientId);
 }
diff --git a/src/main/java/org/jun/saemangeum/consume/service/application/SurveyRecommendationService.java b/src/main/java/org/jun/saemangeum/consume/service/application/SurveyRecommendationService.java
@@ -1,7 +1,6 @@
 package org.jun.saemangeum.consume.service.application;
 
 import lombok.RequiredArgsConstructor;
-import org.jun.saemangeum.consume.domain.dto.Coordinate;
 import org.jun.saemangeum.consume.domain.dto.RecommendationResponse;
 import org.jun.saemangeum.consume.domain.dto.SurveyCreateRequest;
 import org.jun.saemangeum.consume.domain.dto.SurveyUpdateRequest;
@@ -11,8 +10,11 @@
 import org.jun.saemangeum.consume.service.domain.SurveyService;
 import org.jun.saemangeum.consume.service.strategy.StrategyContextHolder;
 import org.jun.saemangeum.consume.util.CoordinateCalculator;
+import org.jun.saemangeum.global.cache.CacheNames;
 import org.jun.saemangeum.global.domain.IContent;
+import org.jun.saemangeum.global.exception.ClientIdException;
 import org.jun.saemangeum.global.exception.SatisfactionsException;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,20 +31,37 @@ public class SurveyRecommendationService {
      * 사용자 설문응답 문자열을 일괄 묶어 임베딩 벡터 처리 후, 로그 확보 + 추천 리스트 반환
      */
     public List<RecommendationResponse> createRecommendationsBySurvey(SurveyCreateRequest request) {
+        // 클라이언트 이슈 : 페이지 리랜더링 시 요청이 똑같이 들어오고 있음
+        // 서버에서 어떻게 중복 요청을 막을 수 있을지?
+        // 코드 로직 내에서 요청 자체를 소모시켜버리는 방안으로 생각해보기
+        // 별개의 GET 요청을 만들자?
+        if (surveyService.isExistedClientId(request.clientId()))
+            throw new ClientIdException("해당 클라이언트 ID는 이미 존재합니다. 관리자에게 문의하거나 다시 시도해주세요.");
+
         String age = request.age() > 30 ? "늙은" : "젊은";
         String awareness = ""; // request.resident()
         String text = request.gender() + " " + age + " " + awareness
                 + request.city() + " " + request.mood() + " " + request.want();
 
         // 전략 패턴 적용
-        List<? extends IContent> contents = StrategyContextHolder.executeStrategy(text);
+        List<? extends IContent> contents = StrategyContextHolder.executePostStrategy(text);
         Survey survey =  surveyService.save(Survey.create(request));
 
         List<RecommendationLog> recommendationLogs = contents.stream()
                 .map(e -> new RecommendationLog(e, survey)).toList();
         recommendationLogService.saveALl(recommendationLogs);
 
-        Coordinate coordinate = new Coordinate(0.1, 0.1);
+        return contents.stream().map(IContent::to)
+                .toList();
+    }
+
+    /**
+     * 임시 GET 요청 처리 서비스 로직
+     */
+    // 너도 캐싱 대상이 되겠는데?
+    @Cacheable(cacheNames = CacheNames.RESULTS, key = "#clientId")
+    public List<RecommendationResponse> getSurveyRecommendationResults(String clientId) {
+        List<? extends IContent> contents = StrategyContextHolder.executeGetStrategy(clientId);
 
         return contents.stream()
                 .map(IContent::to)
diff --git a/src/main/java/org/jun/saemangeum/consume/service/domain/RecommendationLogService.java b/src/main/java/org/jun/saemangeum/consume/service/domain/RecommendationLogService.java
@@ -19,10 +19,4 @@ public class RecommendationLogService {
     public void saveALl(List<RecommendationLog> recommendationLogs) {
         recommendationLogRepository.saveAll(recommendationLogs);
     }
-
-    // 너도 캐시 적용이 될까?
-    public List<Long> getRecommendationLogIdsJoinSurveys(AverageRequest request) {
-        return recommendationLogRepository.findContentIdsBySurveyConditions(
-                request.age(), request.gender(), request.city(), request.want(), request.mood());
-    }
 }
diff --git a/src/main/java/org/jun/saemangeum/consume/service/domain/SurveyService.java b/src/main/java/org/jun/saemangeum/consume/service/domain/SurveyService.java
@@ -18,6 +18,10 @@ public Survey save(Survey survey) {
         return surveyRepository.save(survey);
     }
 
+    public boolean isExistedClientId(String clientId) {
+        return surveyRepository.findByClientId(clientId).isPresent();
+    }
+
     public Survey findByClientId(String clientId) {
         return surveyRepository.findByClientId(clientId).orElseThrow(
                 // 커스텀 예외로 전환 + 전역 예외 핸들러 처리
diff --git a/src/main/java/org/jun/saemangeum/consume/service/strategy/EmbeddingVectorStrategy.java b/src/main/java/org/jun/saemangeum/consume/service/strategy/EmbeddingVectorStrategy.java
@@ -6,4 +6,5 @@
 
 public interface EmbeddingVectorStrategy {
     List<? extends IContent> calculateSimilarity(String text);
+    List<? extends IContent> getContentsByClientId(String clientId);
 }
diff --git a/src/main/java/org/jun/saemangeum/consume/service/strategy/StrategyContextHolder.java b/src/main/java/org/jun/saemangeum/consume/service/strategy/StrategyContextHolder.java
@@ -18,12 +18,21 @@ public static void setStrategy(EmbeddingVectorStrategy strategy) {
         }
     }
 
-    public static List<? extends IContent> executeStrategy(String text) {
+    public static List<? extends IContent> executePostStrategy(String text) {
         lock.readLock().lock();
         try {
             return currentStrategy.calculateSimilarity(text);
         } finally {
             lock.readLock().unlock();
         }
     }
+
+    public static List<? extends IContent> executeGetStrategy(String clientId) {
+        lock.readLock().lock();
+        try {
+            return currentStrategy.getContentsByClientId(clientId);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
 }
diff --git a/src/main/java/org/jun/saemangeum/consume/service/strategy/TableEmbeddingVectorStrategy.java b/src/main/java/org/jun/saemangeum/consume/service/strategy/TableEmbeddingVectorStrategy.java
@@ -4,6 +4,7 @@
 import org.jun.saemangeum.global.domain.Content;
 import org.jun.saemangeum.global.domain.IContent;
 import org.jun.saemangeum.global.domain.Vector;
+import org.jun.saemangeum.global.service.ContentService;
 import org.jun.saemangeum.global.service.VectorService;
 import org.jun.saemangeum.pipeline.application.util.VectorCalculator;
 import org.jun.saemangeum.pipeline.infrastructure.api.VectorClient;
@@ -22,13 +23,14 @@ public class TableEmbeddingVectorStrategy implements EmbeddingVectorStrategy {
 
     private final VectorClient vectorClient;
     private final VectorService vectorService;
+    private final ContentService contentService;
 
     @Override
     public List<? extends IContent> calculateSimilarity(String text) {
-        EmbeddingResponse response = vectorClient.get(text);
+        EmbeddingResponse response = vectorClient.getWithCache(text);
         float[] requestVec = VectorCalculator.addNoise(response.result().embedding());
 
-        List<Vector> vectors = vectorService.getVectors(); // 이거 캐싱 대상이겠는데?
+        List<Vector> vectors = vectorService.getVectors(); // 이놈도 캐시 추가
         PriorityQueue<TableEmbeddingVectorStrategy.ContentSimilarity> pq = new PriorityQueue<>();
 
         for (Vector vec : vectors) {
@@ -57,6 +59,12 @@ private float[] byteToFloat(Vector vector) {
         return floats;
     }
 
+    // 클라이언트 ID 기반 사용자 설문 응답 조회하기
+    @Override
+    public List<? extends IContent> getContentsByClientId(String clientId) {
+        return contentService.getContentsByClientId(clientId);
+    }
+
     // 유사도 내부 클래스
     record ContentSimilarity(Content content, double similarity)
             implements Comparable<TableEmbeddingVectorStrategy.ContentSimilarity> {
diff --git a/src/main/java/org/jun/saemangeum/consume/service/strategy/ViewEmbeddingVectorStrategy.java b/src/main/java/org/jun/saemangeum/consume/service/strategy/ViewEmbeddingVectorStrategy.java
@@ -25,7 +25,7 @@ public class ViewEmbeddingVectorStrategy implements EmbeddingVectorStrategy {
 
     @Override
     public List<? extends IContent> calculateSimilarity(String text) {
-        EmbeddingResponse response = vectorClient.get(text);
+        EmbeddingResponse response = vectorClient.getWithCache(text);
         float[] requestVec = VectorCalculator.addNoise(response.result().embedding());
 
         List<VectorView> vectorViews = swapViewService.getVectorViews(); // 이거 캐싱 대상이겠는데?
@@ -57,6 +57,12 @@ private float[] byteToFloat(VectorView vectorView) {
         return floats;
     }
 
+    // 클라이언트 ID 기반 사용자 설문 응답 조회하기
+    @Override
+    public List<? extends IContent> getContentsByClientId(String clientId) {
+        return swapViewService.getContentViewsByClientId(clientId);
+    }
+
     // 유사도 내부 클래스
     record ContentSimilarity(ContentView contentView, double similarity)
             implements Comparable<ViewEmbeddingVectorStrategy.ContentSimilarity> {
diff --git a/src/main/java/org/jun/saemangeum/consume/service/swap/SwapViewService.java b/src/main/java/org/jun/saemangeum/consume/service/swap/SwapViewService.java
@@ -1,6 +1,7 @@
 package org.jun.saemangeum.consume.service.swap;
 
 import lombok.RequiredArgsConstructor;
+import org.jun.saemangeum.consume.domain.swap.ContentView;
 import org.jun.saemangeum.consume.domain.swap.VectorView;
 import org.jun.saemangeum.consume.repository.swap.ContentViewRepository;
 import org.jun.saemangeum.consume.repository.swap.VectorViewRepository;
@@ -20,4 +21,8 @@ public class SwapViewService {
     public List<VectorView> getVectorViews() {
         return vectorViewRepository.findAllWithContentView();
     }
+
+    public List<ContentView> getContentViewsByClientId(String clientId) {
+        return contentViewRepository.findRecommendedContentViewsByClientId(clientId);
+    }
 }
diff --git a/src/main/java/org/jun/saemangeum/consume/util/CoordinateCalculator.java b/src/main/java/org/jun/saemangeum/consume/util/CoordinateCalculator.java
@@ -35,6 +35,8 @@ public class CoordinateCalculator {
     private final HttpClient httpClient = HttpClient.newHttpClient();
 
     public Coordinate getCoordinate(String position) {
+        // 여기도 캐시 추가
+
         String responseJson = getResponseJson(position);
         KakaoResponse body = null;
 
diff --git a/src/main/java/org/jun/saemangeum/global/cache/CacheExpirePolicy.java b/src/main/java/org/jun/saemangeum/global/cache/CacheExpirePolicy.java
@@ -0,0 +1,30 @@
+package org.jun.saemangeum.global.cache;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.CacheManager;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CacheExpirePolicy {
+
+    private final CacheManager cacheManager;
+
+    @Scheduled(cron = "0 0 3 ? * SUN", zone = "Asia/Seoul")
+    public void evictWeeklyCache() {
+        log.info("벡터 데이터리스트 캐시 & 컨텐츠 문자열 전처리 키 기반 캐시 무효화");
+
+        if (cacheManager.getCache(CacheNames.VECTORS) != null) {
+            cacheManager.getCache(CacheNames.VECTORS).clear();
+            log.info("벡터 데이터리스트 캐시 만료 처리");
+        }
+
+        if (cacheManager.getCache(CacheNames.EMBEDDING) != null) {
+            cacheManager.getCache(CacheNames.EMBEDDING).clear();
+            log.info("컨텐츠 문자열 전처리 키 기반 캐시 만료 처리");
+        }
+    }
+}
diff --git a/src/main/java/org/jun/saemangeum/global/cache/CacheNames.java b/src/main/java/org/jun/saemangeum/global/cache/CacheNames.java
@@ -0,0 +1,7 @@
+package org.jun.saemangeum.global.cache;
+
+public class CacheNames {
+    public static final String VECTORS = "vectors";
+    public static final String EMBEDDING = "embedding";
+    public static final String RESULTS = "results";
+}
diff --git a/src/main/java/org/jun/saemangeum/global/cache/CacheType.java b/src/main/java/org/jun/saemangeum/global/cache/CacheType.java
@@ -0,0 +1,17 @@
+package org.jun.saemangeum.global.cache;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum CacheType {
+    // 벡터와 임베딩 캐시는 스케줄러 할당으로 강제 비우기 예정
+    VECTORS(CacheNames.VECTORS, 7 * 24 * 60, 1000), // 7일 만료, 최대 1000개
+    EMBEDDING(CacheNames.EMBEDDING, 7 * 24 * 60, 1000), // 7일 만료, 최대 1000개
+    RESULTS(CacheNames.RESULTS, 10, 1000); // 10분 만료, 최대 1000개
+
+    private String cacheName;
+    private int expiredAfterWrite; // 만료 시간(분 단위)
+    private int maximumSize; // 캐시 최대 크기 (엔트리 수)
+}
diff --git a/src/main/java/org/jun/saemangeum/global/config/CacheConfig.java b/src/main/java/org/jun/saemangeum/global/config/CacheConfig.java
@@ -1,12 +1,38 @@
 package org.jun.saemangeum.global.config;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.jun.saemangeum.global.cache.CacheType;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableCaching
 public class CacheConfig {
 
-    // org.jun.saemangeum.global.service.VectorService.getVectors()
+    // global.service.VectorService.getVectors()
+    // pipeline.infrastructure.api.VectorClient.getWithCache()
+    // consume.service.application.SurveyRecommendationService.getSurveyRecommendationResults()
 
+    @Bean
+    public CacheManager cacheManager() {
+        SimpleCacheManager cacheManager = new SimpleCacheManager();
+
+        List<CaffeineCache> caches = Arrays.stream(CacheType.values())
+                .map(c -> new CaffeineCache(c.getCacheName(),
+                        Caffeine.newBuilder()
+                                .recordStats().expireAfterWrite(c.getExpiredAfterWrite(), TimeUnit.MINUTES)
+                                .maximumSize(c.getMaximumSize())
+                                .build()))
+                .toList();
+
+        cacheManager.setCaches(caches);
+        return cacheManager;
+    }
 }
diff --git a/src/main/java/org/jun/saemangeum/global/repository/ContentRepository.java b/src/main/java/org/jun/saemangeum/global/repository/ContentRepository.java
@@ -3,6 +3,8 @@
 import org.jun.saemangeum.global.domain.Content;
 import org.jun.saemangeum.global.domain.CollectSource;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,4 +14,12 @@ public interface ContentRepository extends JpaRepository<Content, Long> {
     List<Content> findByCollectSource(CollectSource collectSource);
     void deleteByCollectSource(CollectSource collectSource);
     int countByCollectSource(CollectSource collectSource);
+
+    @Query(value = """
+        SELECT c.*
+        FROM recommendation_logs rl
+        JOIN contents c ON rl.content_title = c.title
+        WHERE rl.survey_client_id = :clientId
+        """, nativeQuery = true)
+    List<Content> findRecommendedContentsByClientId(@Param("clientId") String clientId);
 } 
diff --git a/src/main/java/org/jun/saemangeum/global/service/ContentService.java b/src/main/java/org/jun/saemangeum/global/service/ContentService.java
diff --git a/src/main/java/org/jun/saemangeum/global/service/VectorService.java b/src/main/java/org/jun/saemangeum/global/service/VectorService.java
diff --git a/src/main/java/org/jun/saemangeum/pipeline/application/service/EmbeddingVectorService.java b/src/main/java/org/jun/saemangeum/pipeline/application/service/EmbeddingVectorService.java
diff --git a/src/main/java/org/jun/saemangeum/pipeline/infrastructure/api/VectorClient.java b/src/main/java/org/jun/saemangeum/pipeline/infrastructure/api/VectorClient.java
diff --git a/src/test/java/org/jun/saemangeum/connect/EmbeddingTest.java b/src/test/java/org/jun/saemangeum/connect/EmbeddingTest.java

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ public class RecommendationLog {`
`21`	`21`	`@Column(name = "content_title")`
`22`	`22`	`private String contentTitle;`
`23`	`23`
`24`		`- @Column(name = "survey_id")`
`25`		`- private Long surveyId;`
	`24`	`+ @Column(name = "survey_client_id")`
	`25`	`+ private String surveyClientId;`
`26`	`26`
`27`	`27`	`public RecommendationLog(IContent content, Survey survey) {`
`28`	`28`	`this.contentTitle = content.getTitle();`
`29`		`- this.surveyId = survey.getId();`
	`29`	`+ this.surveyClientId = survey.getClientId();`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,4 @@ public class RecommendationLogService {`
`19`	`19`	`public void saveALl(List<RecommendationLog> recommendationLogs) {`
`20`	`20`	`recommendationLogRepository.saveAll(recommendationLogs);`
`21`	`21`	`}`
`22`		`-`
`23`		`- // 너도 캐시 적용이 될까?`
`24`		`- public List<Long> getRecommendationLogIdsJoinSurveys(AverageRequest request) {`
`25`		`- return recommendationLogRepository.findContentIdsBySurveyConditions(`
`26`		`- request.age(), request.gender(), request.city(), request.want(), request.mood());`
`27`		`- }`
`28`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,5 @@`
`6`	`6`
`7`	`7`	`public interface EmbeddingVectorStrategy {`
`8`	`8`	`List<? extends IContent> calculateSimilarity(String text);`
	`9`	`+ List<? extends IContent> getContentsByClientId(String clientId);`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,21 @@ public static void setStrategy(EmbeddingVectorStrategy strategy) {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static List<? extends IContent> executeStrategy(String text) {`
	`21`	`+ public static List<? extends IContent> executePostStrategy(String text) {`
`22`	`22`	`lock.readLock().lock();`
`23`	`23`	`try {`
`24`	`24`	`return currentStrategy.calculateSimilarity(text);`
`25`	`25`	`} finally {`
`26`	`26`	`lock.readLock().unlock();`
`27`	`27`	`}`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ public static List<? extends IContent> executeGetStrategy(String clientId) {`
	`31`	`+ lock.readLock().lock();`
	`32`	`+ try {`
	`33`	`+ return currentStrategy.getContentsByClientId(clientId);`
	`34`	`+ } finally {`
	`35`	`+ lock.readLock().unlock();`
	`36`	`+ }`
	`37`	`+ }`
`29`	`38`	`}`