Merge pull request #66 from Block-Guard/feat/#63/fraud-survey-scoring-ignore-other

[Feat] 사기분석설문 로직 변경 & 기타 키워드 제외 & 진행중인 긴급 대응 조회 API 응답변경

Author: yeonju73

src/main/java/com/blockguard/server/domain/analysis/application/FraudAnalysisService.java

@@ -55,7 +55,10 @@ public FraudAnalysisResponse fraudAnalysis(FraudAnalysisRequest fraudAnalysisReq
 
         // ai 서버 호출
         GptResponse gptResponse = gptApiClient.analyze(gptRequest);
-        score = Math.min(100, score + gptResponse.getScore());
+
+
+        // 최종 점수 계산
+        score = Math.min(100, score + getSurveyScore(fraudAnalysisRequest) + gptResponse.getScore());
 
         // 사기 분석 기록 저장
         RiskLevel riskLevel = RiskLevel.fromScore(score);
@@ -81,6 +84,15 @@ public FraudAnalysisResponse fraudAnalysis(FraudAnalysisRequest fraudAnalysisReq
                 .build();
     }
 
+    private static int getSurveyScore(FraudAnalysisRequest fraudAnalysisRequest) {
+        int addionalScore = 0;
+        if (Boolean.TRUE.equals(fraudAnalysisRequest.getPressuredInfo()) || Boolean.TRUE.equals(fraudAnalysisRequest.getAuthorityPressure()))
+            addionalScore += 5;
+        if (Boolean.TRUE.equals(fraudAnalysisRequest.getThirdPartyConnect()) || Boolean.TRUE.equals(fraudAnalysisRequest.getAccountOrLinkRequest()))
+            addionalScore += 5;
+        return addionalScore;
+    }
+
     private double addFraudPhoneNumberScore(FraudAnalysisRequest fraudAnalysisRequest, double score) {
         if (StringUtils.hasText(fraudAnalysisRequest.getSuspiciousPhoneNumbers())) {
             // 전화번호 위험이면 score 10점 추가
@@ -128,26 +140,30 @@ private String extractOcrText(List<MultipartFile> imageFiles) {
     }
 
     private static void extractKeywordsFromRequest(FraudAnalysisRequest request, List<String> keywords) {
-        if (StringUtils.hasText(request.getContactMethod()))
-            keywords.add(request.getContactMethod());
-        if (StringUtils.hasText(request.getCounterpart()))
-            keywords.add(request.getCounterpart());
-        if (request.getRequestedAction() != null && !request.getRequestedAction().isEmpty())
-            keywords.addAll(request.getRequestedAction());
-        if (request.getRequestedInfo() != null && !request.getRequestedInfo().isEmpty())
-            keywords.addAll(request.getRequestedInfo());
-        if (StringUtils.hasText(request.getLinkType()))
-            keywords.add(request.getLinkType());
-        if (Boolean.TRUE.equals(request.getPressuredInfo()))
-            keywords.add("개인정보 유출/범죄 연루 언급 등 심리적 압박");
-        if (Boolean.TRUE.equals(request.getAppOrLinkRequest()))
-            keywords.add("앱 설치/링크 접속 유도");
-        if (Boolean.TRUE.equals(request.getThirdPartyConnect()))
-            keywords.add("제3자(수사관 등) 연결 시도");
-        if (Boolean.TRUE.equals(request.getAuthorityPressure()))
-            keywords.add("직책 강조 및 권위적 태도 보임");
-        if (Boolean.TRUE.equals(request.getAccountOrLinkRequest()))
-            keywords.add("계좌이체/현금인출 유도");
+        addIfKeyword(request.getContactMethod(), keywords);
+        addIfKeyword(request.getCounterpart(), keywords);
+        addAllIfKeyword(request.getRequestedAction(), keywords);
+        addAllIfKeyword(request.getRequestedInfo(), keywords);
+        addIfKeyword(request.getLinkType(), keywords);
+    }
+
+    private static void addIfKeyword(String v, List<String> keywords) {
+        if (StringUtils.hasText(v) && isNotEtc(v))
+            keywords.add(v);
+    }
+
+    private static void addAllIfKeyword(List<String> vlist, List<String> keywords) {
+        if (vlist == null || vlist.isEmpty()) return;
+        vlist.stream()
+                .filter(StringUtils::hasText)
+                .filter(FraudAnalysisService::isNotEtc)
+                .forEach(keywords::add);
+    }
+
+    private static boolean isNotEtc(String v) {
+        String t = v.trim().replaceAll("\\s+", "");
+        if (t.isEmpty()) return false;
+        return !t.equals("기타");
     }
 
     private static GptRequest buildGptRequest(FraudAnalysisRequest fraudAnalysisRequest, List<String> keywords, String additionalDescription, String imageContent) {

src/main/java/com/blockguard/server/domain/report/application/ReportRecordService.java

@@ -18,8 +18,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 @Service
@@ -51,11 +53,17 @@ public CurrentReportRecordResponse getCurrentRecord(User user) {
                     ReportStepProgress lastProgress = record.getProgressList().stream()
                             .max(Comparator.comparing(ReportStepProgress::getStep))
                             .orElseThrow();
-                    int stepNum = lastProgress.getStep().getStepNumber();
+
+                    LocalDateTime lastUpdatedAt = lastProgress.getCheckboxes().stream()
+                            .map(ReportStepCheckbox::getUpdatedAt)
+                            .filter(Objects::nonNull)
+                            .max(Comparator.naturalOrder())
+                            .orElse(lastProgress.getUpdatedAt());
+
                     return CurrentReportRecordResponse.builder()
                             .reportId(record.getId())
-                            .createdAt(String.valueOf(record.getCreatedAt()))
-                            .step(stepNum)
+                            .updatedAt(lastUpdatedAt.toString())
+                            .step(lastProgress.getStep().getStepNumber())
                             .build();
 
                 });
@@ -194,7 +202,7 @@ private ReportRecordStepResponse buildReportRecordStepResponse(Long reportId, in
                 .step(stepNumber)
                 .checkBoxes(resultRequiredCheckboxes)
                 .recommendedCheckBoxes(resultRecommendedCheckboxes)
-                .createdAt(String.valueOf(record.getCreatedAt()))
+                .createdAt(String.valueOf(progress.getCreatedAt()))
                 .isCompleted(progress.isCompleted())
                 .build();
     }

src/main/java/com/blockguard/server/domain/report/dto/response/CurrentReportRecordResponse.java

@@ -8,5 +8,5 @@
 public class CurrentReportRecordResponse {
     private Long reportId;
     private int step;
-    private String createdAt;
+    private String updatedAt;
 }