Merge pull request #202 from JA-yeong-eop-JA-moeu-JA/fix/#201-order

🐛 fix: 주문 배송 스케줄링 로직을 OrderScheduleService로 분리

Author: floreo1242

src/main/java/com/jajaja/domain/order/service/OrderCommandServiceImpl.java

@@ -45,7 +45,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.HttpClientErrorException;
@@ -70,6 +69,7 @@ public class OrderCommandServiceImpl implements OrderCommandService {
     private final ProductCommonService productCommonService;
     private final CouponCommonService couponCommonService;
     private final PointCommandService pointCommandService;
+    private final OrderScheduleService orderScheduleService;
 
     private final TossPaymentsConfig tossPaymentsConfig;
     private final RestTemplateConfig restTemplateConfig;
@@ -208,7 +208,7 @@ public OrderApproveResponseDto approveOrder(Long memberId, OrderApproveRequestDt
             pointCommandService.addFirstPurchasePointsIfPossible(member);
 
             // 30초 후 배송 시작 스케줄링
-            scheduleShippingStart(order.getId());
+            orderScheduleService.scheduleShippingStart(order.getId());
 
             return OrderApproveResponseDto.of(order);
 
@@ -471,18 +471,6 @@ private HttpHeaders getHeaders() {
         return headers;
     }
 
-    @Async("orderTaskExecutor")
-    protected void scheduleShippingStart(Long orderId) {
-        try {
-            Thread.sleep(30000); // 30초 대기
-            startShipping(orderId);
-        } catch (InterruptedException e) {
-            log.error("[OrderCommandService] 배송 시작 스케줄링 중단 - 주문ID: {}", orderId, e);
-            Thread.currentThread().interrupt();
-        } catch (Exception e) {
-            log.error("[OrderCommandService] 배송 시작 스케줄링 실패 - 주문ID: {}", orderId, e);
-        }
-    }
 
     @Override
     @Transactional

src/main/java/com/jajaja/domain/order/service/OrderScheduleService.java

@@ -0,0 +1,33 @@
+package com.jajaja.domain.order.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class OrderScheduleService {
+    
+    private final ApplicationContext applicationContext;
+    
+    @Async("orderTaskExecutor")
+    public void scheduleShippingStart(Long orderId) {
+        try {
+            log.info("[OrderScheduleService] 30초 배송 대기 시작 - 주문ID: {}", orderId);
+            Thread.sleep(30000); // 30초 대기
+            log.info("[OrderScheduleService] 30초 대기 완료, 배송 시작 - 주문ID: {}", orderId);
+            
+            // 순환 참조 방지를 위해 ApplicationContext에서 직접 가져옴
+            OrderCommandService orderCommandService = applicationContext.getBean(OrderCommandService.class);
+            orderCommandService.startShipping(orderId);
+        } catch (InterruptedException e) {
+            log.error("[OrderScheduleService] 배송 시작 스케줄링 중단 - 주문ID: {}", orderId, e);
+            Thread.currentThread().interrupt();
+        } catch (Exception e) {
+            log.error("[OrderScheduleService] 배송 시작 스케줄링 실패 - 주문ID: {}", orderId, e);
+        }
+    }
+}

src/main/java/com/jajaja/domain/team/service/TeamCommandService.java

@@ -3,7 +3,7 @@
 import com.jajaja.domain.team.dto.response.TeamCreateResponseDto;
 
 public interface TeamCommandService {
-    TeamCreateResponseDto createTeam(Long memberId, Long productId);
+    TeamCreateResponseDto createTeam(Long memberId, Long orderId);
     void joinTeam(Long memberId, Long teamId);
     void joinTeamInCarts(Long memberId, Long productId);
 }