Merge pull request #232 from prgrms-aibe-devcourse/refactor/v2-analysis

refactor: anylsis 분리 관련 CoderabbitAi 의견 반영

Author: lSNOTNULL

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: CI/CD Pipeline to EC2 with Blue/Green
 
 on:
   push:
-    branches: [main, dev, ci/env]
+    branches: [main, dev]
 
 # ───────────────────────────────────────────────────────────────
 concurrency:

src/main/java/store/lastdance/config/SecurityConfig.java

@@ -56,8 +56,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         // 기타 공개 경로들
                         .requestMatchers("/error", "/favicon.ico").permitAll()
                         .requestMatchers("/api/v1/notifications/stream").permitAll()
-                        // /api/v1/expenses/analyze 요청은 인증이 필요함 AOP 프록시
-                        .requestMatchers("/api/v1/expenses/analyze").authenticated()
+                        // /api/v1/analysis/** 요청은 인증이 필요함 AOP 프록시
+                        .requestMatchers("/api/v1/analysis/**").authenticated()
                         // 나머지 요청은 인증 필요
                         .anyRequest().authenticated()
                 )

src/main/java/store/lastdance/controller/analysis/AnalysisController.java

@@ -19,6 +19,7 @@
 import store.lastdance.dto.response.PageWithSummaryResponse;
 import store.lastdance.security.oauth.CustomOAuth2User;
 import store.lastdance.service.analysis.AnalysisService;
+import store.lastdance.domain.analysis.FeedbackType;
 
 import java.util.UUID;
 
@@ -47,7 +48,7 @@ public ResponseEntity<ApiResponse<AnalyzeExpenseResponseDTO>> analyzeExpenses(
     public ResponseEntity<ApiResponse<String>> feedbackAnalyzeExpense(
             @Parameter(hidden = true) @AuthenticationPrincipal CustomOAuth2User oAuth2User,
             @PathVariable Long historyId,
-            @RequestParam String type
+            @RequestParam FeedbackType type
     ) {
         UUID userId = oAuth2User.getUserId();
         String result = analysisService.toggleFeedback(historyId, userId, type);

src/main/java/store/lastdance/converter/analysis/StringToFeedbackTypeConverter.java

@@ -0,0 +1,18 @@
+package store.lastdance.converter.analysis;
+
+import org.springframework.stereotype.Component;
+import org.springframework.core.convert.converter.Converter;
+import store.lastdance.domain.analysis.FeedbackType;
+
+@Component
+public class StringToFeedbackTypeConverter implements Converter<String, FeedbackType> {
+
+    @Override
+    public FeedbackType convert(String source) {
+        if (source == null) {
+            return null;
+        }
+        // 대소문자 구분없이 변환
+        return FeedbackType.valueOf(source.toUpperCase());
+    }
+}

src/main/java/store/lastdance/domain/analysis/ExpenseAnalysisHistory.java

@@ -14,7 +14,8 @@
 @Entity
 @Getter
 @Table(name = "expense_analysis_history", indexes = {
-        @Index(name = "idx_created_at", columnList = "created_at")
+        @Index(name = "idx_created_at", columnList = "created_at"),
+        @Index(name = "idx_user_created_at", columnList = "user_id, created_at")
 })
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @EntityListeners(AuditingEntityListener.class)

src/main/java/store/lastdance/domain/analysis/FeedbackType.java

@@ -0,0 +1,6 @@
+package store.lastdance.domain.analysis;
+
+public enum FeedbackType {
+    UP,
+    DOWN
+}

…xpense/SaveAnalysisResultRequestDTO.java …alysis/SaveAnalysisResultRequestDTO.javasrc/main/java/store/lastdance/dto/expense/SaveAnalysisResultRequestDTO.java renamed to src/main/java/store/lastdance/dto/analysis/SaveAnalysisResultRequestDTO.java src/main/java/store/lastdance/dto/expense/SaveAnalysisResultRequestDTO.java renamed to src/main/java/store/lastdance/dto/analysis/SaveAnalysisResultRequestDTO.java

@@ -1,9 +1,7 @@
-package store.lastdance.dto.expense;
+package store.lastdance.dto.analysis;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
-import store.lastdance.dto.analysis.AnalyzeExpenseRequestDTO;
-import store.lastdance.dto.analysis.AnalyzeExpenseResponseDTO;
 
 public record SaveAnalysisResultRequestDTO(
         @NotNull @Valid AnalyzeExpenseRequestDTO requestDTO,

src/main/java/store/lastdance/repository/analysis/ExpenseAnalysisHistoryRepository.java

@@ -30,6 +30,9 @@ public interface ExpenseAnalysisHistoryRepository extends JpaRepository<ExpenseA
     @EntityGraph(attributePaths = "user")
     Page<ExpenseAnalysisHistory> findByUser(User user, Pageable pageable);
 
+    @EntityGraph(attributePaths = "user")
+    Page<ExpenseAnalysisHistory> findByUser_UserId(java.util.UUID userId, Pageable pageable);
+
     List<ExpenseAnalysisHistory> findByCreatedAtBetween(LocalDateTime startDate, LocalDateTime endDate);
 
 

src/main/java/store/lastdance/service/analysis/AnalysisService.java

@@ -1,5 +1,7 @@
 package store.lastdance.service.analysis;
 
+import store.lastdance.domain.analysis.FeedbackType;
+
 import org.springframework.data.domain.Pageable;
 import store.lastdance.dto.analysis.AnalyzeExpenseRequestDTO;
 import store.lastdance.dto.analysis.AnalyzeExpenseResponseDTO;
@@ -10,6 +12,6 @@
 
 public interface AnalysisService {
     AnalyzeExpenseResponseDTO analyzeExpenses(UUID userId, AnalyzeExpenseRequestDTO requestDTO);
-    String toggleFeedback(Long historyId, UUID userId, String type);
+    String toggleFeedback(Long historyId, UUID userId, FeedbackType type);
     PageWithSummaryResponse<ExpenseAnalysisHistoryDTO> getExpenseAnalysisHistory(UUID userId, Pageable pageable);
 }