Merge pull request #149 from prgrms-aibe-devcourse/refactor/expense-LLM

refactor : 관리자 LLM 지출분석 analyzer 성능 향상

Author: lSNOTNULL

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

@@ -13,7 +13,9 @@
 import java.time.LocalDate;
 @Entity
 @Getter
-@Table(name = "expense_analysis_history")
+@Table(name = "expense_analysis_history", indexes = {
+        @Index(name = "idx_created_at", columnList = "created_At")
+})
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @EntityListeners(AuditingEntityListener.class)
 public class ExpenseAnalysisHistory extends BaseTimeEntity {

src/main/java/store/lastdance/domain/user/User.java

@@ -11,7 +11,10 @@
 @Getter
 @Setter
 @Entity
-@Table(name = "users")
+@Table(name = "users", indexes = {
+        @Index(name = "idx_user_email", columnList = "email"),
+        @Index(name = "idx_user_nickname", columnList = "nickname")
+})
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class User extends BaseTimeEntity {
     @Id

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

@@ -3,18 +3,30 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import store.lastdance.domain.expense.ExpenseAnalysisHistory;
 import store.lastdance.domain.user.User;
+import store.lastdance.dto.admin.AdminExpenseAnalyzerHistoryDTO;
 import store.lastdance.dto.admin.ExpenseAnalyzerFeedbackStatsDTO;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 
-public interface ExpenseAnalysisHistoryRepository extends JpaRepository<ExpenseAnalysisHistory, Long> {
+public interface ExpenseAnalysisHistoryRepository extends JpaRepository<ExpenseAnalysisHistory, Long>,
+        JpaSpecificationExecutor<ExpenseAnalysisHistory> {
+
+    @EntityGraph(attributePaths = "user")
+    Page<ExpenseAnalysisHistory> findAll(Specification<ExpenseAnalysisHistory> spec, Pageable pageable);
+
+    @Query("SELECT new store.lastdance.dto.admin.AdminExpenseAnalyzerHistoryDTO(" +
+           "eah.id, eah.user.email, eah.user.nickname, eah.createdAt, eah.up, eah.down) " +
+           "FROM ExpenseAnalysisHistory eah JOIN eah.user u")
+    Page<AdminExpenseAnalyzerHistoryDTO> findHistoryProjection(Specification<ExpenseAnalysisHistory> spec, Pageable pageable);
 
     // 특정 사용자의 모든 분석 내역을 최신순으로 조회
     List<ExpenseAnalysisHistory> findByUserOrderByCreatedAtDesc(User user);
@@ -23,7 +35,6 @@ public interface ExpenseAnalysisHistoryRepository extends JpaRepository<ExpenseA
 
     List<ExpenseAnalysisHistory> findByCreatedAtBetween(LocalDateTime startDate, LocalDateTime endDate);
 
-    Page<ExpenseAnalysisHistory> findAll(Specification<ExpenseAnalysisHistory> spec, Pageable pageable);
 
     @Query("SELECT new store.lastdance.dto.admin.ExpenseAnalyzerFeedbackStatsDTO(" +
             "   COALESCE(SUM(CASE WHEN e.up = true OR e.down = true THEN 1 ELSE 0 END), 0L), " +

src/main/java/store/lastdance/service/admin/AdminServiceImpl.java

@@ -939,6 +939,9 @@ public AiJudgmentStatsDTO getAiJudgmentStats(UUID userId, String period) {
         return new AiJudgmentStatsDTO(satisfactionRate, dissatisfactionCount, trends);
     }
 
+    /**
+     * LLM 지출분석 피드백 통계 조회
+     */
     @Override
     @Transactional(readOnly = true)
     public ExpenseAnalyzerFeedbackStatsDTO getExpenseAnalyzerFeedbackStats(UUID userId, String period) {
@@ -967,6 +970,9 @@ public ExpenseAnalyzerFeedbackStatsDTO getExpenseAnalyzerFeedbackStats(UUID user
         return new ExpenseAnalyzerFeedbackStatsDTO(totalFeedbacks, upCount, downCount, satisfactionRate, trends);
     }
 
+    /**
+     * LLM 지출분석 내역 조회
+     */
     @Override
     public AdminExpenseAnalyzerHistoryResponseDTO getExpenseAnalyzerHistory(UUID userId, int page, int limit, String search, String rating, String dateFrom, String dateTo) {
         log.info("LLM 지출분석 내역 조회 : userId={}, page={}, limit={}, search={}, rating={}, dateFrom={}, dateTo={}",userId,page,limit,search,rating,dateFrom,dateTo);
@@ -977,11 +983,9 @@ public AdminExpenseAnalyzerHistoryResponseDTO getExpenseAnalyzerHistory(UUID use
 
         Specification<ExpenseAnalysisHistory> spec = createExpenseAnalysisHistorySpecification(search,rating, dateFrom, dateTo);
 
-        Page<ExpenseAnalysisHistory> historyPage = expenseAnalysisHistoryRepository.findAll(spec, pageable);
+        Page<AdminExpenseAnalyzerHistoryDTO> historyPage = expenseAnalysisHistoryRepository.findHistoryProjection(spec, pageable);
 
-        List<AdminExpenseAnalyzerHistoryDTO> historyDTOs = historyPage.getContent().stream()
-                .map(AdminExpenseAnalyzerHistoryDTO::from)
-                .collect(Collectors.toList());
+        List<AdminExpenseAnalyzerHistoryDTO> historyDTOs = historyPage.getContent();
 
         PaginationDTO pagination = new PaginationDTO(
                 page,
@@ -994,14 +998,23 @@ public AdminExpenseAnalyzerHistoryResponseDTO getExpenseAnalyzerHistory(UUID use
         return new AdminExpenseAnalyzerHistoryResponseDTO(historyDTOs, pagination);
     }
 
+    /**
+     * 검색 조건에 따라 ExpenseAnalysisHistory 엔티티에 대한 JPA Specification을 생성합니다.
+     *
+     * @param search 검색어 (이메일 또는 닉네임)
+     * @param rating 피드백 평점 (UP 또는 DOWN)
+     * @param dateForm 시작 날짜
+     * @param dateTo 종료 날짜
+     * @return 생성된 Specification
+     */
     private Specification<ExpenseAnalysisHistory> createExpenseAnalysisHistorySpecification(String search, String rating, String dateForm, String dateTo) {
         return (root, query, criteriaBuilder) -> {
             List<Predicate> predicates = new ArrayList<>();
 
             if (StringUtils.hasText(search)) {
                 predicates.add(criteriaBuilder.or(
-                        criteriaBuilder.like(criteriaBuilder.lower(root.get("user").get("email")), "%" + search.toLowerCase() + "%"),
-                        criteriaBuilder.like(criteriaBuilder.lower(root.get("user").get("nickname")), "%" + search.toLowerCase() + "%")
+                        criteriaBuilder.like(root.get("user").get("email"), "%" + search + "%"),
+                        criteriaBuilder.like(root.get("user").get("nickname"), "%" + search + "%")
                 ));
             }
             if (StringUtils.hasText(rating)) {
@@ -1018,6 +1031,13 @@ private Specification<ExpenseAnalysisHistory> createExpenseAnalysisHistorySpecif
     }
 
     @Override
+    /**
+     * 특정 지출 분석 내역의 상세 정보를 조회합니다.
+     *
+     * @param userId 관리자 사용자 ID
+     * @param historyId 조회할 지출 분석 내역 ID
+     * @return 지출 분석 내역 상세 정보 DTO
+     */
     public ExpenseAnalysisHistoryDTO getExpenseAnalyzerHistoryDetail(UUID userId, Long historyId) {
         log.info("LLM 지출분석 상세 조회 : userId={}, historyId={}",userId,historyId);