feat(#306):환불최종실패에 대한 로직 추가"

Author: yeojun

spot-order/src/main/java/com/example/Spot/order/application/service/OrderServiceImpl.java

@@ -30,6 +30,7 @@
 import com.example.Spot.order.domain.enums.CancelledBy;
 import com.example.Spot.order.domain.enums.OrderStatus;
 import com.example.Spot.order.domain.exception.DuplicateOrderException;
+import com.example.Spot.order.domain.exception.InvalidOrderStatusTransitionException;
 import com.example.Spot.order.domain.repository.OrderItemOptionRepository;
 import com.example.Spot.order.domain.repository.OrderRepository;
 import com.example.Spot.order.infrastructure.aop.OrderStatusChange;
@@ -300,6 +301,10 @@ public OrderResponseDto acceptOrder(UUID orderId, Integer estimatedTime) {
     public OrderResponseDto rejectOrder(UUID orderId, String reason) {
 
         OrderEntity order = OrderValidationContext.getCurrentOrder();
+        if (order.getOrderStatus() != OrderStatus.PENDING) {
+            throw new InvalidOrderStatusTransitionException(order.getOrderStatus(), OrderStatus.CANCEL_PENDING);
+        }
+        
         order.initiateCancel(reason, null);
         orderEventProducer.reserveOrderCancelled(order.getId(), reason);
         sendSignalToWorkflow(orderId, OrderStatus.CANCEL_PENDING);

spot-order/src/main/java/com/example/Spot/order/domain/entity/OrderEntity.java

@@ -226,6 +226,14 @@ public void finalizeCancel() {
         }
     }
 
+    public void markAsRefundError() {
+        if (this.orderStatus != OrderStatus.CANCEL_PENDING) {
+            throw new IllegalStateException("환불 대기 상태가 아닌 주문은 에러 처리를 할 수 없습니다.");
+        }
+        
+        this.orderStatus = OrderStatus.REFUND_ERROR;
+    }
+    
     // 상태 전환 검증
     private void validateStatusTransition(OrderStatus newStatus) {
         if (!this.orderStatus.canTransitionTo(newStatus)) {

spot-order/src/main/java/com/example/Spot/order/domain/enums/OrderStatus.java

@@ -10,7 +10,8 @@ public enum OrderStatus {
     READY("픽업 대기"),
     COMPLETED("픽업 완료"),
     CANCEL_PENDING("취소 처리 중"),
-    CANCELLED("주문 취소");
+    CANCELLED("주문 취소"),
+    REFUND_ERROR("환불 확인 필요");
 
     private final String description;
 
@@ -23,7 +24,7 @@ public String getDescription() {
     }
 
     public boolean isFinalStatus() {
-        return this == COMPLETED || this == CANCELLED || this == REJECTED || this == PAYMENT_FAILED;
+        return this == COMPLETED || this == CANCELLED || this == REJECTED || this == PAYMENT_FAILED || this == REFUND_ERROR;
     }
 
     public boolean isPaid() {
@@ -39,7 +40,7 @@ public boolean canTransitionTo(OrderStatus newStatus) {
             case PENDING -> newStatus == ACCEPTED || newStatus == CANCEL_PENDING;
             case ACCEPTED -> newStatus == COOKING || newStatus == CANCEL_PENDING;
             case COOKING -> newStatus == READY || newStatus == CANCEL_PENDING;
-            case CANCEL_PENDING ->  newStatus == CANCELLED || newStatus ==  REJECTED;
+            case CANCEL_PENDING ->  newStatus == CANCELLED || newStatus ==  REJECTED || newStatus == REFUND_ERROR;
             case READY -> newStatus == COMPLETED;
             default -> false;
         };

spot-order/src/main/java/com/example/Spot/order/infrastructure/temporal/activity/OrderActivity.java

@@ -21,4 +21,7 @@ public interface OrderActivity {
 
     @ActivityMethod
     void finalizeOrder(UUID orderId);
+    
+    @ActivityMethod
+    void handleRefundTimeout(UUID orderId);
 }

spot-order/src/main/java/com/example/Spot/order/infrastructure/temporal/activity/OrderActivityImpl.java

@@ -6,14 +6,17 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.example.Spot.order.domain.entity.OrderEntity;
+import com.example.Spot.order.domain.enums.CancelledBy;
 import com.example.Spot.order.domain.enums.OrderStatus;
 import com.example.Spot.order.domain.repository.OrderRepository;
 import com.example.Spot.order.infrastructure.producer.OrderEventProducer;
 import com.example.Spot.order.infrastructure.temporal.config.OrderConstants;
 
 import io.temporal.spring.boot.ActivityImpl;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 @ActivityImpl(taskQueues = OrderConstants.ORDER_TASK_QUEUE)
@@ -46,7 +49,7 @@ public void cancelOrder(UUID orderId, String reason) {
 
         if (order.getOrderStatus() != OrderStatus.CANCELLED &&
         order.getOrderStatus() != OrderStatus.REJECTED) {
-            order.initiateCancel(reason, null);
+            order.initiateCancel(reason, CancelledBy.SYSTEM);
             orderEventProducer.reserveOrderCancelled(order.getId(), reason);
         }
     }
@@ -60,4 +63,16 @@ public void finalizeOrder(UUID orderId) {
         order.finalizeCancel();
     }
 
+    @Override
+    @Transactional
+    public void handleRefundTimeout(UUID orderId) {
+        OrderEntity order = orderRepository.findByIdWithLock(orderId)
+                .orElseThrow(() -> new IllegalArgumentException("주문 없음: " + orderId));
+        
+        order.markAsRefundError();
+        log.error("[환불 타임아웃 발생] 관찰 필요 - OrderID: {}, 현재상태: {}",
+                orderId, order.getOrderStatus());
+        orderRepository.save(order);
+    }
+    
 }

spot-order/src/main/java/com/example/Spot/order/infrastructure/temporal/workflow/OrderWorkflowImpl.java

@@ -72,8 +72,12 @@ private boolean handleCancelIfNecessary(UUID orderId, OrderActivity activities)
     }
 
     private void waitForRefundAndFinalize(UUID orderId, OrderActivity activities) {
-        Workflow.await(() -> isRefundCompleted);
-        activities.finalizeOrder(orderId);
+        boolean isSuccess = Workflow.await(Duration.ofMinutes(30), () -> isRefundCompleted);
+        if (isSuccess) {
+            activities.finalizeOrder(orderId);
+        } else {
+            activities.handleRefundTimeout(orderId);
+        }
     }
 
     @Override

spot-payment/src/main/java/com/example/Spot/payments/infrastructure/temporal/workflow/PaymentCancelWorkflowImpl.java

@@ -29,7 +29,9 @@ public class PaymentCancelWorkflowImpl implements PaymentCancelWorkflow {
                     .setStartToCloseTimeout(Duration.ofMinutes(1))
                     .setRetryOptions(RetryOptions.newBuilder()
                             .setInitialInterval(Duration.ofSeconds(5))
-                            .setMaximumAttempts(8)
+                            .setBackoffCoefficient(2.0)
+                            .setMaximumInterval(Duration.ofMinutes(3)) 
+                            .setMaximumAttempts(15)
                             .setDoNotRetry(DO_NOT_RETRY_EXCEPTIONS)
                             .build())
                     .build());