Merge pull request #107 from TicketPing/feature/order

[refactor #106] 자신의 주문 목록 확인에서 결제 대기 상태 제외

Author: mii2026

services/order/src/main/java/com/ticketPing/order/application/service/OrderService.java

@@ -44,7 +44,8 @@ public OrderResponse createOrder(UUID scheduleId, UUID seatId, UUID userId) {
     }
 
     public Slice<OrderResponse> getUserOrders(UUID userId, Pageable pageable) {
-        Slice<Order> orders = orderRepository.findUserOrdersExcludingStatus(userId, OrderStatus.FAIL, pageable);
+        Slice<Order> orders = orderRepository.findUserOrdersExcludingStatus(
+                userId, List.of(OrderStatus.PENDING, OrderStatus.FAIL), pageable);
         return orders.map(OrderResponse::from);
     }
 

services/order/src/main/java/com/ticketPing/order/domain/repository/OrderRepository.java

@@ -16,7 +16,7 @@ public interface OrderRepository {
 
     Optional<Order> findByIdAndOrderStatus(UUID orderId, OrderStatus orderStatus);
 
-    boolean existsByOrderSeatSeatIdAndOrderStatusIn(UUID seatId, List<OrderStatus> pending);
+    boolean existsByOrderSeatSeatIdAndOrderStatusIn(UUID seatId, List<OrderStatus> statuses);
 
-    Slice<Order> findUserOrdersExcludingStatus(UUID userId, OrderStatus orderStatus, Pageable pageable);
+    Slice<Order> findUserOrdersExcludingStatus(UUID userId, List<OrderStatus> statuses, Pageable pageable);
 }

services/order/src/main/java/com/ticketPing/order/infrastructure/repository/OrderJpaRepository.java

@@ -8,12 +8,13 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
 import java.util.UUID;
 
 public interface OrderJpaRepository extends OrderRepository, JpaRepository<Order, UUID> {
     @Query("SELECT o FROM Order o " +
-            "JOIN FETCH o.orderSeat " +
+            "JOIN FETCH o.orderSeat os " +
             "WHERE o.userId = :userId " +
-            "AND o.orderStatus != :orderStatus")
-    Slice<Order> findUserOrdersExcludingStatus(UUID userId, OrderStatus orderStatus, Pageable pageable);
+            "AND o.orderStatus NOT IN :statuses")
+    Slice<Order> findUserOrdersExcludingStatus(UUID userId, List<OrderStatus> statuses, Pageable pageable);
 }