diff --git a/services/order/src/main/java/com/ticketPing/order/application/service/OrderService.java b/services/order/src/main/java/com/ticketPing/order/application/service/OrderService.java index 4a35a840..c059d2ab 100644 --- a/services/order/src/main/java/com/ticketPing/order/application/service/OrderService.java +++ b/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 getUserOrders(UUID userId, Pageable pageable) { - Slice orders = orderRepository.findUserOrdersExcludingStatus(userId, OrderStatus.FAIL, pageable); + Slice orders = orderRepository.findUserOrdersExcludingStatus( + userId, List.of(OrderStatus.PENDING, OrderStatus.FAIL), pageable); return orders.map(OrderResponse::from); } diff --git a/services/order/src/main/java/com/ticketPing/order/domain/repository/OrderRepository.java b/services/order/src/main/java/com/ticketPing/order/domain/repository/OrderRepository.java index 08520db9..064179cf 100644 --- a/services/order/src/main/java/com/ticketPing/order/domain/repository/OrderRepository.java +++ b/services/order/src/main/java/com/ticketPing/order/domain/repository/OrderRepository.java @@ -16,7 +16,7 @@ public interface OrderRepository { Optional findByIdAndOrderStatus(UUID orderId, OrderStatus orderStatus); - boolean existsByOrderSeatSeatIdAndOrderStatusIn(UUID seatId, List pending); + boolean existsByOrderSeatSeatIdAndOrderStatusIn(UUID seatId, List statuses); - Slice findUserOrdersExcludingStatus(UUID userId, OrderStatus orderStatus, Pageable pageable); + Slice findUserOrdersExcludingStatus(UUID userId, List statuses, Pageable pageable); } diff --git a/services/order/src/main/java/com/ticketPing/order/infrastructure/repository/OrderJpaRepository.java b/services/order/src/main/java/com/ticketPing/order/infrastructure/repository/OrderJpaRepository.java index 88738348..621d16fa 100644 --- a/services/order/src/main/java/com/ticketPing/order/infrastructure/repository/OrderJpaRepository.java +++ b/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 { @Query("SELECT o FROM Order o " + - "JOIN FETCH o.orderSeat " + + "JOIN FETCH o.orderSeat os " + "WHERE o.userId = :userId " + - "AND o.orderStatus != :orderStatus") - Slice findUserOrdersExcludingStatus(UUID userId, OrderStatus orderStatus, Pageable pageable); + "AND o.orderStatus NOT IN :statuses") + Slice findUserOrdersExcludingStatus(UUID userId, List statuses, Pageable pageable); }