feat(be): 진행중/완료 상태인 주문 조회 API 추가 (#282)

Author: flffkd12

backend/src/main/java/com/deliveranything/domain/order/controller/CustomerOrderController.java

@@ -14,6 +14,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -69,6 +70,29 @@ public ResponseEntity<ApiResponse<OrderResponse>> get(
         customerOrderService.getCustomerOrder(orderId, securityUser.getId())));
   }
 
+  @GetMapping("/in-progress")
+  @Operation(summary = "진행중인 주문 조회", description = "소비자가 진행중인 주문 내역을 요청한 경우")
+  @PreAuthorize("@profileSecurity.isCustomer(#securityUser)")
+  public ResponseEntity<ApiResponse<List<OrderResponse>>> getInProgressOrders(
+      @AuthenticationPrincipal SecurityUser securityUser
+  ) {
+    return ResponseEntity.ok().body(ApiResponse.success("진행중인 소비자 주문 조회 성공",
+        customerOrderService.getProgressingOrders(securityUser.getId())));
+  }
+
+  @GetMapping("/completed")
+  @Operation(summary = "배달 완료된 주문 조회", description = "소비자가 배달 완료된 주문 내역을 요청한 경우")
+  @PreAuthorize("@profileSecurity.isCustomer(#securityUser)")
+  public ResponseEntity<ApiResponse<CursorPageResponse<OrderResponse>>> getCompletedOrders(
+      @AuthenticationPrincipal SecurityUser securityUser,
+      @RequestParam(required = false) String nextPageToken,
+      @RequestParam(defaultValue = "10") int size
+  ) {
+    return ResponseEntity.ok().body(ApiResponse.success("배달 완료된 소비자 주문 조회 성공",
+        customerOrderService.getCompletedOrdersByCursor(securityUser.getId(), nextPageToken,
+            size)));
+  }
+
   @PostMapping("/{merchantUid}/pay")
   @Operation(summary = "주문 결제", description = "소비자가 생성한 주문의 결제 시도")
   @PreAuthorize("@profileSecurity.isCustomer(#securityUser)")

backend/src/main/java/com/deliveranything/domain/order/repository/OrderRepository.java

@@ -37,4 +37,14 @@ public interface OrderRepository extends JpaRepository<Order, Long> {
       ORDER BY o.createdAt ASC
       """)
   List<Order> findOrdersWithStoreByStoreIdAndStatuses(Long storeId, List<OrderStatus> statuses);
+
+  @Query("""
+      SELECT o
+      FROM Order o
+      JOIN FETCH o.store s
+      WHERE s.id = :customerId AND o.status IN :statuses
+      ORDER BY o.createdAt DESC
+      """)
+  List<Order> findOrdersWithStoreByCustomerIdAndStatuses(Long customerId,
+      List<OrderStatus> statuses);
 }

backend/src/main/java/com/deliveranything/domain/order/repository/OrderRepositoryCustom.java

@@ -49,6 +49,23 @@ public List<Order> findOrdersWithStoreByStoreId(Long storeId, List<OrderStatus>
         .fetch();
   }
 
+  public List<Order> findOrdersWithStoreByCustomerId(Long customerId, List<OrderStatus> statuses,
+      LocalDateTime lastCreatedAt, Long lastOrderId, int size) {
+    QOrder order = QOrder.order;
+    QStore store = QStore.store;
+
+    return queryFactory.selectFrom(order)
+        .join(order.store, store).fetchJoin()
+        .where(
+            order.customer.id.eq(customerId),
+            statusIn(statuses),
+            storeCursorCondition(lastCreatedAt, lastOrderId)
+        )
+        .orderBy(order.createdAt.desc(), order.id.desc())
+        .limit(size)
+        .fetch();
+  }
+
   private BooleanExpression statusIn(List<OrderStatus> statuses) {
     return statuses != null && !statuses.isEmpty() ? QOrder.order.status.in(statuses) : null;
   }

backend/src/main/java/com/deliveranything/domain/order/service/CustomerOrderService.java

@@ -5,6 +5,7 @@
 import com.deliveranything.domain.order.dto.OrderResponse;
 import com.deliveranything.domain.order.entity.Order;
 import com.deliveranything.domain.order.entity.OrderItem;
+import com.deliveranything.domain.order.enums.OrderStatus;
 import com.deliveranything.domain.order.event.OrderCreatedEvent;
 import com.deliveranything.domain.order.repository.OrderRepository;
 import com.deliveranything.domain.order.repository.OrderRepositoryCustom;
@@ -14,7 +15,9 @@
 import com.deliveranything.global.common.CursorPageResponse;
 import com.deliveranything.global.exception.CustomException;
 import com.deliveranything.global.exception.ErrorCode;
+import com.deliveranything.global.util.CursorUtil;
 import com.deliveranything.global.util.PointUtil;
+import java.time.LocalDateTime;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
@@ -95,4 +98,51 @@ public OrderResponse getCustomerOrder(Long orderId, Long customerId) {
         orderRepository.findOrderWithStoreByIdAndCustomerId(orderId, customerId)
             .orElseThrow(() -> new CustomException(ErrorCode.CUSTOMER_ORDER_NOT_FOUND)));
   }
+
+  @Transactional(readOnly = true)
+  public List<OrderResponse> getProgressingOrders(Long customerId) {
+    return orderRepository.findOrdersWithStoreByCustomerIdAndStatuses(customerId, List.of(
+            OrderStatus.PENDING, OrderStatus.PREPARING, OrderStatus.RIDER_ASSIGNED,
+            OrderStatus.DELIVERING)).stream()
+        .map(OrderResponse::from)
+        .toList();
+  }
+
+  @Transactional(readOnly = true)
+  public CursorPageResponse<OrderResponse> getCompletedOrdersByCursor(
+      Long customerId,
+      String nextPageToken,
+      int size
+  ) {
+    LocalDateTime lastCreatedAt = null;
+    Long lastOrderId = null;
+    String[] decodedParts = CursorUtil.decode(nextPageToken);
+
+    if (decodedParts != null && decodedParts.length == 2) {
+      try {
+        lastCreatedAt = LocalDateTime.parse(decodedParts[0]);
+        lastOrderId = Long.parseLong(decodedParts[1]);
+      } catch (NumberFormatException e) {
+        lastCreatedAt = null;
+        lastOrderId = null;
+      }
+    }
+
+    List<Order> cursorOrders = orderRepositoryCustom.findOrdersWithStoreByCustomerId(customerId,
+        List.of(OrderStatus.COMPLETED), lastCreatedAt, lastOrderId, size + 1);
+
+    List<OrderResponse> cursorResponses = cursorOrders.stream()
+        .limit(size)
+        .map(OrderResponse::from)
+        .toList();
+
+    boolean hasNext = cursorOrders.size() > size;
+    OrderResponse lastResponse = cursorResponses.getLast();
+
+    return new CursorPageResponse<>(
+        cursorResponses,
+        hasNext ? CursorUtil.encode(lastResponse.createdAt(), lastResponse.id()) : null,
+        hasNext
+    );
+  }
 }