feature: getProductOrderList api

Repick-official · Sep 14, 2024 · fc88ca9 · fc88ca9
1 parent 72ff097
commit fc88ca9
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 0 deletions.
diff --git a/src/main/java/com/example/repick/domain/product/api/ProductOrderController.java b/src/main/java/com/example/repick/domain/product/api/ProductOrderController.java
@@ -40,6 +40,13 @@ public SuccessResponse<Boolean> validateOrder(@RequestBody PostPayment postPayme
         return SuccessResponse.createSuccess(productOrderService.validatePayment(postPayment));
     }
 
+    @Operation(summary = "주문 내역 리스트")
+    @GetMapping
+    public SuccessResponse<PageResponse<List<GetProductOrderForUser>>> getProductOrdersForUser(@ParameterObject PageCondition pageCondition) {
+        return SuccessResponse.success(productOrderService.getProductOrdersForUser(pageCondition));
+    }
+
+
     @Operation(summary = "상품 구매 확정",
             description = """
                     구매를 확정합니다.

diff --git a/src/main/java/com/example/repick/domain/product/dto/productOrder/GetProductOrderForUser.java b/src/main/java/com/example/repick/domain/product/dto/productOrder/GetProductOrderForUser.java
@@ -0,0 +1,23 @@
+package com.example.repick.domain.product.dto.productOrder;
+
+import com.example.repick.domain.product.entity.Product;
+import com.example.repick.domain.product.entity.ProductOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record GetProductOrderForUser(
+        @Schema(description = "주문 아이디") long productOrderId,
+        @Schema(description = "브랜드 이름") String brandName,
+        @Schema(description = "상품 이름") String productName,
+        @Schema(description = "상품 이미지 URL") String productImageUrl,
+        @Schema(description = "구매확정 여부") Boolean isConfirmed
+) {
+    public static GetProductOrderForUser from(ProductOrder productOrder, Product product) {
+        return new GetProductOrderForUser(
+                productOrder.getId(),
+                product.getBrandName(),
+                product.getProductName(),
+                product.getThumbnailImageUrl(),
+                productOrder.isConfirmed()
+        );
+    }
+}
diff --git a/src/main/java/com/example/repick/domain/product/repository/ProductOrderRepository.java b/src/main/java/com/example/repick/domain/product/repository/ProductOrderRepository.java
@@ -17,6 +17,7 @@ public interface ProductOrderRepository extends JpaRepository<ProductOrder, Long
     List<ProductOrder> findByIsConfirmed(boolean isConfirmed);
 
     List<ProductOrder> findByUserId(Long userId);
+    Page<ProductOrder> findByUserId(Long userId, Pageable pageable);
 
     Page<ProductOrder> findByProductOrderStateIn(List<ProductOrderState> productOrderStates, Pageable pageable);
 

diff --git a/src/main/java/com/example/repick/domain/product/service/ProductOrderService.java b/src/main/java/com/example/repick/domain/product/service/ProductOrderService.java
@@ -166,6 +166,21 @@ private void cancelPayment(Payment payment) {
         paymentRepository.save(payment);
     }
 
+    public PageResponse<List<GetProductOrderForUser>> getProductOrdersForUser(PageCondition pageCondition) {
+        User user = userRepository.findByProviderId(SecurityContextHolder.getContext().getAuthentication().getName())
+                .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
+        Pageable pageable = pageCondition.toPageable();
+        Page<ProductOrder> productOrderPage = productOrderRepository.findByUserId(user.getId(), pageable);
+        List<GetProductOrderForUser> getProductOrders = productOrderPage.stream()
+                .map(productOrder -> {
+                    Product product = productRepository.findById(productOrder.getProductId())
+                            .orElseThrow(() -> new CustomException(INVALID_PRODUCT_ID));
+                    return GetProductOrderForUser.from(productOrder, product);
+                }).toList();
+        Page<GetProductOrderForUser> page = new PageImpl<>(getProductOrders, pageable, productOrderPage.getTotalElements());
+        return new PageResponse<>(page.getContent(), page.getTotalPages(), page.getTotalElements());
+    }
+
     @Transactional
     public Boolean confirmProductOrder(Long productOrderId){
         ProductOrder productOrder = productOrderRepository.findById(productOrderId)