cdoerabbit 피드백 반영

* 트랜젝션 어노테이션 추가

* 랭킹 대상 항목이 100개 미만일 때의 배치 에외 처리

* @StepScope를 적용하여 Step 실행마다 새 인스턴스를 생성

* 랭크 계산 후 싱글톤 인스턴스 내의 필드 초기화하여 데이터 오염 및 메모리 누수 문제 방지

* 배치 실행 파라미터에서 발생할 수 있는 null pointer exeception 수정

* n+1 쿼리 개선

Author: 이건영

apps/commerce-api/src/main/java/com/loopers/infrastructure/rank/ProductRankRepositoryImpl.java

@@ -6,6 +6,7 @@
 import jakarta.persistence.PersistenceContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -19,6 +20,7 @@
  */
 @Slf4j
 @Repository
+@Transactional(readOnly = true)
 public class ProductRankRepositoryImpl implements ProductRankRepository {
 
     @PersistenceContext

apps/commerce-batch/src/main/java/com/loopers/domain/metrics/ProductMetricsRepository.java

@@ -80,7 +80,6 @@ Page<ProductMetrics> findByUpdatedAtBetween(
      *
      * @return PagingAndSortingRepository를 구현한 JPA Repository
      */
-    @SuppressWarnings("rawtypes")
     org.springframework.data.repository.PagingAndSortingRepository<ProductMetrics, Long> getJpaRepository();
 }
 

apps/commerce-batch/src/main/java/com/loopers/domain/rank/ProductRankScoreRepository.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * ProductRankScore 도메인 Repository 인터페이스.
@@ -39,6 +40,17 @@ public interface ProductRankScoreRepository {
      */
     Optional<ProductRankScore> findByProductId(Long productId);
 
+    /**
+     * 여러 product_id로 ProductRankScore를 일괄 조회합니다.
+     * <p>
+     * N+1 쿼리 문제를 방지하기 위해 사용합니다.
+     * </p>
+     *
+     * @param productIds 상품 ID 집합
+     * @return ProductRankScore 리스트
+     */
+    List<ProductRankScore> findAllByProductIdIn(Set<Long> productIds);
+
     /**
      * 모든 ProductRankScore를 점수 내림차순으로 조회합니다.
      * <p>

apps/commerce-batch/src/main/java/com/loopers/infrastructure/batch/rank/ProductRankCalculationProcessor.java

@@ -4,6 +4,7 @@
 import com.loopers.domain.rank.ProductRankScore;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.batch.core.configuration.annotation.StepScope;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.stereotype.Component;
 
@@ -29,11 +30,12 @@
  */
 @Slf4j
 @Component
+@StepScope
 @RequiredArgsConstructor
 public class ProductRankCalculationProcessor implements ItemProcessor<ProductRankScore, ProductRank> {
 
     private final ProductRankAggregationProcessor productRankAggregationProcessor;
-    private final ThreadLocal<Integer> currentRank = ThreadLocal.withInitial(() -> 0);
+    private int currentRank = 0;
     private static final int TOP_RANK_LIMIT = 100;
 
     /**
@@ -48,8 +50,7 @@ public class ProductRankCalculationProcessor implements ItemProcessor<ProductRan
      */
     @Override
     public ProductRank process(ProductRankScore score) throws Exception {
-        int rank = currentRank.get() + 1;
-        currentRank.set(rank);
+        int rank = ++currentRank;
 
         // TOP 100에 포함되지 않으면 null 반환 (필터링)
         if (rank > TOP_RANK_LIMIT) {
@@ -76,11 +77,6 @@ public ProductRank process(ProductRankScore score) throws Exception {
             score.getViewCount()
         );
 
-        // Step 완료 후 ThreadLocal 정리 (마지막 항목 처리 시)
-        if (rank == TOP_RANK_LIMIT) {
-            currentRank.remove();
-        }
-
         return productRank;
     }
 }

apps/commerce-batch/src/main/java/com/loopers/infrastructure/batch/rank/ProductRankCalculationReader.java

@@ -4,6 +4,7 @@
 import com.loopers.domain.rank.ProductRankScoreRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.batch.core.configuration.annotation.StepScope;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.NonTransientResourceException;
 import org.springframework.batch.item.ParseException;
@@ -33,6 +34,7 @@
  */
 @Slf4j
 @Component
+@StepScope
 @RequiredArgsConstructor
 public class ProductRankCalculationReader implements ItemReader<ProductRankScore> {
 

apps/commerce-batch/src/main/java/com/loopers/infrastructure/batch/rank/ProductRankCalculationWriter.java

@@ -4,6 +4,7 @@
 import com.loopers.domain.rank.ProductRankRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.batch.core.configuration.annotation.StepScope;
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.stereotype.Component;
@@ -32,6 +33,7 @@
  */
 @Slf4j
 @Component
+@StepScope
 @RequiredArgsConstructor
 public class ProductRankCalculationWriter implements ItemWriter<ProductRank> {
 

apps/commerce-batch/src/main/java/com/loopers/infrastructure/batch/rank/ProductRankJobConfig.java

@@ -181,6 +181,10 @@ public ItemReader<ProductMetrics> productRankReader(
         @Value("#{jobParameters['periodType']}") String periodType,
         @Value("#{jobParameters['targetDate']}") String targetDate
     ) {
+        if (periodType == null || periodType.isEmpty()) {
+            throw new IllegalArgumentException("periodType 파라미터는 필수입니다. (WEEKLY 또는 MONTHLY)");
+        }
+
         LocalDate date = parseDate(targetDate);
         ProductRank.PeriodType period = ProductRank.PeriodType.valueOf(periodType.toUpperCase());
 

apps/commerce-batch/src/main/java/com/loopers/infrastructure/batch/rank/ProductRankScoreAggregationWriter.java

@@ -11,6 +11,8 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -80,25 +82,31 @@ public void write(Chunk<? extends ProductMetrics> chunk) throws Exception {
                 )
             ));
 
+        // Chunk 내 모든 productId를 한 번에 조회
+        Set<Long> productIds = chunkAggregatedMap.keySet();
+        Map<Long, ProductRankScore> existingScores = productRankScoreRepository
+            .findAllByProductIdIn(productIds)
+            .stream()
+            .collect(Collectors.toMap(ProductRankScore::getProductId, Function.identity()));
+
         // 기존 데이터와 누적하여 ProductRankScore 생성
         List<ProductRankScore> scores = chunkAggregatedMap.entrySet().stream()
             .map(entry -> {
                 Long productId = entry.getKey();
                 AggregatedMetrics chunkAggregated = entry.getValue();
 
-                // 기존 데이터 조회
-                java.util.Optional<ProductRankScore> existing = productRankScoreRepository.findByProductId(productId);
+                // 기존 데이터 조회 (일괄 조회 결과에서)
+                ProductRankScore existing = existingScores.get(productId);
 
                 // 기존 데이터와 누적
                 Long totalLikeCount = chunkAggregated.getLikeCount();
                 Long totalSalesCount = chunkAggregated.getSalesCount();
                 Long totalViewCount = chunkAggregated.getViewCount();
 
-                if (existing.isPresent()) {
-                    ProductRankScore existingScore = existing.get();
-                    totalLikeCount += existingScore.getLikeCount();
-                    totalSalesCount += existingScore.getSalesCount();
-                    totalViewCount += existingScore.getViewCount();
+                if (existing != null) {
+                    totalLikeCount += existing.getLikeCount();
+                    totalSalesCount += existing.getSalesCount();
+                    totalViewCount += existing.getViewCount();
                 }
 
                 // 점수 계산 (가중치: 좋아요 0.3, 판매량 0.5, 조회수 0.2)

apps/commerce-batch/src/main/java/com/loopers/infrastructure/metrics/ProductMetricsRepositoryImpl.java

@@ -65,7 +65,6 @@ public Page<ProductMetrics> findByUpdatedAtBetween(
      * {@inheritDoc}
      */
     @Override
-    @SuppressWarnings("rawtypes")
     public org.springframework.data.repository.PagingAndSortingRepository<ProductMetrics, Long> getJpaRepository() {
         return productMetricsJpaRepository;
     }

apps/commerce-batch/src/main/java/com/loopers/infrastructure/rank/ProductRankScoreRepositoryImpl.java

@@ -10,6 +10,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * ProductRankScore Repository 구현체.
@@ -70,6 +71,18 @@ public Optional<ProductRankScore> findByProductId(Long productId) {
         }
     }
 
+    @Override
+    public List<ProductRankScore> findAllByProductIdIn(Set<Long> productIds) {
+        if (productIds == null || productIds.isEmpty()) {
+            return List.of();
+        }
+        
+        String jpql = "SELECT prs FROM ProductRankScore prs WHERE prs.productId IN :productIds";
+        return entityManager.createQuery(jpql, ProductRankScore.class)
+            .setParameter("productIds", productIds)
+            .getResultList();
+    }
+
     @Override
     public List<ProductRankScore> findAllOrderByScoreDesc(int limit) {
         String jpql = "SELECT prs FROM ProductRankScore prs ORDER BY prs.score DESC";