결제 탄력성 보완

sylee6529 · sylee6529 · commit 822c30a865f1 · 2025-12-07T19:25:32.000+09:00
diff --git a/apps/commerce-api/build.gradle.kts b/apps/commerce-api/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
 
     // resilience4j (Spring Boot 3.x 호환 버전)
     implementation("io.github.resilience4j:resilience4j-spring-boot3:2.2.0")
+    implementation("io.github.resilience4j:resilience4j-micrometer:2.2.0")
     implementation("org.springframework.boot:spring-boot-starter-aop")
 
     // querydsl
diff --git a/apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentFacade.java
@@ -2,9 +2,12 @@
 
 import com.loopers.domain.order.Order;
 import com.loopers.domain.order.repository.OrderRepository;
+import com.loopers.domain.product.repository.ProductRepository;
+import com.loopers.domain.payment.Payment;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
@@ -17,8 +20,9 @@ public class PaymentFacade {
 
     private final PaymentService paymentService;
     private final OrderRepository orderRepository;
+    private final ProductRepository productRepository;
 
-    @Transactional
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
     public PaymentInfo requestPayment(String userId, PaymentCommand.RequestPayment command) {
         return paymentService.requestPayment(userId, command);
     }
@@ -63,6 +67,31 @@ public PaymentInfo syncPaymentStatus(String userId, String transactionKey) {
         return paymentInfo;
     }
 
+    @Transactional
+    public PaymentInfo cancelPayment(String userId, String orderNo, String reason) {
+        Payment payment = paymentService.findByOrderNo(orderNo);
+
+        if (payment.getStatus() == com.loopers.domain.payment.PaymentStatus.SUCCESS) {
+            throw new com.loopers.support.error.CoreException(
+                    com.loopers.support.error.ErrorType.BAD_REQUEST,
+                    "이미 성공한 결제는 취소할 수 없습니다.");
+        }
+
+        paymentService.cancelPayment(payment.getId(), reason);
+
+        Order order = payment.getOrder();
+        if (!order.isPaid()) {
+            order.cancel();
+            orderRepository.save(order);
+
+            order.getItems().forEach(item ->
+                    productRepository.increaseStock(item.getProductId(), item.getQuantity()));
+        }
+
+        log.info("[PaymentFacade] 결제 취소 완료 - orderNo: {}, reason: {}", orderNo, reason);
+        return PaymentInfo.from(paymentService.findById(payment.getId()));
+    }
+
     @Transactional(readOnly = true)
     public PaymentInfo getPaymentByOrderNo(String orderNo) {
         return paymentService.getPaymentByOrderNo(orderNo);
diff --git a/apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentService.java b/apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentService.java
@@ -11,6 +11,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -26,7 +28,8 @@ public class PaymentService {
     private final OrderRepository orderRepository;
     private final PgGateway pgGateway;
 
-    public PaymentInfo requestPayment(String userId, PaymentCommand.RequestPayment command) {
+    @Transactional
+    public Payment createPayment(String userId, PaymentCommand.RequestPayment command) {
         log.info("[Payment] 결제 요청 시작 - orderNo: {}, amount: {}", command.orderId(), command.amount());
 
         Order order = orderRepository.findByOrderNo(command.orderId())
@@ -60,35 +63,33 @@ public PaymentInfo requestPayment(String userId, PaymentCommand.RequestPayment c
             throw new CoreException(ErrorType.CONFLICT, "이미 처리 중인 결제입니다: " + order.getOrderNo());
         }
         log.info("[Payment] Payment 엔티티 생성 - id: {}, orderNo: {}", payment.getId(), order.getOrderNo());
+        return payment;
+    }
 
-        try {
-            PgGateway.PgPaymentCommand pgCommand = new PgGateway.PgPaymentCommand(
-                    order.getOrderNo(),
-                    command.cardType(),
-                    command.cardNo(),
-                    command.amount(),
-                    command.callbackUrl()
-            );
-
-            CompletableFuture<PgGateway.PgPaymentResult> future = pgGateway.requestPayment(userId, pgCommand);
-            PgGateway.PgPaymentResult pgResult = future.get(3, TimeUnit.SECONDS);
+    public PaymentInfo requestPayment(String userId, PaymentCommand.RequestPayment command) {
+        Payment payment = createPayment(userId, command);
 
-            if (pgResult.transactionKey() != null) {
-                payment.assignTransactionKey(pgResult.transactionKey());
-                log.info("[Payment] PG 결제 요청 성공 - transactionKey: {}", pgResult.transactionKey());
-            } else {
-                payment.markAsRequiresRetry();
-                log.warn("[Payment] PG 장애로 재시도 필요 - orderNo: {}", order.getOrderNo());
-            }
+        PgGateway.PgPaymentCommand pgCommand = new PgGateway.PgPaymentCommand(
+                command.orderId(),
+                command.cardType(),
+                command.cardNo(),
+                command.amount(),
+                command.callbackUrl()
+        );
 
+        try {
+            CompletableFuture<PgGateway.PgPaymentResult> future = pgGateway.requestPayment(userId, pgCommand);
+            PgGateway.PgPaymentResult pgResult = future.get(2, TimeUnit.SECONDS);
+            applyPgResult(payment.getId(), pgResult);
         } catch (Exception e) {
-            log.error("[Payment] PG 결제 요청 실패 - orderNo: {}", order.getOrderNo(), e);
-            payment.markAsRequiresRetry();
+            log.error("[Payment] PG 결제 요청 실패 - orderNo: {}", command.orderId(), e);
+            markRequiresRetry(payment.getId());
         }
 
-        return PaymentInfo.from(payment);
+        return PaymentInfo.from(findById(payment.getId()));
     }
 
+    @Transactional
     public PaymentInfo processCallback(String userId, PaymentCommand.ProcessCallback command) {
         log.info("[Payment] 콜백 처리 시작 - transactionKey: {}, status: {}",
                 command.transactionKey(), command.status());
@@ -116,16 +117,14 @@ public PaymentInfo syncPaymentStatus(String userId, String transactionKey) {
         try {
             PgGateway.PgPaymentDetail pgDetail = pgGateway.getPaymentStatus(userId, transactionKey);
             PaymentStatus pgStatus = PaymentStatus.valueOf(pgDetail.status().name());
-            payment.updateFromPg(pgStatus, pgDetail.reason());
-
+            applyPgDetail(payment.getId(), pgStatus, pgDetail.reason());
             log.info("[Payment] 상태 동기화 완료 - orderNo: {}, status: {}",
-                    payment.getOrder().getOrderNo(), payment.getStatus());
-
+                    payment.getOrder().getOrderNo(), pgStatus);
         } catch (Exception e) {
             log.error("[Payment] 상태 조회 실패 - transactionKey: {}", transactionKey, e);
         }
 
-        return PaymentInfo.from(payment);
+        return PaymentInfo.from(findById(payment.getId()));
     }
 
     public PaymentInfo getPaymentByOrderNo(String orderNo) {
@@ -151,4 +150,60 @@ public List<PaymentInfo> getPaymentsRequiringRetry() {
                 .map(PaymentInfo::from)
                 .toList();
     }
+
+    @Transactional(readOnly = true)
+    public Payment findByOrderNo(String orderNo) {
+        Order order = orderRepository.findByOrderNo(orderNo)
+                .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND,
+                        "주문을 찾을 수 없습니다: " + orderNo));
+        return paymentRepository.findByOrder(order)
+                .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND,
+                        "결제 정보를 찾을 수 없습니다: " + orderNo));
+    }
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public Payment applyPgResult(Long paymentId, PgGateway.PgPaymentResult pgResult) {
+        Payment payment = findById(paymentId);
+
+        if (pgResult.transactionKey() != null) {
+            if (!payment.hasTransactionKey()) {
+                payment.assignTransactionKey(pgResult.transactionKey());
+                log.info("[Payment] PG 결제 요청 성공 - transactionKey: {}", pgResult.transactionKey());
+            } else {
+                log.info("[Payment] PG 결제 요청 성공(기존 key 유지) - transactionKey: {}", payment.getTransactionKey());
+            }
+        } else {
+            payment.markAsRequiresRetry();
+            log.warn("[Payment] PG 장애로 재시도 필요 - orderNo: {}", payment.getOrder().getOrderNo());
+        }
+        return payment;
+    }
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public Payment applyPgDetail(Long paymentId, PaymentStatus pgStatus, String reason) {
+        Payment payment = findById(paymentId);
+        payment.updateFromPg(pgStatus, reason);
+        return payment;
+    }
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public Payment markRequiresRetry(Long paymentId) {
+        Payment payment = findById(paymentId);
+        payment.markAsRequiresRetry();
+        return payment;
+    }
+
+    @Transactional(readOnly = true)
+    public Payment findById(Long paymentId) {
+        return paymentRepository.findById(paymentId)
+                .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND,
+                        "결제 정보를 찾을 수 없습니다: id=" + paymentId));
+    }
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public Payment cancelPayment(Long paymentId, String reason) {
+        Payment payment = findById(paymentId);
+        payment.markAsCancelled(reason);
+        return payment;
+    }
 }
diff --git a/apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentStatusSyncScheduler.java b/apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentStatusSyncScheduler.java
@@ -36,7 +36,15 @@ public void syncPendingPayments() {
             for (PaymentInfo paymentInfo : pendingPayments) {
                 try {
                     if (paymentInfo.transactionKey() == null || paymentInfo.transactionKey().isEmpty()) {
-                        log.warn("[PaymentSync] transactionKey 없음, 스킵 - orderNo: {}", paymentInfo.orderNo());
+                        if (paymentInfo.requiresRetry()) {
+                            log.warn("[PaymentSync] transactionKey 없음 + 재시도 필요, 취소 처리 - orderNo: {}", paymentInfo.orderNo());
+                            paymentFacade.cancelPayment(
+                                    "SCHEDULER",
+                                    paymentInfo.orderNo(),
+                                    "PG 요청 실패로 자동 취소");
+                        } else {
+                            log.warn("[PaymentSync] transactionKey 없음, 스킵 - orderNo: {}", paymentInfo.orderNo());
+                        }
                         continue;
                     }
 
@@ -80,8 +88,19 @@ public void processRetryPayments() {
             log.info("[PaymentRetry] 재시도 필요 결제 {}건 발견", retryPayments.size());
 
             for (PaymentInfo paymentInfo : retryPayments) {
-                log.warn("[PaymentRetry] 수동 처리 필요 - orderNo: {}, 관리자 확인 필요", paymentInfo.orderNo());
-                // TODO: 관리자 알림, 수동 재시도 API 제공 등
+                try {
+                    if (paymentInfo.createdAt().isBefore(java.time.ZonedDateTime.now().minusMinutes(15))) {
+                        log.warn("[PaymentRetry] 재시도 한도 초과, 자동 취소 - orderNo: {}", paymentInfo.orderNo());
+                        paymentFacade.cancelPayment(
+                                "SCHEDULER",
+                                paymentInfo.orderNo(),
+                                "PG 재요청 실패 - 타임아웃 초과");
+                    } else {
+                        log.warn("[PaymentRetry] 수동 처리 필요 - orderNo: {}, 관리자 확인 필요", paymentInfo.orderNo());
+                    }
+                } catch (Exception e) {
+                    log.error("[PaymentRetry] 재시도 결제 처리 오류 - orderNo: {}", paymentInfo.orderNo(), e);
+                }
             }
 
         } catch (Exception e) {
diff --git a/apps/commerce-api/src/main/java/com/loopers/config/RestTemplateConfig.java b/apps/commerce-api/src/main/java/com/loopers/config/RestTemplateConfig.java
@@ -15,8 +15,8 @@ public class RestTemplateConfig {
     public RestTemplate pgRestTemplate(RestTemplateBuilder builder) {
         // PG 전용 RestTemplate - 더 짧은 타임아웃 설정
         return builder
-                .setConnectTimeout(Duration.ofSeconds(2))  // PG 연결 타임아웃: 2초
-                .setReadTimeout(Duration.ofSeconds(3))     // PG 읽기 타임아웃: 3초 (Resilience4j TimeLimiter가 2초로 제한)
+                .setConnectTimeout(Duration.ofSeconds(1))   // PG 연결 타임아웃: 1초
+                .setReadTimeout(Duration.ofMillis(1800))    // PG 읽기 타임아웃: TimeLimiter(2s)보다 짧게
                 .requestFactory(SimpleClientHttpRequestFactory.class)
                 .build();
     }
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java
@@ -101,12 +101,23 @@ public void markAsRequiresRetry() {
         this.lastCheckedAt = LocalDateTime.now();
     }
 
+    public void markAsCancelled(String reason) {
+        if (this.status == PaymentStatus.SUCCESS) {
+            throw new IllegalStateException("이미 성공한 결제는 취소할 수 없습니다.");
+        }
+        this.status = PaymentStatus.CANCELLED;
+        this.reason = reason;
+        this.requiresRetry = false;
+        this.lastCheckedAt = LocalDateTime.now();
+    }
+
     public void updateFromPg(PaymentStatus pgStatus, String reason) {
         this.lastCheckedAt = LocalDateTime.now();
 
         switch (pgStatus) {
             case SUCCESS -> markAsSuccess();
             case FAILED -> markAsFailed(reason);
+            case CANCELLED -> markAsCancelled(reason);
             case PENDING -> this.status = PaymentStatus.PENDING;
         }
     }
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentStatus.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentStatus.java
@@ -14,5 +14,10 @@ public enum PaymentStatus {
     /**
      * 결제 실패 (한도초과, 잘못된 카드 등)
      */
-    FAILED
+    FAILED,
+
+    /**
+     * 결제 취소 (사용자/시스템에 의해 중단)
+     */
+    CANCELLED
 }
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/product/repository/ProductRepository.java b/apps/commerce-api/src/main/java/com/loopers/domain/product/repository/ProductRepository.java
@@ -22,6 +22,8 @@ public interface ProductRepository {
 
     int decreaseStock(Long productId, int quantity);
 
+    int increaseStock(Long productId, int quantity);
+
     int incrementLikeCount(Long productId);
 
     int decrementLikeCount(Long productId);
diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/product/ProductRepositoryImpl.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/product/ProductRepositoryImpl.java
@@ -124,6 +124,15 @@ public int decreaseStock(Long productId, int quantity) {
                 .execute());
     }
 
+    @Override
+    public int increaseStock(Long productId, int quantity) {
+        return Math.toIntExact(queryFactory
+                .update(product)
+                .set(product.stock.quantity, product.stock.quantity.add(quantity))
+                .where(product.id.eq(productId))
+                .execute());
+    }
+
     @Override
     public int incrementLikeCount(Long productId) {
         return Math.toIntExact(queryFactory
@@ -249,4 +258,4 @@ private String[] decodeCursor(String cursor) {
             return null;
         }
     }
-}
+}
diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/payment/PaymentController.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/payment/PaymentController.java
@@ -61,6 +61,19 @@ public ResponseEntity<PaymentResponse> syncPaymentStatus(
         return ResponseEntity.ok(PaymentResponse.from(paymentInfo));
     }
 
+    @PostMapping("/orders/{orderNo}/cancel")
+    public ResponseEntity<PaymentResponse> cancelPayment(
+            @RequestHeader("X-USER-ID") String userId,
+            @PathVariable String orderNo,
+            @RequestBody CancelRequest request
+    ) {
+        log.info("[Payment API] 결제 취소 - userId: {}, orderNo: {}", userId, orderNo);
+
+        PaymentInfo paymentInfo = paymentFacade.cancelPayment(userId, orderNo, request.reason());
+
+        return ResponseEntity.ok(PaymentResponse.from(paymentInfo));
+    }
+
     public record PaymentRequest(
             String orderId,
             CardType cardType,
@@ -69,6 +82,10 @@ public record PaymentRequest(
             String callbackUrl
     ) {}
 
+    public record CancelRequest(
+            String reason
+    ) {}
+
     public record PaymentResponse(
             Long id,
             String orderNo,
diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/payment/PaymentTestController.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/payment/PaymentTestController.java
diff --git a/apps/commerce-api/src/main/resources/resilience4j.yml b/apps/commerce-api/src/main/resources/resilience4j.yml
diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/product/InMemoryProductRepository.java b/apps/commerce-api/src/test/java/com/loopers/domain/product/InMemoryProductRepository.java
diff --git a/apps/pg-simulator/src/main/resources/application.yml b/apps/pg-simulator/src/main/resources/application.yml
diff --git a/supports/monitoring/src/main/resources/monitoring.yml b/supports/monitoring/src/main/resources/monitoring.yml
