[volume-10] Collect, Stack, Zip

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

@@ -23,7 +23,7 @@ public enum BusinessAction {
     LOYALTY_MILESTONE
   }
 
-  public static BusinessActionEvent couponUsed(Long userId, Long couponId, Long orderId,
+  public static BusinessActionEvent couponUsed(Long userId, Long couponId, String orderId,
                                                BigDecimal originalAmount, BigDecimal discountAmount) {
     return new BusinessActionEvent(
         userId, BusinessAction.COUPON_USED, couponId, "coupon",

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

@@ -25,6 +25,7 @@ public class CouponEventHandler {
   private final OrderService orderService;
   private final ApplicationEventPublisher eventPublisher;
 
+
   @TransactionalEventListener(phase = AFTER_COMMIT)
   @Async
   public void handleCouponUsed(CouponUsedEvent event) {
@@ -37,16 +38,6 @@ public void handleCouponUsed(CouponUsedEvent event) {
 
       pgClient.requestPayment(event.orderId(), event.cardType(), event.cardNo(), finalPrice);
 
-      // 데이터 플랫폼으로 주문 생성 이벤트 전송
-      Order order = orderService.getOrder(event.orderId());
-      eventPublisher.publishEvent(new OrderDataTransferEvent(
-          event.orderId(),
-          event.userId(),
-          order.getStatus(),
-          finalPrice.getAmount(),
-          LocalDateTime.now(),
-          "ORDER_CREATED"
-      ));
 
       log.info("쿠폰 사용 및 결제 처리 완료 - orderId: {}, userId: {}", event.orderId(), event.userId());
 

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

@@ -4,7 +4,7 @@
 import com.loopers.domain.payment.CardType;
 
 public record CouponUsedEvent(
-    Long orderId,
+    String orderId,
     Long userId,
     Long couponIssueId,
     Money totalPrice,

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

@@ -0,0 +1,108 @@
+package com.loopers.application.event;
+
+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 lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionalEventListener;
+import org.springframework.transaction.event.TransactionPhase;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class DataTransferEventHandler {
+  private final OrderService orderService;
+  private final PaymentService paymentService;
+  private final ApplicationEventPublisher eventPublisher;
+
+  @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+  public void handlePaymentSuccess(PaymentSuccessEvent event) {
+    log.debug("Handling PaymentSuccessEvent for data transfer: orderId={}", event.orderId());
+
+    Payment payment = paymentService.findPaymentByOrderId(event.orderId());
+
+    // 결제 성공 데이터 전송
+    eventPublisher.publishEvent(new PaymentDataTransferEvent(
+        event.orderId(),
+        event.userId(),
+        event.amount(),
+        payment.getCardType(),
+        payment.getStatus(),
+        com.loopers.application.payment.TransactionStatus.SUCCESS,
+        event.reason(),
+        LocalDateTime.now(),
+        "PAYMENT_SUCCESS"
+    ));
+
+    // 주문 결제 완료 데이터 전송 (이벤트 데이터 활용)
+    eventPublisher.publishEvent(new OrderDataTransferEvent(
+        event.orderId(),
+        event.userId(),
+        null, // order.getStatus() 대신 OrderCompletedEvent에서 처리
+        event.totalOrderAmount(),
+        LocalDateTime.now(),
+        "ORDER_PAID"
+    ));
+  }
+
+  @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+  public void handlePaymentFailure(PaymentFailureEvent event) {
+    log.debug("Handling PaymentFailureEvent for data transfer: orderId={}", event.orderId());
+
+    Payment payment = paymentService.findPaymentByOrderId(event.orderId());
+
+    // 결제 실패 데이터 전송 (이벤트 데이터 활용)
+    eventPublisher.publishEvent(new PaymentDataTransferEvent(
+        event.orderId(),
+        event.userId(),
+        event.amount(),
+        payment.getCardType(),
+        payment.getStatus(),
+        com.loopers.application.payment.TransactionStatus.FAILED,
+        event.reason(),
+        LocalDateTime.now(),
+        "PAYMENT_FAILED"
+    ));
+  }
+
+  @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+  public void handleOrderCreated(OrderCreatedEvent event) {
+    log.debug("Handling OrderCreatedEvent for data transfer: orderId={}", event.orderId());
+
+    Order order = orderService.getOrder(event.orderId());
+
+    // 주문 생성 데이터 전송
+    eventPublisher.publishEvent(new OrderDataTransferEvent(
+        event.orderId(),
+        event.userId(),
+        order.getStatus(),
+        order.getTotalPrice(),
+        LocalDateTime.now(),
+        "ORDER_CREATED"
+    ));
+  }
+
+  @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+  public void handleOrderCancelled(OrderCancelledEvent event) {
+    log.debug("Handling OrderCancelledEvent for data transfer: orderId={}", event.orderId());
+
+    Order order = orderService.getOrder(event.orderId());
+
+    // 주문 취소 데이터 전송
+    eventPublisher.publishEvent(new OrderDataTransferEvent(
+        event.orderId(),
+        event.userId(),
+        order.getStatus(),
+        order.getTotalPrice(),
+        LocalDateTime.now(),
+        "ORDER_CANCELLED"
+    ));
+  }
+}

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

@@ -1,7 +1,7 @@
 package com.loopers.application.event;
 
 public record OrderCancelledEvent(
-    Long orderId,
+    String orderId,
     Long userId,
     String reason
-) {}
+) {}

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

@@ -1,20 +1,22 @@
 package com.loopers.application.event;
 
 import com.loopers.domain.payment.CardType;
+
 import java.util.List;
 
 public record OrderCreatedEvent(
-    Long orderId,
+    String orderId,
     Long userId,
     Long couponIssueId,
     CardType cardType,
     String cardNo,
     List<OrderItemData> orderItems
 ) {
-
-    public record OrderItemData(
-        Long productId,
-        Long quantity,
-        Long unitPrice
-    ) {}
+
+  public record OrderItemData(
+      Long productId,
+      Long quantity,
+      Long unitPrice
+  ) {
+  }
 }

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

@@ -1,15 +1,16 @@
 package com.loopers.application.event;
 
+import com.loopers.domain.order.Money;
 import com.loopers.domain.order.OrderStatus;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 public record OrderDataTransferEvent(
-    Long orderId,
+    String orderId,
     Long userId,
     OrderStatus status,
-    BigDecimal totalAmount,
+    Money totalAmount,
     LocalDateTime completedAt,
     String eventType // "ORDER_CREATED", "ORDER_PAID", "ORDER_CANCELLED"
 ) {

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

@@ -7,6 +7,7 @@
 import com.loopers.domain.order.OrderService;
 import com.loopers.domain.stock.StockService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@
 
 import static org.springframework.transaction.event.TransactionPhase.AFTER_COMMIT;
 
+@Slf4j
 @RequiredArgsConstructor
 @Component
 public class OrderEventHandler {
@@ -28,43 +30,33 @@ public class OrderEventHandler {
   @TransactionalEventListener(phase = AFTER_COMMIT)
   @Async
   public void handleOrderCreated(OrderCreatedEvent event) {
-    Order order = orderService.getOrder(event.orderId());
+    log.debug("주문 처리 시작 - orderId: {}, couponIssueId: {}",
+        event.orderId(), event.couponIssueId());
 
-    if (event.couponIssueId() != null) {
-      handleOrderWithCoupon(event, order);
-    } else {
-      handleOrderWithoutCoupon(event, order);
-    }
-  }
+    try {
+      Order order = orderService.getOrder(event.orderId());
+      Money finalPrice = order.getTotalPrice();
 
-  private void handleOrderWithCoupon(OrderCreatedEvent event, Order order) {
-    // 쿠폰 사용 이벤트 발행 (별도 트랜잭션에서 처리)
-    eventPublisher.publishEvent(new CouponUsedEvent(
-        event.orderId(),
-        event.userId(),
-        event.couponIssueId(),
-        order.getTotalPrice(),
-        event.cardType(),
-        event.cardNo()
-    ));
-  }
+      // 쿠폰 처리 (있는 경우만)
+      if (event.couponIssueId() != null) {
+        log.debug("쿠폰 사용 처리 - couponIssueId: {}", event.couponIssueId());
+        finalPrice = couponService.useCouponById(
+            event.couponIssueId(),
+            event.userId(),
+            order.getTotalPrice()
+        );
+      }
 
-  private void handleOrderWithoutCoupon(OrderCreatedEvent event, Order order) {
-    try {
-      // 쿠폰 없이 바로 결제 처리
-      pgClient.requestPayment(event.orderId(), event.cardType(), event.cardNo(), order.getTotalPrice());
+      // 결제 요청
+      pgClient.requestPayment(order.getOrderId(), event.cardType(), event.cardNo(), finalPrice);
+
+
+      log.info("주문 처리 완료 - orderId: {}, userId: {}, finalPrice: {}",
+          event.orderId(), event.userId(), finalPrice.getAmount());
 
-      // 데이터 플랫폼으로 주문 생성 이벤트 전송
-      eventPublisher.publishEvent(new OrderDataTransferEvent(
-          event.orderId(),
-          event.userId(),
-          order.getStatus(),
-          order.getTotalPrice().getAmount(),
-          LocalDateTime.now(),
-          "ORDER_CREATED"
-      ));
     } catch (Exception e) {
-      // 결제 요청 실패시 주문 취소 처리
+      log.error("주문 처리 실패 - orderId: {}, userId: {}, error: {}",
+          event.orderId(), event.userId(), e.getMessage());
       orderService.cancelPayment(event.orderId());
     }
   }
@@ -83,14 +75,5 @@ public void handleOrderCancelled(OrderCancelledEvent event) {
       couponService.rollbackCouponUsage(order.getRefCouponIssueId());
     }
 
-    // 데이터 플랫폼으로 주문 취소 이벤트 전송
-    eventPublisher.publishEvent(new OrderDataTransferEvent(
-        event.orderId(),
-        event.userId(),
-        order.getStatus(),
-        order.getTotalPrice().getAmount(),
-        LocalDateTime.now(),
-        "ORDER_CANCELLED"
-    ));
   }
 }

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

@@ -0,0 +1,10 @@
+package com.loopers.application.event;
+
+import com.loopers.domain.order.Money;
+
+public record OrderPaidEvent(
+    String orderId,
+    Long userId,
+    Money totalAmount
+) {
+}