Merge pull request #219 from yeonjiyeon/feature/week9

[volume-9] Product Ranking with Redis

Author: yeonjiyeon

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

@@ -67,6 +67,7 @@ public OrderInfo placeOrder(PlaceOrder command) {
         order.getId(),
         user,
         orderItems,
+        products,
         finalPaymentAmount,
         command.paymentType(),
         command.cardType(),

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

@@ -2,9 +2,13 @@
 
 import com.loopers.domain.order.OrderItem;
 import com.loopers.domain.payment.PaymentType;
+import com.loopers.domain.product.Product;
 import com.loopers.domain.user.User;
 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(
     String eventId,
@@ -18,24 +22,35 @@ public record OrderCreatedEvent(
     Long couponId
 ) {
 
-  public record OrderItemInfo(Long productId, int quantity) {
+  public record OrderItemInfo(Long productId, int quantity, long price, int remainStock) {
 
   }
 
   public static OrderCreatedEvent of(
       Long orderId,
       User user,
       List<OrderItem> orderItems,
+      List<Product> products,
       long finalAmount,
       PaymentType paymentType,
       String cardType,
       String cardNo,
       Long couponId
   ) {
 
+    Map<Long, Product> productMap = products.stream()
+        .collect(Collectors.toMap(Product::getId, p -> p));
+
     List<OrderItemInfo> itemInfos = orderItems.stream()
-        .map(item -> new OrderItemInfo(item.getProductId(), item.getQuantity()))
-        .toList();
+        .map(item -> {
+          Product product = productMap.get(item.getProductId());
+          return new OrderItemInfo(
+              item.getProductId(),
+              item.getQuantity(),
+              product != null ? product.getPrice().getValue() : 0,
+              product != null ? product.getStock() : 0
+          );
+        }).toList();
 
     return new OrderCreatedEvent(
         UUID.randomUUID().toString(),

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

@@ -1,6 +1,7 @@
 package com.loopers.application.order.event;
 
 import com.loopers.domain.event.OutboxService;
+import com.loopers.event.ProductStockEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Component;
@@ -14,8 +15,8 @@ public class OrderEventOutboxHandler {
   private final OutboxService outboxService;
 
   @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-  public void handle(OrderCreatedEvent event) {
-    kafkaTemplate.send("order-events", String.valueOf(event.orderId()), event)
+  public void handle(ProductStockEvent event) {
+    kafkaTemplate.send("catalog-events", String.valueOf(event.productId()), event)
         .whenComplete((result, ex) -> {
           if (ex == null) {
             outboxService.markPublished(event.eventId());

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

@@ -1,7 +1,6 @@
 package com.loopers.application.order.event;
 
 import com.loopers.domain.event.OutboxService;
-import com.loopers.domain.product.ProductService;
 import com.loopers.event.ProductStockEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
@@ -14,7 +13,6 @@
 @RequiredArgsConstructor
 public class OrderSalesAggregateListener {
 
-  private final ProductService productService;
   private final OutboxService outboxService;
   private final ApplicationEventPublisher eventPublisher;
 
@@ -24,11 +22,11 @@ public void handleOrderCreated(OrderCreatedEvent event) {
 
     event.items().forEach(item -> {
 
-      int currentStock = productService.getStock(item.productId());
       ProductStockEvent kafkaEvent = ProductStockEvent.of(
           item.productId(),
           item.quantity(),
-          currentStock
+          item.remainStock(),
+          item.price()
       );
 
       outboxService.saveEvent("STOCKS_METRICS", String.valueOf(item.productId()), kafkaEvent);

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

@@ -3,6 +3,7 @@
 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 lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
@@ -16,14 +17,15 @@ public class ProductFacade {
 
   private final ProductService productService;
   private final BrandService brandService;
+  private final RankingService rankingService;
   private final ApplicationEventPublisher eventPublisher;
 
   public Page<ProductInfo> getProductsInfo(Pageable pageable) {
     Page<Product> products = productService.getProducts(pageable);
     return products.map(product -> {
       String brandName = brandService.getBrand(product.getBrandId())
           .getName();
-      return ProductInfo.from(product, brandName);
+      return ProductInfo.from(product, brandName, null);
     });
   }
 
@@ -32,9 +34,11 @@ public ProductInfo getProductInfo(long id) {
     String brandName = brandService.getBrand(product.getBrandId())
         .getName();
 
+    Integer currentRank = rankingService.getProductRank(id);
+
     eventPublisher.publishEvent(ProductViewEvent.from(id));
 
-    return ProductInfo.from(product, brandName);
+    return ProductInfo.from(product, brandName, currentRank);
   }
 
 }

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

@@ -8,25 +8,28 @@ public record ProductInfo(
     String name,
     Money price,
     String brandName,
-    int likeCount
+    int likeCount,
+    Integer currentRank
 ) {
   public static ProductInfo from(Product product) {
     return new ProductInfo(
         product.getId(),
         product.getName(),
         product.getPrice(),
         null,
-        product.getLikeCount()
+        product.getLikeCount(),
+        null
     );
   }
 
-  public static ProductInfo from(Product product, String brandName) {
+  public static ProductInfo from(Product product, String brandName, Integer currentRank) {
     return new ProductInfo(
         product.getId(),
         product.getName(),
         product.getPrice(),
         brandName,
-        product.getLikeCount()
+        product.getLikeCount(),
+        currentRank
     );
   }
 }

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

@@ -2,8 +2,8 @@
 
 import com.loopers.application.event.FailedEventStore;
 import com.loopers.application.like.event.LikeCreatedEvent;
-import com.loopers.event.LikeCountEvent;
 import com.loopers.domain.product.ProductService;
+import com.loopers.event.LikeCountEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.orm.ObjectOptimisticLockingFailureException;
@@ -30,7 +30,7 @@ public void handleLikeCreatedEvent(LikeCreatedEvent event) {
     try {
       int updatedLikeCount = performAggregation(event);
 
-      eventPublisher.publishEvent(new LikeCountEvent(
+      eventPublisher.publishEvent(LikeCountEvent.of(
           event.eventId(),
           event.productId(),
           updatedLikeCount

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

@@ -0,0 +1,42 @@
+package com.loopers.application.rank;
+
+import com.loopers.domain.product.Product;
+import com.loopers.domain.product.ProductService;
+import com.loopers.infrastructure.rank.RankingService;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@RequiredArgsConstructor
+@Component
+public class RankingFacade {
+
+  private final RankingService rankingService;
+  private final ProductService productService;
+
+  public List<RankingInfo> getTopRankings(String date, int page, int size) {
+    List<Long> productIds = rankingService.getTopRankingIds(date, page, size);
+
+    if (productIds.isEmpty()) {
+      return List.of();
+    }
+
+    List<Product> products = productService.getProducts(productIds);
+    Map<Long, Product> productMap = products.stream()
+        .collect(Collectors.toMap(Product::getId, p -> p));
+
+    return IntStream.range(0, productIds.size())
+        .mapToObj(i -> {
+          Long productId = productIds.get(i);
+          Product product = productMap.get(productId);
+
+          int currentRank = ((page - 1) * size) + i + 1;
+
+          return RankingInfo.of(product, currentRank);
+        })
+        .toList();
+  }
+}

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

@@ -0,0 +1,22 @@
+package com.loopers.application.rank;
+
+import com.loopers.domain.product.Product;
+
+public record RankingInfo(
+    Long productId,
+    String productName,
+    Long price,
+    int stock,
+    int currentRank
+) {
+
+  public static RankingInfo of(Product product, int currentRank) {
+    return new RankingInfo(
+        product.getId(),
+        product.getName(),
+        product.getPrice().getValue(),
+        product.getStock(),
+        currentRank
+    );
+  }
+}

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

@@ -0,0 +1,35 @@
+package com.loopers.application.rank;
+
+import com.loopers.infrastructure.rank.RankingService;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RankingScheduler {
+
+  private final RankingService rankingService;
+
+  @Scheduled(cron = "0 50 23 * * *")
+  public void scheduleRankingCarryOver() {
+    LocalDateTime now = LocalDateTime.now();
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+    String today = now.format(formatter);
+    String tomorrow = now.plusDays(1).format(formatter);
+
+    log.info("Starting Ranking Carry-Over: {} -> {}", today, tomorrow);
+
+    try {
+      rankingService.carryOverRanking(today, tomorrow, 0.1);
+      log.info("Ranking Carry-Over completed successfully.");
+    } catch (Exception e) {
+      log.error("Ranking Carry-Over failed", e);
+    }
+  }
+}