Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mii2026 merged 1 commit into from
Jan 1, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion services/order/src/main/java/com/ticketPing/order/application/service/OrderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions services/order/src/main/java/com/ticketPing/order/domain/repository/OrderRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
7 changes: 4 additions & 3 deletions ...rder/src/main/java/com/ticketPing/order/infrastructure/repository/OrderJpaRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Loading