[volume-10] Collect, Stack, Zip

.github/workflows/main.yml

@@ -0,0 +1,13 @@
+name: PR Agent
+on:
+  pull_request:
+    types: [opened, synchronize]
+jobs:
+  pr_agent_job:
+    runs-on: ubuntu-latest
+    steps:
+      - name: PR Agent action step
+        uses: Codium-ai/pr-agent@main
+        env:
+          OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
+          GITHUB_TOKEN: ${{ secrets.G_TOKEN }}

README.md

@@ -27,6 +27,7 @@ docker-compose -f ./docker/monitoring-compose.yml up
 Root
 ├── apps ( spring-applications )
 │   ├── 📦 commerce-api
+│   ├── 📦 commerce-batch
 │   └── 📦 commerce-streamer
 ├── modules ( reusable-configurations )
 │   ├── 📦 jpa

apps/commerce-api/build.gradle.kts

@@ -34,4 +34,22 @@ dependencies {
     // test-fixtures
     testImplementation(testFixtures(project(":modules:jpa")))
     testImplementation(testFixtures(project(":modules:redis")))
+
+    // Resilience4j (Spring Boot 3.x 기준)
+    implementation("io.github.resilience4j:resilience4j-spring-boot3")
+
+    // AOP
+    implementation("org.springframework.boot:spring-boot-starter-aop")
+
+    // actuator
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
+
+    //Micrometer Prometheus
+    implementation("io.micrometer:micrometer-registry-prometheus")
+
+    //Spring Cloud OpenFeign
+    implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
+
+    //Spring Cloud CircuitBreaker
+    implementation("org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j")
 }

apps/commerce-api/src/main/java/com/loopers/application/order/event/OrderCreatedEvent.java

@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public record OrderCreatedEvent(
@@ -22,7 +21,7 @@ public record OrderCreatedEvent(
     Long couponId
 ) {
 
-  public record OrderItemInfo(Long productId, int quantity, long price, int remainStock) {
+  public record OrderItemInfo(Long productId, String productName, int quantity, long price, int remainStock) {
 
   }
 
@@ -46,6 +45,7 @@ public static OrderCreatedEvent of(
           Product product = productMap.get(item.getProductId());
           return new OrderItemInfo(
               item.getProductId(),
+              product != null ? product.getName() : "Unknown",
               item.getQuantity(),
               product != null ? product.getPrice().getValue() : 0,
               product != null ? product.getStock() : 0

apps/commerce-api/src/main/java/com/loopers/application/order/event/OrderSalesAggregateListener.java

@@ -24,6 +24,7 @@ public void handleOrderCreated(OrderCreatedEvent event) {
 
       ProductStockEvent kafkaEvent = ProductStockEvent.of(
           item.productId(),
+          item.productName(),
           item.quantity(),
           item.remainStock(),
           item.price()

apps/commerce-api/src/main/java/com/loopers/application/product/ProductFacade.java

@@ -3,8 +3,8 @@
 import com.loopers.domain.brand.BrandService;
 import com.loopers.domain.product.Product;
 import com.loopers.domain.product.ProductService;
-import com.loopers.infrastructure.rank.RankingService;
 import com.loopers.event.ProductViewEvent;
+import com.loopers.infrastructure.rank.RankingService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;

apps/commerce-api/src/main/java/com/loopers/application/rank/RankingFacade.java

@@ -39,4 +39,12 @@ public List<RankingInfo> getTopRankings(String date, int page, int size) {
         })
         .toList();
   }
+
+  public List<RankingInfo> getRankings(String type, String date, int page, int size) {
+    return switch (type.toUpperCase()) {
+      case "WEEKLY" -> rankingService.getWeeklyRankings(date, page, size);
+      case "MONTHLY" -> rankingService.getMonthlyRankings(date, page, size);
+      default -> getTopRankings(date, page, size);
+    };
+  }
 }

apps/commerce-api/src/main/java/com/loopers/application/rank/RankingInfo.java

@@ -1,12 +1,14 @@
 package com.loopers.application.rank;
 
 import com.loopers.domain.product.Product;
+import com.loopers.domain.rank.monthly.MonthlyRankingMV;
+import com.loopers.domain.rank.weekly.WeeklyRankingMV;
 
 public record RankingInfo(
     Long productId,
     String productName,
     Long price,
-    int stock,
+    boolean isSoldOut,
     int currentRank
 ) {
 
@@ -15,8 +17,28 @@ public static RankingInfo of(Product product, int currentRank) {
         product.getId(),
         product.getName(),
         product.getPrice().getValue(),
-        product.getStock(),
+        product.getStock() <= 0,
         currentRank
     );
   }
+
+  public static RankingInfo from(WeeklyRankingMV mv) {
+    return new RankingInfo(
+        mv.getProductId(),
+        mv.getProductName(),
+        mv.getPrice(),
+        mv.isSoldOut(),
+        mv.getCurrentRank()
+    );
+  }
+
+  public static RankingInfo from(MonthlyRankingMV mv) {
+    return new RankingInfo(
+        mv.getProductId(),
+        mv.getProductName(),
+        mv.getPrice(),
+        mv.isSoldOut(),
+        mv.getCurrentRank()
+    );
+  }
 }

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

@@ -1,54 +1,15 @@
 package com.loopers.infrastructure.rank;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+import com.loopers.application.rank.RankingInfo;
 import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.redis.connection.zset.Aggregate;
-import org.springframework.data.redis.connection.zset.Weights;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
 
-@Component
-@RequiredArgsConstructor
-public class RankingService {
+public interface RankingService {
 
-  private final RedisTemplate<String, String> redisTemplate;
+  List<Long> getTopRankingIds(String date, int page, int size);
 
-  public List<Long> getTopRankingIds(String date, int page, int size) {
-    String key = "ranking:all:" + date;
-    int start = (page - 1) * size;
-    int end = start + size - 1;
+  List<RankingInfo> getWeeklyRankings(String date, int page, int size);
 
-    Set<String> rankedIds = redisTemplate.opsForZSet().reverseRange(key, start, end);
+  List<RankingInfo> getMonthlyRankings(String date, int page, int size);
 
-    if (rankedIds == null || rankedIds.isEmpty()) {
-      return List.of();
-    }
-
-    return rankedIds.stream()
-        .map(Long::valueOf)
-        .toList();
-  }
-
-  public Integer getProductRank(Long productId) {
-    String today = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-    String key = "ranking:all:" + today;
-
-    Long rank = redisTemplate.opsForZSet().reverseRank(key, String.valueOf(productId));
-
-    return (rank != null) ? rank.intValue() + 1 : null;
-  }
-
-  public void carryOverRanking(String sourceDate, String targetDate, double weight) {
-    String sourceKey = "ranking:all:" + sourceDate;
-    String targetKey = "ranking:all:" + targetDate;
-
-    redisTemplate.opsForZSet().unionAndStore(sourceKey, List.of(), targetKey,
-        Aggregate.SUM, Weights.of(weight));
-
-    redisTemplate.expire(targetKey, 2, TimeUnit.DAYS);
-  }
+  Integer getProductRank(Long productId);
 }

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

@@ -0,0 +1,65 @@
+package com.loopers.infrastructure.rank;
+
+import com.loopers.application.rank.RankingInfo;
+import com.loopers.domain.rank.monthly.MonthlyRankingMVRepository;
+import com.loopers.domain.rank.weekly.WeeklyRankingMVRepository;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+@RequiredArgsConstructor
+@Component
+public class RankingServiceImpl implements RankingService {
+
+  private final RedisTemplate<String, String> redisTemplate;
+  private final WeeklyRankingMVRepository weeklyRepository;
+  private final MonthlyRankingMVRepository monthlyRepository;
+
+  @Override
+  public List<Long> getTopRankingIds(String date, int page, int size) {
+    String key = "ranking:all:" + date;
+    int start = (page - 1) * size;
+    int end = start + size - 1;
+
+    Set<String> rankedIds = redisTemplate.opsForZSet().reverseRange(key, start, end);
+
+    if (rankedIds == null || rankedIds.isEmpty()) {
+      return List.of();
+    }
+
+    return rankedIds.stream()
+        .map(Long::valueOf)
+        .toList();
+  }
+
+  @Override
+  public List<RankingInfo> getWeeklyRankings(String date, int page, int size) {
+    return weeklyRepository.findByBaseDateOrderByCurrentRankAsc(date, PageRequest.of(page - 1, size))
+        .stream()
+        .map(RankingInfo::from)
+        .toList();
+  }
+
+  @Override
+  public List<RankingInfo> getMonthlyRankings(String date, int page, int size) {
+    return monthlyRepository.findByBaseDateOrderByCurrentRankAsc(date, PageRequest.of(page - 1, size))
+        .stream()
+        .map(RankingInfo::from)
+        .toList();
+  }
+
+  @Override
+  public Integer getProductRank(Long productId) {
+    String today = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+    String key = "ranking:all:" + today;
+
+    Long rank = redisTemplate.opsForZSet().reverseRank(key, String.valueOf(productId));
+
+    return (rank != null) ? rank.intValue() + 1 : null;
+  }
+}

apps/commerce-api/src/main/java/com/loopers/interfaces/api/rank/RankingV1ApiSpec.java

@@ -12,6 +12,7 @@ public interface RankingV1ApiSpec {
 
   @Operation(summary = "실시간 랭킹 조회", description = "특정 날짜의 인기 상품 랭킹을 조회합니다.")
   ApiResponse<List<RankingResponse>> getRankings(
+      @Parameter(description = "랭킹 타입 (DAILY, WEEKLY, MONTHLY)", example = "WEEKLY") String type,
       @Parameter(description = "조회 날짜 (yyyyMMdd)", example = "20251225") String date,
       @Parameter(description = "페이지 번호") int page,
       @Parameter(description = "페이지 크기") int size

apps/commerce-api/src/main/java/com/loopers/interfaces/api/rank/RankingV1Controller.java

@@ -21,11 +21,12 @@ public class RankingV1Controller implements RankingV1ApiSpec {
   @GetMapping
   @Override
   public ApiResponse<List<RankingResponse>> getRankings(
+      @RequestParam(value = "type", defaultValue = "DAILY") String type,
       @RequestParam(value = "date") String date,
       @RequestParam(value = "page", defaultValue = "1") int page,
       @RequestParam(value = "size", defaultValue = "20") int size
   ) {
-    List<RankingInfo> infos = rankingFacade.getTopRankings(date, page, size);
+    List<RankingInfo> infos = rankingFacade.getRankings(type, date, page, size);
     List<RankingV1Dto.RankingResponse> response = infos.stream()
         .map(RankingV1Dto.RankingResponse::from)
         .toList();

apps/commerce-api/src/main/java/com/loopers/interfaces/api/rank/RankingV1Dto.java

@@ -8,7 +8,7 @@ public record RankingResponse(
       Long productId,
       String productName,
       Long price,
-      int stock,
+      boolean isSoldOut,
       int currentRank
   ) {
 
@@ -17,7 +17,7 @@ public static RankingResponse from(RankingInfo info) {
           info.productId(),
           info.productName(),
           info.price(),
-          info.stock(),
+          info.isSoldOut(),
           info.currentRank()
           );
     }

apps/commerce-api/src/main/resources/application.yml

@@ -32,7 +32,6 @@ spring:
             connectTimeout: 1000
             readTimeout: 1000
 
-
 resilience4j:
   retry:
     instances:

apps/commerce-batch/build.gradle.kts

@@ -0,0 +1,21 @@
+dependencies {
+    // add-ons
+    implementation(project(":modules:jpa"))
+    implementation(project(":modules:redis"))
+    implementation(project(":supports:jackson"))
+    implementation(project(":supports:logging"))
+    implementation(project(":supports:monitoring"))
+
+    // batch
+    implementation("org.springframework.boot:spring-boot-starter-batch")
+    testImplementation("org.springframework.batch:spring-batch-test")
+
+    // querydsl
+    annotationProcessor("com.querydsl:querydsl-apt::jakarta")
+    annotationProcessor("jakarta.persistence:jakarta.persistence-api")
+    annotationProcessor("jakarta.annotation:jakarta.annotation-api")
+
+    // test-fixtures
+    testImplementation(testFixtures(project(":modules:jpa")))
+    testImplementation(testFixtures(project(":modules:redis")))
+}

apps/commerce-batch/src/main/java/com/loopers/CommerceBatchApplication.java

@@ -0,0 +1,26 @@
+package com.loopers;
+
+import jakarta.annotation.PostConstruct;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+
+import java.util.TimeZone;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@EnableScheduling
+@ConfigurationPropertiesScan
+@SpringBootApplication
+public class CommerceBatchApplication {
+
+    @PostConstruct
+    public void started() {
+        // set timezone
+        TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
+    }
+
+    public static void main(String[] args) {
+        int exitCode = SpringApplication.exit(SpringApplication.run(CommerceBatchApplication.class, args));
+        System.exit(exitCode);
+    }
+}