[47] 일반 사용자 주문 리스트

src/main/java/org/example/commerce_site/application/order/OrderFacade.java

@@ -5,6 +5,7 @@
 import org.example.commerce_site.application.address.AddressService;
 import org.example.commerce_site.application.order.dto.OrderDetailResponseDto;
 import org.example.commerce_site.application.order.dto.OrderRequestDto;
+import org.example.commerce_site.application.order.dto.OrderResponseDto;
 import org.example.commerce_site.application.product.ProductService;
 import org.example.commerce_site.application.shipment.ShipmentService;
 import org.example.commerce_site.application.user.UserService;
@@ -14,11 +15,15 @@
 import org.example.commerce_site.domain.Address;
 import org.example.commerce_site.domain.Order;
 import org.example.commerce_site.domain.User;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class OrderFacade {
@@ -51,4 +56,9 @@ public void cancel(String userAuthId, Long orderId) {
 		List<OrderDetailResponseDto.Get> orderDetails = orderDetailService.getOrderDetails(order.getId());
 		productService.restoreStockOnCancel(orderDetails);
 	}
+
+	public Page<OrderResponseDto.Get> getOrderList(int page, int size, String keyword, String userAuthId) {
+		User user = userService.getUser(userAuthId);
+		return orderService.getOrderList(PageRequest.of(page - 1, size), keyword, user.getId());
+	}
 }

src/main/java/org/example/commerce_site/application/order/OrderService.java

@@ -1,11 +1,15 @@
 package org.example.commerce_site.application.order;
 
 import org.example.commerce_site.application.order.dto.OrderRequestDto;
+import org.example.commerce_site.application.order.dto.OrderResponseDto;
 import org.example.commerce_site.attribute.OrderStatus;
 import org.example.commerce_site.common.exception.CustomException;
 import org.example.commerce_site.common.exception.ErrorCode;
 import org.example.commerce_site.domain.Order;
+import org.example.commerce_site.infrastructure.order.CustomOrderRepository;
 import org.example.commerce_site.infrastructure.order.OrderRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,6 +19,7 @@
 @RequiredArgsConstructor
 public class OrderService {
 	private final OrderRepository orderRepository;
+	private final CustomOrderRepository customOrderRepository;
 
 	@Transactional
 	public Order createOrder(OrderRequestDto.Create dto, Long userId) {
@@ -33,4 +38,9 @@ public void updateStatus(Order order, OrderStatus orderStatus) {
 		order.updateOrderStatus(orderStatus);
 		orderRepository.save(order);
 	}
+
+	@Transactional(readOnly = true)
+	public Page<OrderResponseDto.Get> getOrderList(PageRequest pageRequest, String keyword, Long userId) {
+		return customOrderRepository.getOrders(pageRequest, keyword, userId);
+	}
 }

src/main/java/org/example/commerce_site/application/order/dto/OrderDetailResponseDto.java

@@ -4,22 +4,29 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
+import org.example.commerce_site.attribute.ShipmentStatus;
 import org.example.commerce_site.domain.Order;
 import org.example.commerce_site.domain.OrderDetail;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
 public class OrderDetailResponseDto {
 	@Getter
 	@Builder
+	@AllArgsConstructor
 	public static class Get {
 		private LocalDateTime createdAt;
 		private Long id;
 		private Long productId;
 		private Long quantity;
 		private Long orderId;
 		private BigDecimal unitPrice;
+		private String productName;
+		private ShipmentStatus shipmentStatus;
+		private LocalDateTime shipmentCreatedAt;
+		private LocalDateTime shipmentUpdatedAt;
 
 		public static Get toDto(OrderDetail orderDetail) {
 			return Get.builder()

src/main/java/org/example/commerce_site/application/order/dto/OrderResponseDto.java

@@ -0,0 +1,32 @@
+package org.example.commerce_site.application.order.dto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.example.commerce_site.attribute.OrderStatus;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+public class OrderResponseDto {
+	@Builder
+	@Getter
+	@AllArgsConstructor
+	public static class Get {
+		private Long id;
+		private BigDecimal totalAmount;
+		private OrderStatus status;
+		private List<OrderDetailResponseDto.Get> orderDetails;
+
+		public Get(Long id, BigDecimal totalAmount, OrderStatus status) {
+			this.id = id;
+			this.totalAmount = totalAmount;
+			this.status = status;
+		}
+
+		public void setOrderDetails(List<OrderDetailResponseDto.Get> orderDetails) {
+			this.orderDetails = orderDetails;
+		}
+	}
+}

src/main/java/org/example/commerce_site/common/util/PageConverter.java

@@ -1,5 +1,6 @@
 package org.example.commerce_site.common.util;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.springframework.data.domain.Page;
@@ -8,7 +9,16 @@
 
 public class PageConverter {
 	public static <T> Page<T> getPage(List<T> content, Pageable pageable) {
+		if (content == null || pageable == null) {
+			return new PageImpl<>(Collections.emptyList(), pageable != null ? pageable : Pageable.unpaged(), 0);
+		}
+
 		int start = (int)pageable.getOffset();
+
+		if (start >= content.size()) {
+			return new PageImpl<>(Collections.emptyList(), pageable, content.size());
+		}
+
 		int end = Math.min((start + pageable.getPageSize()), content.size());
 
 		return new PageImpl<>(content.subList(start, end), pageable, content.size());

src/main/java/org/example/commerce_site/infrastructure/order/CustomOrderRepository.java

@@ -0,0 +1,9 @@
+package org.example.commerce_site.infrastructure.order;
+
+import org.example.commerce_site.application.order.dto.OrderResponseDto;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface CustomOrderRepository {
+	Page<OrderResponseDto.Get> getOrders(Pageable pageable, String keyword, Long userId);
+}

src/main/java/org/example/commerce_site/infrastructure/order/CustomOrderRepositoryImpl.java

@@ -0,0 +1,79 @@
+package org.example.commerce_site.infrastructure.order;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.example.commerce_site.application.order.dto.OrderDetailResponseDto;
+import org.example.commerce_site.application.order.dto.OrderResponseDto;
+import org.example.commerce_site.common.util.PageConverter;
+import org.example.commerce_site.domain.QOrder;
+import org.example.commerce_site.domain.QOrderDetail;
+import org.example.commerce_site.domain.QProduct;
+import org.example.commerce_site.domain.QShipment;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+import org.springframework.util.StringUtils;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.Projections;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class CustomOrderRepositoryImpl implements CustomOrderRepository {
+	private final JPAQueryFactory queryFactory;
+
+	@Override
+	public Page<OrderResponseDto.Get> getOrders(Pageable pageable, String keyword, Long userId) {
+		BooleanBuilder builder = new BooleanBuilder();
+
+		if (StringUtils.hasText(keyword)) {
+			builder.and(QProduct.product.name.contains(keyword));
+		}
+
+		List<OrderResponseDto.Get> orderList = queryFactory.select(Projections.constructor(OrderResponseDto.Get.class,
+				QOrder.order.id,
+				QOrder.order.totalAmount,
+				QOrder.order.status,
+				Projections.list(Projections.constructor(OrderDetailResponseDto.Get.class,
+					QOrderDetail.orderDetail.createdAt,
+					QOrderDetail.orderDetail.id,
+					QOrderDetail.orderDetail.productId,
+					QOrderDetail.orderDetail.quantity,
+					QOrderDetail.orderDetail.order.id,
+					QOrderDetail.orderDetail.unitPrice,
+					QProduct.product.name,
+					QShipment.shipment.status,
+					QShipment.shipment.createdAt,
+					QShipment.shipment.updatedAt
+				))
+			))
+			.from(QOrder.order)
+			.leftJoin(QOrderDetail.orderDetail).on(QOrder.order.id.eq(QOrderDetail.orderDetail.order.id))
+			.leftJoin(QProduct.product).on(QOrderDetail.orderDetail.productId.eq(QProduct.product.id))
+			.leftJoin(QShipment.shipment).on(QOrderDetail.orderDetail.id.eq(QShipment.shipment.orderDetail.id))
+			.where(QOrder.order.userId.eq(userId).and(builder))
+			.offset(pageable.getOffset())
+			.limit(pageable.getPageSize())
+			.fetch();
+
+		List<OrderResponseDto.Get> groupedOrderList = orderList.stream()
+			.collect(Collectors.groupingBy(OrderResponseDto.Get::getId))
+			.values()
+			.stream()
+			.map(orderGroup -> {
+				OrderResponseDto.Get firstOrder = orderGroup.get(0);
+				List<OrderDetailResponseDto.Get> allDetails = orderGroup.stream()
+					.flatMap(order -> order.getOrderDetails().stream())
+					.collect(Collectors.toList());
+				firstOrder.setOrderDetails(allDetails);
+				return firstOrder;
+			})
+			.collect(Collectors.toList());
+
+		return PageConverter.getPage(groupedOrderList, pageable);
+	}
+}

src/main/java/org/example/commerce_site/infrastructure/product/CustomProductRepositoryImpl.java

@@ -60,8 +60,6 @@ public Page<ProductResponseDto.Get> getProducts(Pageable pageable, String keywor
 			.leftJoin(QPartner.partner)
 			.on(QProduct.product.partnerId.eq(QPartner.partner.id))
 			.where(builder)
-
-			//sort, order by
 			.fetch();
 
 		return PageConverter.getPage(products, pageable);

src/main/java/org/example/commerce_site/representation/order/OrderController.java

@@ -2,14 +2,17 @@
 
 import org.example.commerce_site.application.order.OrderFacade;
 import org.example.commerce_site.common.response.ApiSuccessResponse;
-import org.example.commerce_site.representation.order.request.OrderRequest;
+import org.example.commerce_site.representation.order.dto.OrderRequest;
+import org.example.commerce_site.representation.order.dto.OrderResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import lombok.RequiredArgsConstructor;
@@ -38,4 +41,15 @@ public ApiSuccessResponse cancelOrder(
 		orderFacade.cancel(userAuthId, orderId);
 		return ApiSuccessResponse.success();
 	}
+
+	@GetMapping
+	public ApiSuccessResponse.PageList<OrderResponse.Get> getOrders(
+		@RequestParam(value = "page", defaultValue = "1") int page,
+		@RequestParam(value = "size", defaultValue = "10") int size,
+		@RequestParam(value = "keyword", required = false) String keyword,
+		@RequestAttribute("user_id") String userAuthId
+	) {
+		return ApiSuccessResponse.success(
+			OrderResponse.Get.of(orderFacade.getOrderList(page, size, keyword, userAuthId)));
+	}
 }

src/main/java/org/example/commerce_site/representation/order/request/OrderRequest.java → src/main/java/org/example/commerce_site/representation/order/dto/OrderRequest.java

@@ -1,4 +1,4 @@
-package org.example.commerce_site.representation.order.request;
+package org.example.commerce_site.representation.order.dto;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/org/example/commerce_site/representation/order/dto/OrderResponse.java

@@ -0,0 +1,72 @@
+package org.example.commerce_site.representation.order.dto;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import org.example.commerce_site.application.order.dto.OrderDetailResponseDto;
+import org.example.commerce_site.application.order.dto.OrderResponseDto;
+import org.example.commerce_site.attribute.OrderStatus;
+import org.example.commerce_site.attribute.ShipmentStatus;
+import org.springframework.data.domain.Page;
+
+import lombok.Builder;
+import lombok.Getter;
+
+public class OrderResponse {
+	@Getter
+	@Builder
+	public static class Get {
+		private Long id;
+		private BigDecimal totalAmount;
+		private OrderStatus status;
+		private List<DetailGet> orderDetails;
+
+		public static Get of(OrderResponseDto.Get dto) {
+			return Get.builder()
+				.id(dto.getId())
+				.totalAmount(dto.getTotalAmount())
+				.status(dto.getStatus())
+				.orderDetails(DetailGet.of(dto.getOrderDetails()))
+				.build();
+		}
+
+		public static Page<Get> of(Page<OrderResponseDto.Get> dtos) {
+			return dtos.map(Get::of);
+		}
+	}
+
+	@Getter
+	@Builder
+	public static class DetailGet {
+		private LocalDateTime createdAt;
+		private Long id;
+		private Long productId;
+		private Long quantity;
+		private Long orderId;
+		private BigDecimal unitPrice;
+		private String productName;
+		private ShipmentStatus shipmentStatus;
+		private LocalDateTime shipmentCreatedAt;
+		private LocalDateTime shipmentUpdatedAt;
+
+		public static DetailGet of(OrderDetailResponseDto.Get dto) {
+			return DetailGet.builder()
+				.createdAt(dto.getCreatedAt())
+				.id(dto.getId())
+				.productId(dto.getProductId())
+				.quantity(dto.getQuantity())
+				.orderId(dto.getOrderId())
+				.unitPrice(dto.getUnitPrice())
+				.productName(dto.getProductName())
+				.shipmentStatus(dto.getShipmentStatus())
+				.shipmentCreatedAt(dto.getShipmentCreatedAt())
+				.shipmentUpdatedAt(dto.getShipmentUpdatedAt())
+				.build();
+		}
+
+		public static List<DetailGet> of(List<OrderDetailResponseDto.Get> dtos) {
+			return dtos.stream().map(DetailGet::of).toList();
+		}
+	}
+}

src/main/java/org/example/commerce_site/representation/product/ProductController.java

@@ -29,7 +29,7 @@ public class ProductController {
 	@PostMapping()
 	public ApiSuccessResponse createProduct(
 		@Valid @RequestBody ProductRequest.Create request,
-		@RequestAttribute("userId") String userAuthId) {
+		@RequestAttribute("user_id") String userAuthId) {
 		productFacade.createProduct(ProductRequest.Create.toDTO(request, userAuthId));
 		return ApiSuccessResponse.success();
 	}
@@ -38,7 +38,7 @@ public ApiSuccessResponse createProduct(
 	@PatchMapping("/{product_id}")
 	public ApiSuccessResponse updateProduct(
 		@PathVariable(name = "product_id") Long productId,
-		@RequestAttribute("userId") String userAuthId,
+		@RequestAttribute("user_id") String userAuthId,
 		@Valid @RequestBody ProductRequest.Update request
 	) {
 		productFacade.updateProduct(productId, ProductRequest.Update.toDTO(request, userAuthId));