Merge pull request #345 from Podo-Store/bug/#344_admin

fix: 주문 상태 변경(#344)

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