refactor: 결제 요청 서비스 로직 수정

Author: Kimjipang

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

@@ -0,0 +1,9 @@
+package com.loopers.application.event.payment;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class PaymentEventHandler {
+}

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

@@ -1,4 +1,13 @@
 package com.loopers.application.order;
 
-public record OrderCreatedEvent(Long couponId) {
+import com.loopers.interfaces.api.payment.PaymentV1Dto;
+
+public record OrderCreatedEvent(
+        Long couponId,
+        String orderId,
+        PaymentV1Dto.CardTypeDto cardType,
+        String cardNo,
+        Long amount,
+        String callbackUrl
+) {
 }

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

@@ -12,6 +12,7 @@
 import com.loopers.domain.product.ProductRepository;
 import com.loopers.domain.user.UserRepository;
 import com.loopers.interfaces.api.order.OrderV1Dto;
+import com.loopers.interfaces.api.payment.PaymentV1Dto;
 import com.loopers.support.error.CoreException;
 import com.loopers.support.error.ErrorType;
 import lombok.RequiredArgsConstructor;
@@ -91,7 +92,7 @@ public OrderResultInfo createOrder(OrderV1Dto.OrderRequest request) {
                 .multiply(BigDecimal.valueOf(100 - rate))
                 .divide(BigDecimal.valueOf(100));
 
-        publisher.publishEvent(new OrderCreatedEvent(couponId));
+        publisher.publishEvent(new OrderCreatedEvent(couponId, null, null, null, null, null));
 
         Order order = request.toEntity(totalPrice);
         Order saved = orderRepository.save(order);
@@ -103,6 +104,15 @@ public OrderResultInfo createOrder(OrderV1Dto.OrderRequest request) {
                 .map(orderItem -> OrderItemInfo.from(orderItem, orderItem.getOrderPrice()))
                 .toList();
 
+        publisher.publishEvent(new OrderCreatedEvent(
+                couponId,
+                "1351039135",
+                PaymentV1Dto.CardTypeDto.HYUNDAI,
+                "1234-5678-9814-1451",
+                100000L,
+                "http://localhost:8080/api/v1/examples/callback"
+        ));
+
         return new OrderResultInfo(OrderInfo.from(saved), orderItemInfos);
     }
 }

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

@@ -1,5 +1,7 @@
 package com.loopers.application.payment;
 
+import com.loopers.domain.payment.Payment;
+import com.loopers.domain.payment.PaymentStatus;
 import com.loopers.infrastructure.payment.client.PgClient;
 import com.loopers.interfaces.api.ApiResponse;
 import com.loopers.interfaces.api.payment.PaymentV1Dto;
@@ -11,17 +13,28 @@
 @RequiredArgsConstructor
 public class PaymentFacade {
     private final PgClient pgClient;
+    private final PaymentRepository paymentRepository;
 
     @CircuitBreaker(name = "pgCircuit", fallbackMethod = "fallback")
-    public PaymentV1Dto.TransactionResponse requestPayment(String userId, PaymentV1Dto.PaymentRequest request) {
-        ApiResponse<PaymentV1Dto.TransactionResponse> result = pgClient.requestPayment(userId, request);
+    public PaymentV1Dto.TransactionResponse requestPayment(String userId, PaymentV1Dto.PgPaymentRequest pgPaymentRequest) {
+        ApiResponse<PaymentV1Dto.TransactionResponse> result = pgClient.requestPayment(userId, pgPaymentRequest);
 
         PaymentV1Dto.TransactionResponse response = result.data();
 
+        PaymentV1Dto.PaymentRequest paymentRequest = new PaymentV1Dto.PaymentRequest(
+                userId,
+                pgPaymentRequest.orderId(),
+                response.transactionKey(),
+                PaymentStatus.PENDING
+        );
+
+        Payment payment = Payment.create(paymentRequest);
+        paymentRepository.save(payment);
+
         return response;
     }
 
-    public PaymentV1Dto.TransactionResponse fallback(String userId, PaymentV1Dto.PaymentRequest request, Throwable throwable) {
+    public PaymentV1Dto.TransactionResponse fallback(String userId, PaymentV1Dto.PgPaymentRequest request, Throwable throwable) {
         return new PaymentV1Dto.TransactionResponse(
                 null,
                 PaymentV1Dto.TransactionStatusResponse.FAILED,

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

@@ -0,0 +1,7 @@
+package com.loopers.application.payment;
+
+import com.loopers.domain.payment.Payment;
+
+public interface PaymentRepository {
+    Payment save(Payment payment);
+}

apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java

@@ -1,8 +1,11 @@
 package com.loopers.domain.payment;
 
 import com.loopers.domain.BaseEntity;
+import com.loopers.interfaces.api.payment.PaymentV1Dto;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -13,13 +16,33 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "payment")
 public class Payment extends BaseEntity {
-    @Column(name = "ref_order_id", nullable = false)
-    private Long orderId;
+    @Column(name = "ref_user_login_id", nullable = false)
+    private String userId;
 
-    @Column(name = "ref_user_id", nullable = false)
-    private Long userId;
+    @Column(name = "order_no", nullable = false, unique = true)
+    private String orderNo;
 
-    @Column(name = "transaction_key")
+    @Column(name = "transaction_key", nullable = false, unique = true)
     private String transactionKey;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status", nullable = false)
+    private PaymentStatus status;
+
+
+    public Payment(String userId, String orderNo, String transactionKey, PaymentStatus status) {
+        this.userId = userId;
+        this.orderNo = orderNo;
+        this.transactionKey = transactionKey;
+        this.status = status;
+    }
+
+    public static Payment create(PaymentV1Dto.PaymentRequest request) {
+        return new Payment(
+                request.userId(),
+                request.orderNo(),
+                request.transactionKey(),
+                PaymentStatus.PENDING
+        );
+    }
 }

apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentStatus.java

@@ -0,0 +1,8 @@
+package com.loopers.domain.payment;
+
+public enum PaymentStatus {
+    PENDING,
+    COMPLETED,
+    FAILED,
+    CANCELED
+}

apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentJpaRepository.java

@@ -0,0 +1,7 @@
+package com.loopers.infrastructure.payment;
+
+import com.loopers.domain.payment.Payment;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PaymentJpaRepository extends JpaRepository<Payment, Long> {
+}

apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentRepositoryImpl.java

@@ -0,0 +1,17 @@
+package com.loopers.infrastructure.payment;
+
+import com.loopers.application.payment.PaymentRepository;
+import com.loopers.domain.payment.Payment;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class PaymentRepositoryImpl implements PaymentRepository {
+    private final PaymentJpaRepository paymentJpaRepository;
+
+    @Override
+    public Payment save(Payment payment) {
+        return paymentJpaRepository.save(payment);
+    }
+}

apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/client/PgClient.java

@@ -17,6 +17,6 @@ public interface PgClient {
     @PostMapping("/api/v1/payments")
     ApiResponse<PaymentV1Dto.TransactionResponse> requestPayment(
             @RequestHeader("X-USER-ID") String userId,
-            @RequestBody PaymentV1Dto.PaymentRequest request
+            @RequestBody PaymentV1Dto.PgPaymentRequest request
     );
 }