feature #182 : 주문상세조회, 주문상태조회 시 회원 검증 로직 추가

Author: hyeonji91

src/main/java/com/irum/come2us/domain/order/application/service/CustomerOrderService.java

@@ -38,20 +38,28 @@ public class CustomerOrderService {
 
     @Transactional(readOnly = true)
     public OrderDetailStatusResponse getOrderDetailStatus(UUID orderDetailId) {
+        Member member = memberUtil.getCurrentMember();
+
         OrderDetail orderDetail =
                 orderDetailRepository
-                        .findByOrderDetailId(orderDetailId)
+                        .findByOrderDetailIdWithOrderAndMember(orderDetailId)
                         .orElseThrow(
                                 () -> new CommonException(OrderErrorCode.ORDER_DETAIL_NOT_FOUND));
 
+        if (member.equals(orderDetail.getOrder().getMember()))
+            throw new CommonException(OrderErrorCode.ORDER_FORBIDDEN);
+
         return OrderDetailStatusResponse.from(orderDetail);
     }
 
     @Transactional(readOnly = true)
     public OrderDetailResponse getOrderDetail(UUID orderId) {
+        Member member = memberUtil.getCurrentMember();
+
+        // order 조회 및 member 검증
         Order order =
                 orderRepository
-                        .findByOrderId(orderId)
+                        .findByOrderIdAndMember(orderId, member)
                         .orElseThrow(() -> new CommonException(OrderErrorCode.ORDER_NOT_FOUND));
 
         List<OrderDetail> orderDetailList = orderDetailRepository.findAllByOrder(order);
@@ -83,7 +91,7 @@ public CustomerOrderListResponse getOrderList(
         List<UUID> orderIdList = headerList.stream().map(CustomerOrderSummaryRow::orderId).toList();
         List<CustomerOrderDetailRow> orderDetailList =
                 orderRepository.fetchOrderDetailListByMember(orderIdList);
-        log.info("orderDetailList ", orderDetailList);
+        log.info("orderDetailList {}", orderDetailList);
 
         // 4. orderId로 그룹핑 : productSummary 제작
         Map<UUID, List<CustomerOrderListResponse.ProductResponse>> detailMap =

src/main/java/com/irum/come2us/domain/order/domain/repository/OrderDetailRepository.java

@@ -2,16 +2,28 @@
 
 import com.irum.come2us.domain.order.domain.entity.Order;
 import com.irum.come2us.domain.order.domain.entity.OrderDetail;
+import io.lettuce.core.dynamic.annotation.Param;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface OrderDetailRepository extends JpaRepository<OrderDetail, UUID> {
 
     Optional<OrderDetail> findByOrderDetailId(UUID orderDetailId);
 
+    @Query(
+            """
+       select od from OrderDetail od
+       join fetch od.order o
+       join fetch o.member m
+       where od.orderDetailId = :orderDetailId
+""")
+    Optional<OrderDetail> findByOrderDetailIdWithOrderAndMember(
+            @Param("orderDetailId") UUID orderDetailId);
+
     List<OrderDetail> findAllByOrder(Order order);
 }

src/main/java/com/irum/come2us/domain/order/domain/repository/OrderRepository.java

@@ -10,7 +10,7 @@
 
 @Repository
 public interface OrderRepository extends JpaRepository<Order, UUID>, OrderRepositoryCustom {
-    Optional<Order> findByOrderId(UUID orderId);
+    Optional<Order> findByOrderIdAndMember(UUID orderId, Member member);
 
     List<Order> findAllByMember(Member member);
 }

src/main/java/com/irum/come2us/global/presentation/advice/exception/errorcode/OrderErrorCode.java

@@ -8,7 +8,7 @@
 @AllArgsConstructor
 public enum OrderErrorCode implements BaseErrorCode {
     ORDER_NOT_FOUND(HttpStatus.NOT_FOUND, "주문을 찾을 수 없습니다."),
-
+    ORDER_FORBIDDEN(HttpStatus.FORBIDDEN, "해당 주문에 대해 권한이 없습니다"),
     ORDER_DETAIL_NOT_FOUND(HttpStatus.NOT_FOUND, "주문 상세를 찾을 수 없습니다."),
     ;