Merge pull request #518 from Podo-Store/develop

[FEAT] 결제 시, 사용자 id 받아옴

Author: pipi-shortstocking

src/main/java/PodoeMarket/podoemarket/order/controller/OrderController.java

@@ -4,7 +4,6 @@
 import PodoeMarket.podoemarket.order.dto.request.OrderInfoRequestDTO;
 import PodoeMarket.podoemarket.order.dto.request.OrderRequestDTO;
 import PodoeMarket.podoemarket.common.dto.ResponseDTO;
-import PodoeMarket.podoemarket.order.dto.response.OrderCompleteResponseDTO;
 import PodoeMarket.podoemarket.order.dto.response.OrderInfoResponseDTO;
 import PodoeMarket.podoemarket.order.dto.response.OrderItemResponseDTO;
 import PodoeMarket.podoemarket.order.service.OrderService;
@@ -18,7 +17,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
-import java.util.List;
 
 @RequiredArgsConstructor
 @RestController
@@ -44,9 +42,7 @@ public ResponseEntity<?> getPurchaseInfo(@AuthenticationPrincipal UserEntity use
     }
 
     @PostMapping("/item")
-    public void purchase(@AuthenticationPrincipal UserEntity userInfo,
-                                      HttpServletRequest req,
-                                      HttpServletResponse res) throws IOException {
+    public void purchase(HttpServletRequest req, HttpServletResponse res) throws IOException {
         try {
             String resultCode = req.getParameter("resultCode");
             String tid = req.getParameter("tid");
@@ -60,7 +56,7 @@ public void purchase(@AuthenticationPrincipal UserEntity userInfo,
             }
             OrderRequestDTO dto = new ObjectMapper().readValue(mallReserved, OrderRequestDTO.class);
 
-            long orderId = orderService.purchaseProduct(userInfo, dto, req.getParameter("tid"));
+            long orderId = orderService.purchaseProduct(dto, req.getParameter("tid"));
             String redirectUrl = String.format("https://podo-store.com/purchase/success?orderId=%d", orderId);
 
             res.sendRedirect(redirectUrl);

src/main/java/PodoeMarket/podoemarket/order/dto/request/OrderRequestDTO.java

@@ -16,6 +16,7 @@ public class OrderRequestDTO {
     ApplicantDTO applicant;
     List<OrderItemDTO> orderItem;
     private int paymentMethod;
+    private UUID userId;
 
     @Data
     @Builder

src/main/java/PodoeMarket/podoemarket/order/dto/response/OrderCompleteResponseDTO.java

@@ -1,13 +1,9 @@
 package PodoeMarket.podoemarket.order.service;
 
 import PodoeMarket.podoemarket.common.entity.*;
+import PodoeMarket.podoemarket.common.repository.*;
 import PodoeMarket.podoemarket.order.dto.request.OrderInfoRequestDTO;
-import PodoeMarket.podoemarket.order.dto.response.OrderCompleteResponseDTO;
 import PodoeMarket.podoemarket.order.dto.request.OrderRequestDTO;
-import PodoeMarket.podoemarket.common.repository.ApplicantRepository;
-import PodoeMarket.podoemarket.common.repository.OrderItemRepository;
-import PodoeMarket.podoemarket.common.repository.OrderRepository;
-import PodoeMarket.podoemarket.common.repository.ProductRepository;
 import PodoeMarket.podoemarket.order.dto.response.OrderInfoResponseDTO;
 import PodoeMarket.podoemarket.order.dto.response.OrderItemResponseDTO;
 import PodoeMarket.podoemarket.service.MailSendService;
@@ -30,6 +26,7 @@ public class OrderService {
     private final OrderRepository orderRepo;
     private final OrderItemRepository orderItemRepo;
     private final ApplicantRepository applicantRepo;
+    private final UserRepository userRepo;
     private final MailSendService mailSendService;
 
     @Value("${cloud.aws.s3.url}")
@@ -66,8 +63,10 @@ public OrderItemResponseDTO getOrderItemInfo(UserEntity userInfo, OrderInfoReque
     }
 
     @Transactional
-    public long purchaseProduct(UserEntity userInfo, OrderRequestDTO dto, String tid) {
+    public long purchaseProduct(OrderRequestDTO dto, String tid) {
         try {
+            final UserEntity userInfo = getUserInfo(dto.getUserId());
+
             final OrdersEntity order = OrdersEntity.builder()
                     .user(userInfo)
                     .paymentMethod(dto.getPaymentMethod())
@@ -226,25 +225,6 @@ protected void createApplicant(final ApplicantEntity applicant) {
         }
     }
 
-    private List<OrderCompleteResponseDTO> orderResult(final OrdersEntity ordersEntity) {
-        try {
-            List<OrderItemEntity> orderItems = orderItemRepo.findByOrderId(ordersEntity.getId());
-
-            return orderItems.stream().map(orderItem ->
-                    OrderCompleteResponseDTO.builder()
-                            .id(ordersEntity.getId())
-                            .orderDate(ordersEntity.getCreatedAt())
-                            .orderNum(ordersEntity.getId())
-                            .scriptPrice(orderItem.getScriptPrice())
-                            .performancePrice(orderItem.getPerformancePrice())
-                            .totalPrice(orderItem.getTotalPrice())
-                            .build()
-            ).toList();
-        } catch (Exception e) {
-            throw new RuntimeException("주문 결과 조회 실패", e);
-        }
-    }
-
     private List<OrderItemEntity> getOrderItem(final Long orderId) {
         try {
             return orderItemRepo.findByOrderId(orderId);
@@ -260,4 +240,12 @@ private OrdersEntity getOrderInfo(final Long orderId) {
             throw new RuntimeException("주문 정보 조회 실패", e);
         }
     }
+
+    private UserEntity getUserInfo(final UUID id) {
+        try {
+            return userRepo.findById(id);
+        } catch (Exception e) {
+            throw new RuntimeException("유저 정보 조회 실패", e);
+        }
+    }
 }