Merge pull request #346 from Podo-Store/develop

2차 QA 일부 반영

Author: pipi-shortstocking

src/main/java/PodoeMarket/podoemarket/admin/controller/AdminController.java

@@ -145,12 +145,11 @@ public ResponseEntity<?> setPaymentStatus(@AuthenticationPrincipal UserEntity us
         try {
             adminService.checkAuth(userInfo);
 
-            OrdersEntity order = adminService.orders(orderId);
+            final OrdersEntity order = adminService.orders(orderId);
 
             if (dto.getOrderStatus() != null) {
                 if (dto.getOrderStatus() == OrderStatus.REJECT)
-                    mailSendService.joinCancelEmail(userInfo.getEmail(), order.getOrderItem().getFirst().getProduct().getTitle());
-
+                    mailSendService.joinCancelEmail(order.getUser().getEmail(), order.getOrderItem().getFirst().getProduct().getTitle());
                 order.setOrderStatus(dto.getOrderStatus());
             }
 

src/main/java/PodoeMarket/podoemarket/admin/dto/response/OrderManagementResponseDTO.java

@@ -31,7 +31,7 @@ public static class OrderDTO {
         private String customer;
         private OrderStatus orderStatus;
         private Boolean script; // 대본은 한 번에 1개만 구매 가능
-        private int performanceAmount;
-        private int totalPrice;
+        private Integer performanceAmount;
+        private Long totalPrice;
     }
 }

src/main/java/PodoeMarket/podoemarket/admin/service/AdminService.java

@@ -226,7 +226,7 @@ public OrderManagementResponseDTO getAllOrderItems(final String search, final Or
 
     public OrdersEntity orders(final Long orderId) {
         try {
-            return orderRepo.findById(orderId).orElse(null);
+            return orderRepo.findOrderById(orderId);
         } catch (Exception e) {
             throw new RuntimeException("주문 조회 실패", e);
         }

src/main/java/PodoeMarket/podoemarket/common/entity/OrderItemEntity.java

@@ -35,7 +35,7 @@ public class OrderItemEntity {
     @Builder.Default
     @Column(nullable = false)
     @ColumnDefault("0")
-    private Integer scriptPrice = 0;
+    private Long scriptPrice = 0L;
 
     @Builder.Default
     @Column(nullable = false)
@@ -45,10 +45,10 @@ public class OrderItemEntity {
     @Builder.Default
     @Column
     @ColumnDefault("0")
-    private Integer performancePrice = 0;
+    private Long performancePrice = 0L;
 
     @Column(nullable = false)
-    private Integer totalPrice;
+    private Long totalPrice;
 
     @Column(nullable = false, updatable = false)
     private LocalDateTime createdAt;

src/main/java/PodoeMarket/podoemarket/common/entity/OrdersEntity.java

@@ -25,7 +25,7 @@ public class OrdersEntity {
     private Long id;
 
     @Column(nullable = false)
-    private Integer totalPrice;
+    private Long totalPrice;
 
     @Column(nullable = false)
     private Integer paymentMethod; // 0: 0원, 1: 계좌이체

src/main/java/PodoeMarket/podoemarket/common/entity/ProductEntity.java

@@ -44,7 +44,7 @@ public class ProductEntity {
     @Builder.Default
     @Column(nullable = false)
     @ColumnDefault("0")
-    private Integer scriptPrice = 0;
+    private Long scriptPrice = 0L;
 
     @Builder.Default
     @Column(nullable = false)
@@ -53,7 +53,7 @@ public class ProductEntity {
 
     @Column
     @ColumnDefault("0")
-    private Integer performancePrice = 0;
+    private Long performancePrice = 0L;
 
     @Column
     private String descriptionPath;

src/main/java/PodoeMarket/podoemarket/common/entity/RefundEntity.java

@@ -25,7 +25,7 @@ public class RefundEntity {
     private Integer quantity;
 
     @Column(nullable = false)
-    private Integer price;
+    private Long price;
 
     @Column(nullable = false, length = 51)
     private String content;

src/main/java/PodoeMarket/podoemarket/common/repository/OrderRepository.java

@@ -5,8 +5,18 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface OrderRepository extends JpaRepository<OrdersEntity, Long> {
     Long countAllByOrderStatus(OrderStatus orderStatus);
+
     Page<OrdersEntity> findAllByOrderStatus(OrderStatus orderStatus, Pageable pageable);
+
+    @Query("SELECT o FROM OrdersEntity o " +
+            "JOIN FETCH o.user " +
+            "JOIN FETCH o.orderItem oi " +
+            "JOIN FETCH oi.product " +
+            "WHERE o.id = :orderId")
+    OrdersEntity findOrderById(@Param("orderId") Long orderId);
 }

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

@@ -13,6 +13,6 @@
 @AllArgsConstructor
 public class OrderInfoRequestDTO {
     private UUID productId;
-    private boolean script;
-    private int performanceAmount;
+    private Boolean script;
+    private Integer performanceAmount;
 }

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

@@ -32,8 +32,8 @@ public static class ApplicantDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class OrderItemDTO {
-        private boolean script;
-        private int performanceAmount;
+        private Boolean script;
+        private Integer performanceAmount;
 
         private UUID productId;
     }