hotfix: 추천 생성 시 이전 추천 누적 및 MBTI 유형별 동일 추천 반환 문제 수정

Author: seamooll

src/main/java/org/umc/valuedi/domain/savings/repository/RecommendationRepository.java

@@ -46,4 +46,12 @@ List<Recommendation> findAllByMemberIdAndMemberMbtiTestId(
             @Param("memberId") Long memberId,
             @Param("memberMbtiTestId") Long memberMbtiTestId
     );
+
+    @Query("""
+        select r
+        from Recommendation r
+        left join fetch r.recommendationReasonList
+        where r.member.id = :memberId
+    """)
+    List<Recommendation> findAllWithReasonsByMemberId(@Param("memberId") Long memberId);
 }

src/main/java/org/umc/valuedi/domain/savings/repository/SavingsOptionRepository.java

@@ -29,4 +29,38 @@ List<SavingsOption> findAllByIdInFetchSavings(
     List<SavingsOption> findCandidates(
             Pageable pageable
     );
+
+    // G형(공격): 우대금리 우선 정렬
+    @Query("""
+        select so
+        from SavingsOption so
+        join fetch so.savings s
+        where (:rsrvType is null or so.rsrvType = :rsrvType)
+          and (:minTrm is null or so.saveTrm >= :minTrm)
+          and (:maxTrm is null or so.saveTrm <= :maxTrm)
+        order by so.intrRate2 desc nulls last, so.intrRate desc nulls last
+    """)
+    List<SavingsOption> findCandidatesOrderByRate2(
+            @Param("rsrvType") String rsrvType,
+            @Param("minTrm") Integer minTrm,
+            @Param("maxTrm") Integer maxTrm,
+            Pageable pageable
+    );
+
+    // C형(보수): 기본금리 우선 정렬
+    @Query("""
+        select so
+        from SavingsOption so
+        join fetch so.savings s
+        where (:rsrvType is null or so.rsrvType = :rsrvType)
+          and (:minTrm is null or so.saveTrm >= :minTrm)
+          and (:maxTrm is null or so.saveTrm <= :maxTrm)
+        order by so.intrRate desc nulls last, so.intrRate2 desc nulls last
+    """)
+    List<SavingsOption> findCandidatesOrderByRate(
+            @Param("rsrvType") String rsrvType,
+            @Param("minTrm") Integer minTrm,
+            @Param("maxTrm") Integer maxTrm,
+            Pageable pageable
+    );
 }

src/main/java/org/umc/valuedi/domain/savings/service/MbtiCandidateFilter.java

@@ -0,0 +1,33 @@
+package org.umc.valuedi.domain.savings.service;
+
+import org.umc.valuedi.domain.mbti.enums.MbtiType;
+
+/**
+ * MBTI 타입을 추천 후보 쿼리 파라미터로 변환하는 값 객체.
+ *
+ * 축별 매핑:
+ *  - I(충동) → saveTrm <= 12  /  P(계획) → saveTrm >= 24
+ *  - G(공격) → intrRate2 우선 정렬  /  C(보수) → intrRate 우선 정렬
+ *  - V(회피) → rsrvType = 'S'(정기적립)  /  R(합리) → 무관
+ *  - A/S 축은 I/P 축에 흡수
+ */
+public record MbtiCandidateFilter(
+        String rsrvType,          // null=무관, "S"=정기적립
+        Integer minTrm,           // null=무관, 24=24개월 이상
+        Integer maxTrm,           // null=무관, 12=12개월 이하
+        boolean orderByRate2First // true=우대금리순, false=기본금리순
+) {
+    public static MbtiCandidateFilter from(MbtiType mbtiType) {
+        String name = mbtiType.name(); // e.g. "APGV"
+        char axis2 = name.charAt(1);  // I or P
+        char axis3 = name.charAt(2);  // G or C
+        char axis4 = name.charAt(3);  // V or R
+
+        String rsrvType      = (axis4 == 'V') ? "S" : null;
+        Integer minTrm       = (axis2 == 'P') ? 24  : null;
+        Integer maxTrm       = (axis2 == 'I') ? 12  : null;
+        boolean orderByRate2 = (axis3 == 'G');
+
+        return new MbtiCandidateFilter(rsrvType, minTrm, maxTrm, orderByRate2);
+    }
+}

src/main/java/org/umc/valuedi/domain/savings/service/RecommendationService.java

@@ -57,12 +57,22 @@ public SavingsResponseDTO.SavingsListResponse generateAndSaveRecommendations(Lon
         MemberMbtiTest memberMbtiTest = memberMbtiTestRepository.findCurrentActiveTest(memberId)
                 .orElseThrow(() -> new MbtiException(MbtiErrorCode.TYPE_INFO_NOT_FOUND));
 
-        // 추천 상품 후보 조회
+        // 추천 상품 후보 조회: MBTI 타입 기반 필터링
+        MbtiType mbtiType = memberMbtiTest.getResultType();
+        MbtiCandidateFilter filter = MbtiCandidateFilter.from(mbtiType);
         Pageable candidatePage = PageRequest.of(0, CANDIDATE_LIMIT);
-        List<SavingsOption> candidates = savingsOptionRepository.findCandidates(candidatePage);
 
-        // 제미나이 프롬프트 생성
-        MbtiType mbtiType = memberMbtiTest.getResultType();
+        List<SavingsOption> candidates = filter.orderByRate2First()
+                ? savingsOptionRepository.findCandidatesOrderByRate2(
+                        filter.rsrvType(), filter.minTrm(), filter.maxTrm(), candidatePage)
+                : savingsOptionRepository.findCandidatesOrderByRate(
+                        filter.rsrvType(), filter.minTrm(), filter.maxTrm(), candidatePage);
+
+        // Fallback: 필터 결과가 부족하면 기본 후보로 대체
+        if (candidates.size() < RECOMMEND_COUNT) {
+            log.warn("[Recommend] 필터 후보 부족 (size={}), 기본 후보로 대체. mbtiType={}", candidates.size(), mbtiType);
+            candidates = savingsOptionRepository.findCandidates(candidatePage);
+        }
         String prompt = buildPrompt(mbtiType, candidates, RECOMMEND_COUNT);
 
         // 제미나이 호출

src/main/java/org/umc/valuedi/domain/savings/service/RecommendationTxService.java

@@ -53,8 +53,8 @@ public SavingsResponseDTO.RecommendResponse saveRecommendations(
         Map<Long, SavingsOption> optionById = pickedOptions.stream()
                 .collect(Collectors.toMap(SavingsOption::getId, Function.identity()));
 
-        // 기존 추천 삭제 (중복 방지)
-        List<Recommendation> existing = recommendationRepository.findAllByMemberIdAndMemberMbtiTestId(memberId, memberMbtiTest.getId());
+        // 기존 추천 전체 삭제 - mbtiTestId가 달라져도 이전 추천이 누적되지 않도록 memberId 기준으로 삭제
+        List<Recommendation> existing = recommendationRepository.findAllWithReasonsByMemberId(memberId);
         if (!existing.isEmpty()) {
             recommendationRepository.deleteAll(existing);
         }