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

build.gradle

@@ -47,6 +47,9 @@ dependencies {
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
     // Project Common Dependency End ----------------------------------------
+    // HttpComponent for restTemplate connection pool
+    implementation 'org.apache.httpcomponents.client5:httpclient5:5.3'
+    implementation 'org.apache.httpcomponents.core5:httpcore5:5.3'
 
     // QueryDsl
     implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'

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,15 +4,18 @@
 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;
@@ -47,4 +50,19 @@ public static List<OrderDetailResponseDto.Get> toDtoList(List<OrderDetail> order
 			return orderDetails.stream().map(Get::toDto).toList();
 		}
 	}
+
+	@Getter
+	@AllArgsConstructor
+	public static class GetList {
+		private Long id;
+		private LocalDateTime createdAt;
+		private Long productId;
+		private Long quantity;
+		private Long orderId;
+		private BigDecimal unitPrice;
+		private String productName;
+		private ShipmentStatus shipmentStatus;
+		private LocalDateTime shipmentCreatedAt;
+		private LocalDateTime shipmentUpdatedAt;
+	}
 }

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

@@ -0,0 +1,20 @@
+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.Getter;
+
+public class OrderResponseDto {
+	@Getter
+	@AllArgsConstructor
+	public static class Get {
+		private Long id;
+		private BigDecimal totalAmount;
+		private OrderStatus status;
+		private List<OrderDetailResponseDto.GetList> orderDetails;
+	}
+}

src/main/java/org/example/commerce_site/common/exception/ErrorCode.java

@@ -46,7 +46,11 @@ public enum ErrorCode {
 	CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, 404, "카테고리 정보를 찾을 수 없습니다."),
 
 	//shipment
-	SHIPMENT_NOT_FOUND(HttpStatus.NOT_FOUND, 404, "배송 정보를 찾을 수 없습니다.");
+	SHIPMENT_NOT_FOUND(HttpStatus.NOT_FOUND, 404, "배송 정보를 찾을 수 없습니다."),
+
+	//rest template
+	REST_TEMPLATE_CONNECTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 500, "Rest template 에러");
+
 
 	private final HttpStatus httpStatus;
 	private final int code;

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/config/RestTemplateConfig.java

@@ -0,0 +1,61 @@
+package org.example.commerce_site.config;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.example.commerce_site.common.exception.CustomException;
+import org.example.commerce_site.common.exception.ErrorCode;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.ResponseErrorHandler;
+import org.springframework.web.client.RestTemplate;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Configuration
+public class RestTemplateConfig {
+	@Bean
+	RestTemplate restTemplate() {
+		PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
+		connectionManager.setMaxTotal(100);
+		connectionManager.setDefaultMaxPerRoute(30);
+
+		RequestConfig requestConfig = RequestConfig.custom()
+			.setResponseTimeout(5000, TimeUnit.MILLISECONDS)
+			.build();
+
+		CloseableHttpClient httpClient = HttpClientBuilder.create()
+			.setDefaultRequestConfig(requestConfig)
+			.setConnectionManager(connectionManager)
+			.build();
+
+		HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
+		factory.setConnectTimeout(3000);
+		factory.setHttpClient(httpClient);
+
+		RestTemplate restTemplate = new RestTemplate(factory);
+
+		restTemplate.setErrorHandler(new ResponseErrorHandler() {
+			@Override
+			public boolean hasError(ClientHttpResponse response) throws IOException {
+				return response.getStatusCode().is4xxClientError() || response.getStatusCode().is5xxServerError();
+			}
+
+			@Override
+			public void handleError(ClientHttpResponse response) throws IOException {
+				log.error("Error occurred : {} ", response.getStatusCode());
+				log.error("Error response message : {}", response.getBody());
+				throw new CustomException(ErrorCode.REST_TEMPLATE_CONNECTION_ERROR);
+			}
+		});
+
+		return restTemplate;
+	}
+}

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,100 @@
+package org.example.commerce_site.infrastructure.order;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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.example.commerce_site.common.util.PageConverter;
+import org.flywaydb.core.internal.util.StringUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Repository
+@RequiredArgsConstructor
+public class CustomOrderRepositoryImpl implements CustomOrderRepository {
+	@PersistenceContext
+	private final EntityManager entityManager;
+
+	@Override
+	public Page<OrderResponseDto.Get> getOrders(Pageable pageable, String keyword, Long userId) {
+		StringBuilder sql = new StringBuilder("SELECT o.id, o.total_amount, o.status, " +
+			"od.id AS order_detail_id, od.created_at, od.product_id, od.quantity, " +
+			"od.order_id, od.unit_price, p.name AS product_name, s.status AS shipment_status, " +
+			"s.created_at AS shipment_created_at, s.updated_at AS shipment_updated_at " +
+			"FROM orders o " +
+			"INNER JOIN order_details od ON o.id = od.order_id " +
+			"LEFT JOIN products p ON od.product_id = p.id " +
+			"LEFT JOIN shipments s ON od.id = s.order_detail_id " +
+			"WHERE o.user_id = :userId ");
+
+		if (StringUtils.hasText(keyword)) {
+			sql.append("AND p.name IS NOT NULL AND (MATCH(p.name) AGAINST (:keyword IN BOOLEAN MODE) " +
+				"OR p.name LIKE CONCAT(:keyword, '%')) ");
+		}
+
+		sql.append("ORDER BY o.created_at LIMIT :pageSize OFFSET :offset");
+
+		Query query = entityManager.createNativeQuery(sql.toString());
+		query.setParameter("userId", userId);
+		query.setParameter("pageSize", pageable.getPageSize());
+		query.setParameter("offset", pageable.getOffset());
+
+		if (StringUtils.hasText(keyword)) {
+			query.setParameter("keyword", keyword);
+		}
+
+		List<Object[]> resultList = query.getResultList();
+
+		Map<Long, OrderResponseDto.Get> orderMap = new HashMap<>();
+		for (Object[] row : resultList) {
+			Long orderId = (Long) row[0]; // 주문 ID
+			BigDecimal totalAmount = BigDecimal.valueOf((Long) row[1]); // 총 금액
+			OrderStatus orderStatus = OrderStatus.valueOf((String) row[2]); // 주문 상태
+
+			OrderDetailResponseDto.GetList orderDetail = new OrderDetailResponseDto.GetList(
+				(Long) row[3], // orderDetailId
+				convertTimestampToLocalDateTime((Timestamp) row[4]), // createdAt
+				(Long) row[5], // productId
+				(Long) row[6], // quantity
+				(Long) row[7], // orderId
+				BigDecimal.valueOf((Long) row[8]), // unitPrice
+				(String) row[9], // productName
+				ShipmentStatus.valueOf((String) row[10]), // shipmentStatus
+				convertTimestampToLocalDateTime((Timestamp) row[11]), // shipmentCreatedAt
+				convertTimestampToLocalDateTime((Timestamp) row[12])  // shipmentUpdatedAt
+			);
+
+			OrderResponseDto.Get orderResponse = orderMap.get(orderId);
+			if (orderResponse == null) {
+				orderResponse = new OrderResponseDto.Get(orderId, totalAmount, orderStatus, new ArrayList<>());
+				orderMap.put(orderId, orderResponse);
+			}
+
+			orderResponse.getOrderDetails().add(orderDetail);
+		}
+
+		List<OrderResponseDto.Get> orderList = new ArrayList<>(orderMap.values());
+
+		return PageConverter.getPage(orderList, pageable);
+	}
+
+	private LocalDateTime convertTimestampToLocalDateTime(Timestamp timestamp) {
+		return timestamp != null ? timestamp.toLocalDateTime() : null;
+	}
+}

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);