round3: 코드 개선, 테스트 오류 수정

JVHE · JVHE · commit 4ca321e6e8bf · 2025-11-25T11:28:12.000+09:00
diff --git a/apps/commerce-api/src/main/java/com/loopers/application/order/OrderFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/order/OrderFacade.java
@@ -1,15 +1,13 @@
 package com.loopers.application.order;
 
 import com.loopers.domain.order.Order;
-import com.loopers.domain.order.OrderItem;
 import com.loopers.domain.order.OrderService;
 import com.loopers.domain.point.PointService;
 import com.loopers.domain.product.Product;
 import com.loopers.domain.product.ProductService;
 import com.loopers.domain.supply.SupplyService;
 import com.loopers.domain.user.User;
 import com.loopers.domain.user.UserService;
-import com.loopers.interfaces.api.order.OrderV1Dto;
 import com.loopers.support.error.CoreException;
 import com.loopers.support.error.ErrorType;
 import lombok.RequiredArgsConstructor;
@@ -18,7 +16,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -31,6 +28,7 @@ public class OrderFacade {
     private final PointService pointService;
     private final SupplyService supplyService;
 
+    @Transactional(readOnly = true)
     public OrderInfo getOrderInfo(String userId, Long orderId) {
         User user = userService.findByUserId(userId).orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."));
         Order order = orderService.getOrderByIdAndUserId(orderId, user.getId());
@@ -46,38 +44,22 @@ public Page<OrderInfo> getOrderList(String userId, Pageable pageable) {
     }
 
     @Transactional
-    public OrderInfo createOrder(String userId, OrderV1Dto.OrderRequest request) {
+    public OrderInfo createOrder(String userId, OrderRequest request) {
         User user = userService.findByUserId(userId).orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."));
 
-        // request에서 productId - quantity 맵 생성
-        Map<Long, Integer> productQuantityMap = request.items().stream()
-                .collect(Collectors.toMap(
-                        OrderV1Dto.OrderRequest.OrderItemRequest::productId,
-                        OrderV1Dto.OrderRequest.OrderItemRequest::quantity
-                ));
+        Map<Long, Integer> productIdQuantityMap = request.items().stream()
+                .collect(Collectors.toMap(OrderItemRequest::productId, OrderItemRequest::quantity));
 
-        Map<Long, Product> productMap = productService.getProductMapByIds(productQuantityMap.keySet());
+        Map<Long, Product> productMap = productService.getProductMapByIds(productIdQuantityMap.keySet());
 
         request.items().forEach(item -> {
             supplyService.checkAndDecreaseStock(item.productId(), item.quantity());
         });
 
-        Integer totalAmount = productService.calculateTotalAmount(productQuantityMap);
-
+        Integer totalAmount = productService.calculateTotalAmount(productIdQuantityMap);
         pointService.checkAndDeductPoint(user.getId(), totalAmount);
 
-        List<OrderItem> orderItems = request.items()
-                .stream()
-                .map(item -> OrderItem.create(
-                        item.productId(),
-                        productMap.get(item.productId()).getName(),
-                        item.quantity(),
-                        productMap.get(item.productId()).getPrice()
-                ))
-                .toList();
-        Order order = Order.create(user.getId(), orderItems);
-
-        orderService.save(order);
+        Order order = orderService.createOrder(request.items(), productMap, user.getId());
 
         return OrderInfo.from(order);
     }
diff --git a/apps/commerce-api/src/main/java/com/loopers/application/order/OrderItemRequest.java b/apps/commerce-api/src/main/java/com/loopers/application/order/OrderItemRequest.java
@@ -0,0 +1,7 @@
+package com.loopers.application.order;
+
+public record OrderItemRequest(
+        Long productId,
+        Integer quantity
+) {
+}
diff --git a/apps/commerce-api/src/main/java/com/loopers/application/order/OrderRequest.java b/apps/commerce-api/src/main/java/com/loopers/application/order/OrderRequest.java
@@ -0,0 +1,8 @@
+package com.loopers.application.order;
+
+import java.util.List;
+
+public record OrderRequest(
+        List<OrderItemRequest> items
+) {
+}
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java
@@ -1,5 +1,7 @@
 package com.loopers.domain.order;
 
+import com.loopers.application.order.OrderItemRequest;
+import com.loopers.domain.product.Product;
 import com.loopers.support.error.CoreException;
 import com.loopers.support.error.ErrorType;
 import lombok.RequiredArgsConstructor;
@@ -9,6 +11,9 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.Map;
+
 @RequiredArgsConstructor
 @Component
 public class OrderService {
@@ -18,6 +23,21 @@ public Order save(Order order) {
         return orderRepository.save(order);
     }
 
+    public Order createOrder(List<OrderItemRequest> OrderItems, Map<Long, Product> productMap, Long userId) {
+        List<OrderItem> orderItems = OrderItems
+                .stream()
+                .map(item -> OrderItem.create(
+                        item.productId(),
+                        productMap.get(item.productId()).getName(),
+                        item.quantity(),
+                        productMap.get(item.productId()).getPrice()
+                ))
+                .toList();
+        Order order = Order.create(userId, orderItems);
+
+        return orderRepository.save(order);
+    }
+
     public Order getOrderByIdAndUserId(Long orderId, Long userId) {
         return orderRepository.findByIdAndUserId(orderId, userId)
                 .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, "주문을 찾을 수 없습니다."));
diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/order/OrderV1ApiSpec.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/order/OrderV1ApiSpec.java
@@ -1,10 +1,10 @@
 package com.loopers.interfaces.api.order;
 
+import com.loopers.application.order.OrderRequest;
 import com.loopers.interfaces.api.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -23,7 +23,7 @@ ApiResponse<OrderV1Dto.OrderResponse> createOrder(
                     name = "주문 요청 정보",
                     description = "주문 생성에 필요한 정보"
             )
-            OrderV1Dto.OrderRequest request
+            OrderRequest request
     );
 
     // /api/v1/orders - GET
diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/order/OrderV1Controller.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/order/OrderV1Controller.java
@@ -2,6 +2,7 @@
 
 import com.loopers.application.order.OrderFacade;
 import com.loopers.application.order.OrderInfo;
+import com.loopers.application.order.OrderRequest;
 import com.loopers.interfaces.api.ApiResponse;
 import com.loopers.support.error.CoreException;
 import com.loopers.support.error.ErrorType;
@@ -22,7 +23,7 @@ public class OrderV1Controller implements OrderV1ApiSpec {
     @Override
     public ApiResponse<OrderV1Dto.OrderResponse> createOrder(
             @RequestHeader(value = "X-USER-ID", required = false) String userId,
-            @RequestBody OrderV1Dto.OrderRequest request
+            @RequestBody OrderRequest request
     ) {
         if (StringUtils.isBlank(userId)) {
             throw new CoreException(ErrorType.BAD_REQUEST);
diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/order/OrderV1Dto.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/order/OrderV1Dto.java
@@ -7,15 +7,6 @@
 import java.util.List;
 
 public class OrderV1Dto {
-    public record OrderRequest(
-            List<OrderItemRequest> items
-    ) {
-        public record OrderItemRequest(
-                Long productId,
-                Integer quantity
-        ) {
-        }
-    }
 
     public record OrderResponse(
             Long orderId,
diff --git a/apps/commerce-api/src/test/java/com/loopers/application/order/OrderFacadeIntegrationTest.java b/apps/commerce-api/src/test/java/com/loopers/application/order/OrderFacadeIntegrationTest.java
@@ -14,7 +14,6 @@
 import com.loopers.infrastructure.product.ProductJpaRepository;
 import com.loopers.infrastructure.supply.SupplyJpaRepository;
 import com.loopers.infrastructure.user.UserJpaRepository;
-import com.loopers.interfaces.api.order.OrderV1Dto;
 import com.loopers.support.error.CoreException;
 import com.loopers.support.error.ErrorType;
 import com.loopers.utils.DatabaseCleanUp;
@@ -128,10 +127,10 @@ class CreateOrder {
         @Test
         void should_createOrder_when_validRequest() {
             // arrange
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 2),
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId2, 1)
+                            new OrderItemRequest(productId1, 2),
+                            new OrderItemRequest(productId2, 1)
                     )
             );
 
@@ -150,9 +149,9 @@ void should_createOrder_when_validRequest() {
         void should_throwException_when_productIdDoesNotExist() {
             // arrange
             Long nonExistentProductId = 99999L;
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(nonExistentProductId, 1)
+                            new OrderItemRequest(nonExistentProductId, 1)
                     )
             );
 
@@ -166,9 +165,9 @@ void should_throwException_when_productIdDoesNotExist() {
         @Test
         void should_throwException_when_singleProductStockInsufficient() {
             // arrange
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 99999)
+                            new OrderItemRequest(productId1, 99999)
                     )
             );
 
@@ -184,10 +183,10 @@ void should_throwException_when_partialStockInsufficient() {
             // arrange
             // productId1: 재고 100, productId2: 재고 50
             // productId1은 충분하지만 productId2는 부족
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 10), // 재고 충분
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId2, 99999) // 재고 부족
+                            new OrderItemRequest(productId1, 10), // 재고 충분
+                            new OrderItemRequest(productId2, 99999) // 재고 부족
                     )
             );
 
@@ -203,10 +202,10 @@ void should_throwException_when_partialStockInsufficient() {
         @Test
         void should_throwException_when_allProductsStockInsufficient() {
             // arrange
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 99999),
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId2, 99999)
+                            new OrderItemRequest(productId1, 99999),
+                            new OrderItemRequest(productId2, 99999)
                     )
             );
 
@@ -228,9 +227,9 @@ void should_throwException_when_supplyDoesNotExist() {
             productMetricsJpaRepository.save(metrics);
             // Supply는 생성하지 않음
 
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(savedProduct.getId(), 1)
+                            new OrderItemRequest(savedProduct.getId(), 1)
                     )
             );
 
@@ -245,17 +244,17 @@ void should_throwException_when_supplyDoesNotExist() {
         void should_throwException_when_pointInsufficient() {
             // arrange
             // 포인트를 모두 사용
-            OrderV1Dto.OrderRequest firstOrder = new OrderV1Dto.OrderRequest(
+            OrderRequest firstOrder = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 10)
+                            new OrderItemRequest(productId1, 10)
                     )
             );
             orderFacade.createOrder(userId, firstOrder);
 
             // 포인트 부족한 주문 시도
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId2, 1) // 20000원 필요 (부족)
+                            new OrderItemRequest(productId2, 1) // 20000원 필요 (부족)
                     )
             );
 
@@ -271,18 +270,18 @@ void should_throwException_when_pointInsufficient() {
         void should_createOrder_when_pointExactlyMatches() {
             // arrange
             // 포인트를 거의 모두 사용
-            OrderV1Dto.OrderRequest firstOrder = new OrderV1Dto.OrderRequest(
+            OrderRequest firstOrder = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 9) // 90000원 사용
+                            new OrderItemRequest(productId1, 9) // 90000원 사용
                     )
             );
             orderFacade.createOrder(userId, firstOrder);
             // 남은 포인트: 10000원
 
             // 정확히 일치하는 주문
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 1) // 정확히 10000원
+                            new OrderItemRequest(productId1, 1) // 정확히 10000원
                     )
             );
 
@@ -300,10 +299,10 @@ void should_throwException_when_duplicateProducts() {
             // arrange
             // 같은 상품을 여러 번 주문 항목에 포함
             // Note: Collectors.toMap()은 중복 키가 있으면 IllegalStateException을 발생시킴
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 2),
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 3) // 중복
+                            new OrderItemRequest(productId1, 2),
+                            new OrderItemRequest(productId1, 3) // 중복
                     )
             );
 
@@ -320,9 +319,9 @@ void should_throwException_when_duplicateProducts() {
         void should_throwException_when_userDoesNotExist() {
             // arrange
             String nonExistentUserId = "nonexist";
-            OrderV1Dto.OrderRequest request = new OrderV1Dto.OrderRequest(
+            OrderRequest request = new OrderRequest(
                     List.of(
-                            new OrderV1Dto.OrderRequest.OrderItemRequest(productId1, 1)
+                            new OrderItemRequest(productId1, 1)
                     )
             );
 
diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceIntegrationTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceIntegrationTest.java
diff --git a/apps/commerce-api/src/test/java/com/loopers/interfaces/api/OrderV1ApiE2ETest.java b/apps/commerce-api/src/test/java/com/loopers/interfaces/api/OrderV1ApiE2ETest.java
