[volume-9] Product Ranking with Redis

apps/commerce-api/src/main/java/com/loopers/application/like/LikeFacade.java

@@ -1,12 +1,12 @@
 package com.loopers.application.like;
 
-import com.loopers.application.like.event.LikeCanceledEvent;
-import com.loopers.application.like.event.LikeCreatedEvent;
 import com.loopers.domain.like.Like;
 import com.loopers.domain.like.LikeService;
 import com.loopers.domain.product.Product;
 import com.loopers.domain.product.ProductLikeCountService;
 import com.loopers.domain.product.ProductService;
+import com.loopers.messaging.event.LikeCanceledEvent;
+import com.loopers.messaging.event.LikeCreatedEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;

apps/commerce-api/src/main/java/com/loopers/application/like/event/LikeEventHandler.java

@@ -4,6 +4,8 @@
 import com.loopers.domain.common.event.DomainEventEnvelop;
 import com.loopers.domain.common.event.DomainEventRepository;
 import com.loopers.domain.product.ProductLikeCountService;
+import com.loopers.messaging.event.LikeCanceledEvent;
+import com.loopers.messaging.event.LikeCreatedEvent;
 import com.loopers.support.json.JsonConverter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Async;

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

@@ -3,10 +3,10 @@
 import com.loopers.application.order.OrderExternalSystemSender;
 import com.loopers.application.order.OrderFacade;
 import com.loopers.application.payment.event.PaymentFailedEvent;
-import com.loopers.application.payment.event.PaymentSucceededEvent;
 import com.loopers.domain.common.event.DomainEvent;
 import com.loopers.domain.common.event.DomainEventEnvelop;
 import com.loopers.domain.common.event.DomainEventRepository;
+import com.loopers.messaging.event.OrderPaidEvent;
 import com.loopers.support.json.JsonConverter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -31,8 +31,8 @@ public class OrderEventHandler {
 
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public void handle(PaymentSucceededEvent event) {
-        log.info("🔥 PaymentSucceededEvent handler 진입");
+    public void handle(OrderPaidEvent event) {
+        log.info("🔥 OrderPaidEvent handler 진입");
         orderFacade.handleOrderSucceed(event.orderId());
     }
 
@@ -48,7 +48,7 @@ public void handle(PaymentFailedEvent event) {
      */
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     @Async
-    void handleOrderCreatedExternalSend(PaymentSucceededEvent event) {
+    void handleOrderCreatedExternalSend(OrderPaidEvent event) {
         try {
             orderExternalSystemSender.send(event.orderId());
         } catch (Exception e) {
@@ -61,9 +61,9 @@ void handleOrderCreatedExternalSend(PaymentSucceededEvent event) {
      * 결제 성공 시, outbox 테이블에 이벤트를 저장합니다.
      */
     @TransactionalEventListener(phase = TransactionPhase.BEFORE_COMMIT)
-    public void handleOutboxEvent(PaymentSucceededEvent event) {
+    public void handleOutboxEvent(OrderPaidEvent event) {
 
-        DomainEventEnvelop<PaymentSucceededEvent> envelop =
+        DomainEventEnvelop<OrderPaidEvent> envelop =
                 DomainEventEnvelop.of(
                         "ORDER_PAID",
                         "ORDER",

apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentFacade.java

@@ -1,14 +1,14 @@
 package com.loopers.application.payment;
 
 import com.loopers.application.order.event.OrderCreated;
-import com.loopers.application.payment.event.PaymentSucceededEvent;
 import com.loopers.domain.order.Order;
 import com.loopers.domain.order.OrderService;
 import com.loopers.domain.payment.Payment;
 import com.loopers.domain.payment.PaymentService;
 import com.loopers.domain.point.PointService;
 import com.loopers.infrastructure.ResilientPgClient;
 import com.loopers.interfaces.api.payment.PaymentV1Dto;
+import com.loopers.messaging.event.OrderPaidEvent;
 import com.loopers.support.error.CoreException;
 import com.loopers.support.error.ErrorType;
 import lombok.RequiredArgsConstructor;
@@ -17,6 +17,8 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Slf4j
 @Component
 @RequiredArgsConstructor
@@ -51,7 +53,16 @@ public void pay(Long userId, Long orderId) {
            case POINT -> {
                try {
                    pointService.usePoint(payment.getUserId(), payment.getAmount());
-                   eventPublisher.publishEvent(PaymentSucceededEvent.from(orderId));
+
+                   List<OrderPaidEvent.OrderItemData> items =
+                           order.getItems().stream()
+                                           .map(item -> new OrderPaidEvent.OrderItemData(
+                                                   item.getProductId(),
+                                                   item.getQuantity(),
+                                                   item.getTotalPrice().getAmount()
+                                           )).toList();
+
+                   eventPublisher.publishEvent(OrderPaidEvent.of(orderId, items));
                } catch (IllegalArgumentException e) {
                    throw new CoreException(ErrorType.BAD_REQUEST, e.getMessage());
                }

apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentProcessService.java

@@ -1,19 +1,26 @@
 package com.loopers.application.payment;
 
 import com.loopers.application.payment.event.PaymentFailedEvent;
-import com.loopers.application.payment.event.PaymentSucceededEvent;
+import com.loopers.domain.order.Order;
+import com.loopers.domain.order.OrderService;
+import com.loopers.messaging.event.OrderPaidEvent;
+import com.loopers.messaging.event.OrderPaidEvent.OrderItemData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Slf4j
 @Component
 @RequiredArgsConstructor
 public class PaymentProcessService {
 
     private final PaymentFacade paymentFacade;
+    private final OrderService orderService; // Added OrderService injection
 
     private final ApplicationEventPublisher eventPublisher;
 
@@ -28,12 +35,19 @@ public void process(Long userId, Long orderId) {
     }
 
     @Transactional
-    public void processPg(Long userId, Long orderId) {
+    public void processPg(Long userId, Long orderId) { // Added userId parameter
         try {
             paymentFacade.payPg(orderId);
-            eventPublisher.publishEvent(PaymentSucceededEvent.from(orderId));
+
+            Order order = orderService.findOrderById(orderId)
+                    .orElseThrow(() -> new IllegalStateException("결제된 주문 정보를 찾을 수 없습니다. orderId: " + orderId));
+
+            List<OrderItemData> orderItemDataList = order.getItems().stream()
+                    .map(item -> new OrderItemData(item.getProductId(), item.getQuantity(), item.getUnitPrice().getAmount()))
+                    .collect(Collectors.toList());
+
+            eventPublisher.publishEvent(OrderPaidEvent.of(orderId, orderItemDataList));
         } catch (Exception e) {
-            // 이외 서버 타임아웃 등은 retry -> pending상태로 스케줄링 시도
             log.error("외부 PG 결제 실패, 주문 ID: {}", orderId, e);
             eventPublisher.publishEvent(PaymentFailedEvent.of(userId, orderId, e));
         }

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

@@ -0,0 +1,42 @@
+package com.loopers.application.product.event;
+
+import com.loopers.domain.common.event.DomainEvent;
+import com.loopers.domain.common.event.DomainEventEnvelop;
+import com.loopers.domain.common.event.DomainEventRepository;
+import com.loopers.messaging.event.ProductViewedEvent;
+import com.loopers.support.json.JsonConverter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ProductViewedEventHandler {
+
+    private final DomainEventRepository eventRepository;
+    private final JsonConverter jsonConverter;
+
+    @TransactionalEventListener(phase = TransactionPhase.BEFORE_COMMIT)
+    public void handleProductViewedEvent(ProductViewedEvent event) {
+        log.info("ProductViewedEvent received: productId={}, occurredAt={}", event.productId(), event.occurredAt());
+
+        DomainEventEnvelop<ProductViewedEvent> envelop =
+                DomainEventEnvelop.of(
+                        "PRODUCT_VIEWED",
+                        "PRODUCT",
+                        event.productId(),
+                        event
+                );
+
+        eventRepository.save(
+                DomainEvent.pending(
+                        "catalog-events",
+                        envelop,
+                        jsonConverter.serialize(envelop)
+                )
+        );
+    }
+}

apps/commerce-streamer/src/main/java/com/loopers/domain/productmetrics/ProductMetrics.java

@@ -26,6 +26,9 @@ public class ProductMetrics {
     @Column(nullable = false)
     private long salesCount;
 
+    @Column(nullable = false)
+    private long salesAmount;
+
     @Column(nullable = false)
     private long viewCount;
 
@@ -39,6 +42,7 @@ public ProductMetrics(Long productId) {
         this.productId = productId;
         this.likeCount = 0;
         this.salesCount = 0;
+        this.salesAmount = 0;
         this.viewCount = 0;
         this.createdAt = ZonedDateTime.now();
         this.updatedAt = ZonedDateTime.now();

apps/commerce-streamer/src/main/java/com/loopers/domain/productmetrics/ProductMetricsRepository.java

@@ -1,5 +1,6 @@
 package com.loopers.domain.productmetrics;
 
+import java.math.BigDecimal;
 import java.util.Optional;
 
 public interface ProductMetricsRepository {
@@ -10,7 +11,7 @@ public interface ProductMetricsRepository {
 
     void upsertUnlikeCount(Long productId);
 
-    void upsertSalesCount(Long productId, int quantity);
+    void upsertSalesCount(Long productId, int quantity, BigDecimal amount);
 
     void upsertViewCount(Long productId);
 }

apps/commerce-streamer/src/main/java/com/loopers/domain/productmetrics/ProductMetricsService.java

@@ -6,6 +6,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.util.Optional;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
@@ -14,12 +17,16 @@ public class ProductMetricsService {
     private final ProductMetricsJpaRepository productMetricsRepository;
 
     @Transactional
-    public void increaseSalesCount(Long productId, int quantity) {
+    public void increaseSalesCount(Long productId, int quantity, BigDecimal amount) {
         if (quantity <= 0) {
             log.warn("판매 수량이 0 이하일 수 없습니다. 수량:{}, 상품ID:{}", quantity, productId);
             return;
         }
-        productMetricsRepository.upsertSalesCount(productId, quantity);
+        if (amount.compareTo(BigDecimal.ZERO) < 0){
+            log.warn("판매 금액이 0 이하일 수 없습니다. 금액:{}, 상품ID:{}", amount, productId);
+            return;
+        }
+        productMetricsRepository.upsertSalesCount(productId, quantity, amount);
     }
 
     @Transactional
@@ -36,4 +43,8 @@ public void decreaseLikeCount(Long productId) {
     public void increaseViewCount(Long productId) {
         productMetricsRepository.upsertViewCount(productId);
     }
+
+    public Optional<ProductMetrics> findByProductId(Long productId) {
+        return productMetricsRepository.findByProductId(productId);
+    }
 }

apps/commerce-streamer/src/main/java/com/loopers/infrastructure/productmetrics/ProductMetricsJpaRepository.java

@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.math.BigDecimal;
 import java.util.Optional;
 
 public interface ProductMetricsJpaRepository extends JpaRepository<ProductMetrics, Long> {
@@ -38,15 +39,16 @@ INSERT INTO product_metrics (product_id, like_count, sales_count, view_count, cr
 
     @Modifying
     @Query(value = """
-        INSERT INTO product_metrics (product_id, like_count, sales_count, view_count, created_at, updated_at)
-        VALUES (:productId, 0, :quantity, 0, NOW(), NOW())
+        INSERT INTO product_metrics (product_id, like_count, sales_count, sales_amount, view_count, created_at, updated_at)
+        VALUES (:productId, 0, :quantity, amount, 0, NOW(), NOW())
         ON DUPLICATE KEY UPDATE
             sales_count = sales_count + :quantity,
+            sales_amount = sales_amount + :amount,
             updated_at = NOW()
         """,
         nativeQuery = true
     )
-    void upsertSalesCount(@Param("productId") Long productId, @Param("quantity") int quantity);
+    void upsertSalesCount(@Param("productId") Long productId, @Param("quantity") int quantity, @Param("amount") BigDecimal amount);
 
     @Modifying
     @Query(value = """

apps/commerce-streamer/src/main/java/com/loopers/infrastructure/productmetrics/ProductMetricsRepositoryImpl.java

@@ -5,6 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
 import java.util.Optional;
 
 @RequiredArgsConstructor
@@ -28,8 +29,8 @@ public void upsertUnlikeCount(Long productId) {
     }
 
     @Override
-    public void upsertSalesCount(Long productId, int quantity) {
-        productMetricsJpaRepository.upsertSalesCount(productId, quantity);
+    public void upsertSalesCount(Long productId, int quantity, BigDecimal amount) {
+        productMetricsJpaRepository.upsertSalesCount(productId, quantity, amount);
     }
 
     @Override

apps/commerce-api/src/main/java/com/loopers/application/like/event/LikeCanceledEvent.java → modules/shared/src/main/java/com/loopers/messaging/event/LikeCanceledEvent.java

@@ -1,4 +1,4 @@
-package com.loopers.application.like.event;
+package com.loopers.messaging.event;
 
 import java.time.Instant;
 

apps/commerce-api/src/main/java/com/loopers/application/like/event/LikeCreatedEvent.java → modules/shared/src/main/java/com/loopers/messaging/event/LikeCreatedEvent.java

@@ -1,4 +1,4 @@
-package com.loopers.application.like.event;
+package com.loopers.messaging.event;
 
 import java.time.Instant;
 

modules/shared/src/main/java/com/loopers/messaging/event/OrderPaidEvent.java

@@ -0,0 +1,25 @@
+package com.loopers.messaging.event;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.util.List;
+
+public record OrderPaidEvent(
+        Long orderId,
+        List<OrderItemData> items,
+        Instant occurredAt
+) {
+    public static OrderPaidEvent of(Long orderId, List<OrderItemData> items) {
+        return new OrderPaidEvent(
+                orderId,
+                items,
+                Instant.now()
+        );
+    }
+
+    public record OrderItemData(
+            Long productId,
+            int quantity,
+            BigDecimal unitPrice // 상품 단가
+    ) {}
+}