feature: 주문 및 결제 도메인 리팩토링, 자동 결제 복구 스케줄러 추가

- 카드 정보 제거 및 포인트 차감 방식으로 주문 결제 변경(주문로직과 결제 로직 분리를 위해)
- Payment 관련 도메인 책임 분리 (Facade, DTO, Command 추가)
- 스케줄러 추가로 정체된 결제 자동 복구 처리
- PG 관련 엔드포인트 및 DTO 확장
- 테스트 및 기타 불필요 로직 제거/수정

Author: yeonjiyeon

apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java

@@ -6,7 +6,9 @@
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import java.util.TimeZone;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @EnableFeignClients
 @ConfigurationPropertiesScan
 @SpringBootApplication

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

@@ -5,8 +5,7 @@
 import com.loopers.domain.order.OrderCommand.PlaceOrder;
 import com.loopers.domain.order.OrderItem;
 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.domain.product.Product;
 import com.loopers.domain.product.ProductService;
 import com.loopers.domain.user.User;
@@ -28,7 +27,7 @@ public class OrderFacade {
   private final ProductService productService;
   private final UserService userService;
   private final OrderService orderService;
-  private final PaymentService paymentService;
+  private final PointService pointService;
 
   @Transactional
   public OrderInfo placeOrder(PlaceOrder command) {
@@ -44,16 +43,12 @@ public OrderInfo placeOrder(PlaceOrder command) {
 
     List<OrderItem> orderItems = buildOrderItems(products, command.items());
     Order order = orderService.createOrder(user.getId(), orderItems);
+    long totalAmount = order.getTotalAmount().getValue();
 
     productService.deductStock(products, orderItems);
+    pointService.deductPoint(user, totalAmount);
 
-    Payment payment = paymentService.processPayment(
-        user,
-        order,
-        command.cardType(),
-        command.cardNo()
-    );
-    return OrderInfo.from(order, payment);
+    return OrderInfo.from(order);
   }
 
   private List<OrderItem> buildOrderItems(List<Product> products, List<Item> items) {

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

@@ -10,19 +10,15 @@ public record OrderInfo(
     Long orderId,
     Long userId,
     List<OrderItemInfo> items,
-    long totalAmount,
-    String transactionId,
-    String paymentStatus
+    long totalAmount
 ) {
 
-  public static OrderInfo from(Order order, Payment payment) {
+  public static OrderInfo from(Order order) {
     return new OrderInfo(
         order.getId(),
         order.getUserId(),
         order.getOrderItems().stream().map(OrderItemInfo::from).toList(),
-        order.getTotalAmount().getValue(),
-        payment.getTransactionId(),
-        payment.getStatus().name()
+        order.getTotalAmount().getValue()
     );
   }
 

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

@@ -0,0 +1,51 @@
+package com.loopers.application.payment;
+
+import com.loopers.domain.money.Money;
+import com.loopers.domain.payment.Payment;
+import com.loopers.domain.payment.PaymentCommand;
+import com.loopers.domain.payment.PaymentExecutor;
+import com.loopers.domain.payment.PaymentService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class PaymentFacade {
+
+  private final PaymentService paymentService;
+  private final PaymentExecutor paymentExecutor;
+
+  public Payment processPaymentRequest(PaymentCommand.CreatePayment command) {
+
+    return paymentService.findValidPayment(command.orderId())
+        .orElseGet(() -> {
+          Payment newPayment = paymentService.createPendingPayment(command.userId(),
+              command.orderId(),
+              new Money(command.amount()),
+              command.cardType(),
+              command.cardNo());
+
+          try {
+            String pgTxnId = paymentExecutor.execute(newPayment);
+
+            paymentService.registerPgToken(newPayment, pgTxnId);
+
+            return newPayment;
+          } catch (Exception e) {
+            paymentService.failPayment(newPayment);
+            throw e;
+          }
+        });
+  }
+
+
+  public void handlePaymentCallback(String pgTxnId, boolean isSuccess) {
+    Payment payment = paymentService.getPaymentByPgTxnId(pgTxnId);
+
+    if (isSuccess) {
+      paymentService.completePayment(payment);
+    } else {
+      paymentService.failPayment(payment);
+    }
+  }
+}

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

@@ -0,0 +1,27 @@
+package com.loopers.application.payment;
+
+import com.loopers.domain.payment.CardType;
+import com.loopers.domain.payment.Payment;
+import com.loopers.domain.payment.PaymentStatus;
+
+public record PaymentInfo(
+    String paymentId,
+    Long orderId,
+    CardType cardType,
+    String cardNo,
+    Long amount,
+    PaymentStatus status,
+    String transactionId) {
+
+  public static PaymentInfo from(Payment payment) {
+    return new PaymentInfo(
+        payment.getId().toString(),
+        payment.getOrderId(),
+        payment.getCardType(),
+        payment.getCardNo(),
+        payment.getAmount().getValue(),
+        payment.getStatus(),
+        payment.getTransactionId()
+    );
+  }
+}

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

@@ -0,0 +1,52 @@
+package com.loopers.application.payment;
+
+import com.loopers.domain.payment.Payment;
+import com.loopers.domain.payment.PaymentRepository;
+import com.loopers.domain.payment.PaymentStatus;
+import com.loopers.infrastructure.pg.PgClient;
+import com.loopers.infrastructure.pg.PgV1Dto.PgDetail;
+import com.loopers.infrastructure.pg.PgV1Dto.PgOrderResponse;
+import jakarta.transaction.Transactional;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class PaymentRecoveryScheduler {
+
+  private final PaymentRepository paymentRepository;
+  private final PgClient pgClient;
+
+  @Scheduled(fixedDelay = 60000)
+  @Transactional
+  public void recover() {
+    LocalDateTime timeLimit = LocalDateTime.now().minusMinutes(5);
+    List<Payment> stuckPayments = paymentRepository.findAllByStatusAndCreatedAtBefore(
+        PaymentStatus.READY, timeLimit
+    );
+
+    for (Payment payment : stuckPayments) {
+      try {
+        PgOrderResponse response = pgClient.getTransactionsByOrder(
+            payment.getUserId(), String.valueOf(payment.getOrderId())
+        );
+
+        if (response.transactions() != null && !response.transactions().isEmpty()) {
+          PgDetail detail = response.transactions().get(0);
+
+          if ("SUCCESS".equals(detail.status())) {
+            payment.completePayment();
+          } else if ("FAIL".equals(detail.status())) {
+            payment.failPayment();
+          }
+        } else {
+          payment.failPayment();
+        }
+      } catch (Exception e) {
+      }
+    }
+  }
+}

apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCommand.java

@@ -6,9 +6,7 @@ public class OrderCommand {
 
   public record PlaceOrder(
       Long userId,
-      List<Item> items,
-      String cardType,
-      String cardNo
+      List<Item> items
   ) {
 
   }

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

@@ -78,16 +78,25 @@ private void validateConstructor(Long orderId, Long userId, Money amount, String
     }
   }
 
-  public void completePayment(String pgTxnId) {
+  public void completePayment() {
     if (this.status == PaymentStatus.PAID || this.status == PaymentStatus.CANCELLED) {
       return;
     }
-    this.pgTxnId = pgTxnId;
     this.status = PaymentStatus.PAID;
   }
 
   public void failPayment() {
+    if (this.status == PaymentStatus.PAID) {
+      throw new CoreException(ErrorType.BAD_REQUEST, "이미 성공한 결제는 실패 처리할 수 없습니다.");
+    }
     this.status = PaymentStatus.FAILED;
   }
 
+  public boolean isProcessingOrCompleted() {
+    return this.status == PaymentStatus.PAID || this.status == PaymentStatus.READY;
+  }
+
+  public void setPgTxnId(String pgTxnId) {
+    this.pgTxnId = pgTxnId;
+  }
 }

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

@@ -0,0 +1,25 @@
+package com.loopers.domain.payment;
+
+import com.loopers.interfaces.api.payment.PaymentV1Dto.PaymentRequest;
+
+public class PaymentCommand {
+
+  public record CreatePayment(
+      Long userId,
+      Long orderId,
+      Long amount,
+      CardType cardType,
+      String cardNo
+  ) {
+
+    public static CreatePayment from(Long userId, PaymentRequest request) {
+      return new CreatePayment(
+          userId,
+          request.orderId(),
+          request.amount(),
+          request.cardType(),
+          request.cardNo()
+      );
+    }
+  }
+}

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

@@ -1,6 +1,16 @@
 package com.loopers.domain.payment;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
 public interface PaymentRepository {
 
   Payment save(Payment payment);
+
+  Optional<Payment> findByOrderId(Long id);
+
+  List<Payment> findAllByStatusAndCreatedAtBefore(PaymentStatus paymentStatus, LocalDateTime timeLimit);
+
+  Optional<Payment> findByPgTxnId(String pgTxnId);
 }