[FIX/#103] 추천 로직 오류 수정

src/main/java/org/umc/valuedi/domain/mbti/service/FinanceMbtiService.java

@@ -1,6 +1,7 @@
 package org.umc.valuedi.domain.mbti.service;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.umc.valuedi.domain.mbti.converter.FinanceMbtiTestConverter;
@@ -12,11 +13,13 @@
 import org.umc.valuedi.domain.mbti.validator.FinanceMbtiTestValidator;
 import org.umc.valuedi.domain.member.entity.Member;
 import org.umc.valuedi.domain.member.repository.MemberRepository;
+import org.umc.valuedi.domain.savings.service.RecommendationService;
 
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -28,6 +31,7 @@ public class FinanceMbtiService {
     private final FinanceMbtiScoringService scoringService;
     private final FinanceMbtiTestValidator financeMbtiTestValidator;
     private final FinanceMbtiTestConverter financeMbtiTestConverter;
+    private final RecommendationService recommendationService;
 
     public MemberMbtiTest submitTest(Long memberId, FinanceMbtiTestRequestDto req) {
 
@@ -46,9 +50,17 @@ public MemberMbtiTest submitTest(Long memberId, FinanceMbtiTestRequestDto req) {
                 ));
 
         FinanceMbtiScoringService.ScoreResult score = scoringService.score(activeQuestions, answersByQuestionId);
-
         MemberMbtiTest test = financeMbtiTestConverter.toEntity(member, req, score, activeQuestionMap);
 
-        return memberMbtiTestRepository.save(test);
+        MemberMbtiTest savedTest = memberMbtiTestRepository.save(test);
+
+        try {
+            recommendationService.generateAndSaveRecommendations(memberId);
+            log.info("[Recommend] MBTI 검사 후 자동 추천 생성 성공. memberId={}", memberId);
+        } catch (Exception e) {
+            // 제미나이 호출이 실패해도 MBTI 저장은 유지되도록 예외를 삼키고 로그만 남김
+            log.error("[Recommend] MBTI 저장에는 성공했으나, 자동 추천 생성 중 오류 발생. memberId={}: {}", memberId, e.getMessage());
+        }
+        return savedTest;
     }
 }

src/main/java/org/umc/valuedi/domain/savings/controller/RecommendationController.java

@@ -3,11 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.umc.valuedi.domain.savings.dto.response.SavingsResponseDTO;
-import org.umc.valuedi.domain.savings.entity.RecommendationBatch;
-import org.umc.valuedi.domain.savings.enums.RecommendationStatus;
-import org.umc.valuedi.domain.savings.service.RecommendationAsyncWorker;
 import org.umc.valuedi.domain.savings.service.RecommendationService;
-import org.umc.valuedi.domain.savings.service.RecommendationTxService;
 import org.umc.valuedi.global.apiPayload.ApiResponse;
 import org.umc.valuedi.global.apiPayload.code.GeneralSuccessCode;
 import org.umc.valuedi.global.security.annotation.CurrentMember;
@@ -18,28 +14,14 @@
 public class RecommendationController implements RecommendationControllerDocs {
 
     private final RecommendationService recommendationService;
-    private final RecommendationTxService recommendationTxService;
-    private final RecommendationAsyncWorker recommendationAsyncWorker;
 
-    // 추천 생성 트리거(비동기)
+    // 추천 생성
     @PostMapping
-    public ApiResponse<SavingsResponseDTO.TriggerResponse> recommend(
+    public ApiResponse<SavingsResponseDTO.SavingsListResponse> recommend(
             @CurrentMember Long memberId
     ) {
-        SavingsResponseDTO.TriggerDecision triggerDecision = recommendationTxService.triggerRecommendation(memberId);
-
-        // 진행 중이면 새로 실행하지 않음
-        if (triggerDecision.shouldStartAsync()) {
-            recommendationAsyncWorker.generateAndSaveAsync(memberId, triggerDecision.batchId());
-        }
-
-        return ApiResponse.onSuccess(GeneralSuccessCode.ACCEPTED,
-                SavingsResponseDTO.TriggerResponse.builder()
-                        .batchId(triggerDecision.batchId())
-                        .status(triggerDecision.status())
-                        .message(triggerDecision.message())
-                        .build()
-        );
+        SavingsResponseDTO.SavingsListResponse result = recommendationService.generateAndSaveRecommendations(memberId);
+        return ApiResponse.onSuccess(GeneralSuccessCode.OK, result);
     }
 
     // 최신 추천 15개 조회

src/main/java/org/umc/valuedi/domain/savings/converter/SavingsConverter.java

@@ -89,8 +89,8 @@ public static SavingsResponseDTO.SavingsListResponse toSavingsListResponseDTO(Li
 
         return SavingsResponseDTO.SavingsListResponse.builder()
                 .totalCount(totalCount)
-                .maxPageNo(maxPageNo)
                 .nowPageNo(nowPageNo)
+                .hasNext(nowPageNo < maxPageNo)
                 .products(products)
                 .build();
     }
@@ -109,22 +109,31 @@ public static SavingsResponseDTO.SavingsDetailResponse toSavingsDetailResponseDT
                 ))
                 .toList();
 
-        SavingsResponseDTO.SavingsDetailResponse.SavingProductDetail product = new SavingsResponseDTO.SavingsDetailResponse.SavingProductDetail(
-                savings.getKorCoNm(),
-                savings.getFinPrdtCd(),
-                savings.getFinPrdtNm(),
-                savings.getJoinWay(),
-                savings.getMtrtInt(),
-                savings.getSpclCnd(),
-                savings.getJoinDeny(),
-                savings.getJoinMember(),
-                savings.getEtcNote(),
-                savings.getMaxLimit() == null ? null : String.valueOf(savings.getMaxLimit()),
-                options
-        );
+        SavingsOption representativeOption = savings.getSavingsOptionList().stream()
+                .filter(o -> Integer.valueOf(12).equals(o.getSaveTrm()))
+                .findFirst()
+                .orElseGet(() -> savings.getSavingsOptionList().stream()
+                        .filter(o -> o.getIntrRate2() != null)
+                        .max(java.util.Comparator.comparing(SavingsOption::getIntrRate2))
+                        .orElse(null));
+
+        Double basicRate = (representativeOption != null) ? representativeOption.getIntrRate() : null;
+        Double maxRate = (representativeOption != null) ? representativeOption.getIntrRate2() : null;
 
         return SavingsResponseDTO.SavingsDetailResponse.builder()
-                .product(product)
+                .korCoNm(savings.getKorCoNm())
+                .finPrdtCd(savings.getFinPrdtCd())
+                .finPrdtNm(savings.getFinPrdtNm())
+                .basicRate(basicRate)
+                .maxRate(maxRate)
+                .joinWay(savings.getJoinWay())
+                .mtrtInt(savings.getMtrtInt())
+                .spclCnd(savings.getSpclCnd())
+                .joinDeny(savings.getJoinDeny())
+                .joinMember(savings.getJoinMember())
+                .etcNote(savings.getEtcNote())
+                .maxLimit(savings.getMaxLimit() == null ? null : String.valueOf(savings.getMaxLimit()))
+                .options(options)
                 .build();
     }
 

src/main/java/org/umc/valuedi/domain/savings/dto/response/SavingsResponseDTO.java

@@ -11,11 +11,9 @@ public class SavingsResponseDTO {
     @Builder
     public record SavingsListResponse(
             int totalCount,  // 총 상품건수
-            int maxPageNo,  // 총 페이지 건수
-            int nowPageNo,  // 현재 조회 페이지 번호
-            List<RecommendedSavingProduct> products,  // 상품 목록
-            RecommendationStatus status,  // 상품 추천 상태 (PENDING | SUCCESS | FAILED)
-            String message  // 상품 추천 상태 메시지
+            int nowPageNo,  // 현재 페이지
+            boolean hasNext,  // 다음 페이지 존재 여부
+            List<RecommendedSavingProduct> products // 상품 목록
     ) {
         // 상품 목록 조회
         public record RecommendedSavingProduct(
@@ -29,23 +27,20 @@ public record RecommendedSavingProduct(
 
     @Builder
     public record SavingsDetailResponse(
-            SavingProductDetail product  // 상품
+            String korCoNm,
+            String finPrdtCd,
+            String finPrdtNm,
+            Double basicRate,
+            Double maxRate,
+            String joinWay,
+            String mtrtInt,
+            String spclCnd,
+            String joinDeny,
+            String joinMember,
+            String etcNote,
+            String maxLimit,
+            List<Option> options
     ) {
-        // 적금 상품 상세 조회
-        public record SavingProductDetail (
-                String korCoNm,  // 금융회사 명
-                String finPrdtCd,  // 금융상품 코드
-                String finPrdtNm,  // 금융 상품명
-                String joinWay,  // 가입 방법
-                String mtrtInt,  // 만기 후 이자율
-                String spclCnd,  // 우대조건
-                String joinDeny,  // 가입 제한
-                String joinMember,  // 가입대상
-                String etcNote,  // 기타 유의사항
-                String maxLimit,  // 최고한도
-                List<Option> options
-        ) {}
-
         public record Option (
                 String intrRateType,  // 저축 금리 유형
                 String intrRateTypeNm,  // 저축 금리 유형명
@@ -72,19 +67,4 @@ public record RecommendedProduct(
             String rsrvTypeNm,
             BigDecimal score
     ) {}
-
-    @Builder
-    public record TriggerResponse(
-            Long batchId,
-            RecommendationStatus status,  // PENDING | SUCCESS | FAILED
-            String message
-    ) {}
-
-    @Builder
-    public record TriggerDecision(
-            Long batchId,
-            RecommendationStatus status,
-            String message,
-            boolean shouldStartAsync
-    ) {}
 }

src/main/java/org/umc/valuedi/domain/savings/exception/code/SavingsErrorCode.java

@@ -9,7 +9,10 @@
 @AllArgsConstructor
 public enum SavingsErrorCode implements BaseErrorCode {
 
-    SAVINGS_NOT_FOUND(HttpStatus.NOT_FOUND, "SAVINGS404_1", "해당 적금 상품을 찾을 수 없습니다.")
+    SAVINGS_NOT_FOUND(HttpStatus.NOT_FOUND, "SAVINGS404_1", "해당 적금 상품을 찾을 수 없습니다."),
+    RECOMMENDATION_NOT_FOUND(HttpStatus.NOT_FOUND, "SAVINGS404_2", "아직 추천받은 내역이 없습니다. 먼저 상품 추천을 진행해 주세요."),
+    FILTERED_RECOMMENDATION_NOT_FOUND(HttpStatus.NOT_FOUND, "SAVINGS400_1", "해당 필터 조건에 맞는 추천 상품이 없습니다."),
+    RECOMMENDATION_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "SAVINGS500_1", "AI 추천 생성에 실패했습니다. 다시 시도해 주세요.")
     ;
 
     private final HttpStatus status;