refactor(be): 배달 도메인에서 필요한 정보 DTO에 추가 (#148)

* store 이름 필드를 위한 join fetch 쿼리 추가

Author: flffkd12

backend/src/main/java/com/deliveranything/domain/order/dto/OrderDetailsDto.java renamed to backend/src/main/java/com/deliveranything/domain/delivery/dto/OrderDetailsDto.java

@@ -1,4 +1,4 @@
-package com.deliveranything.domain.order.dto;
+package com.deliveranything.domain.delivery.dto;
 
 import lombok.Builder;
 

backend/src/main/java/com/deliveranything/domain/delivery/event/dto/RiderNotificationDto.java

@@ -1,6 +1,6 @@
 package com.deliveranything.domain.delivery.event.dto;
 
-import com.deliveranything.domain.order.dto.OrderDetailsDto;
+import com.deliveranything.domain.delivery.dto.OrderDetailsDto;
 import com.deliveranything.domain.order.enums.OrderStatus;
 import lombok.Builder;
 

backend/src/main/java/com/deliveranything/domain/delivery/service/OrderNotificationService.java

@@ -1,8 +1,8 @@
 package com.deliveranything.domain.delivery.service;
 
+import com.deliveranything.domain.delivery.dto.OrderDetailsDto;
 import com.deliveranything.domain.delivery.event.dto.OrderDeliveryCreatedEvent;
 import com.deliveranything.domain.delivery.event.dto.RiderNotificationDto;
-import com.deliveranything.domain.order.dto.OrderDetailsDto;
 import com.deliveranything.domain.order.enums.OrderStatus;
 import java.util.ArrayList;
 import java.util.List;

backend/src/main/java/com/deliveranything/domain/order/dto/OrderResponse.java

@@ -12,6 +12,7 @@ public record OrderResponse(
     List<OrderItem> orderItems,
     OrderStatus status,
     String merchantId,
+    String storeName,
     String address,
     String riderNote,
     String storeNote,
@@ -27,6 +28,7 @@ public static OrderResponse from(Order order) {
         order.getOrderItems(),
         order.getStatus(),
         order.getMerchantId(),
+        order.getStore().getName(),
         order.getAddress(),
         order.getRiderNote(),
         order.getStoreNote(),

backend/src/main/java/com/deliveranything/domain/order/repository/OrderRepository.java

@@ -5,18 +5,23 @@
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface OrderRepository extends JpaRepository<Order, Long> {
 
   Optional<Order> findByIdAndCustomerId(Long orderId, Long customerId);
 
   Optional<Order> findByMerchantId(String merchantId);
 
-  Optional<Order> findByDeliveryId(Long deliveryId);
+  @Query("SELECT o FROM Order o JOIN FETCH o.store WHERE o.delivery.id = :deliveryId")
+  Optional<Order> findByDeliveryIdWithStore(Long deliveryId);
 
-  List<Order> findByStatus(OrderStatus orderStatus);
+  @Query("SELECT o FROM Order o JOIN FETCH o.store WHERE o.status = :status")
+  List<Order> findAllByStatusWithStore(OrderStatus status);
 
-  List<Order> findByDeliveryRiderProfileId(Long riderProfileId);
+  @Query("SELECT o FROM Order o JOIN FETCH o.store WHERE o.delivery.riderProfile.id = :riderProfileId")
+  List<Order> findAllByDeliveryRiderProfileIdWithStore(Long riderProfileId);
 
-  List<Order> findByStoreIdAndStatusInOrderByCreatedAtAsc(Long storeId, List<OrderStatus> statuses);
+  List<Order> findAllByStoreIdAndStatusInOrderByCreatedAtAsc(Long storeId,
+      List<OrderStatus> statuses);
 }

backend/src/main/java/com/deliveranything/domain/order/service/OrderService.java

@@ -92,8 +92,10 @@ public OrderResponse getCustomerOrder(Long orderId, Long customerId) {
   }
 
   @Transactional(readOnly = true)
-  public List<Order> getPreparedOrders() {
-    return orderRepository.findByStatus(OrderStatus.PREPARING);
+  public List<OrderResponse> getPreparedOrders() {
+    return orderRepository.findAllByStatusWithStore(OrderStatus.PREPARING).stream()
+        .map(OrderResponse::from)
+        .toList();
   }
 
   @Transactional
@@ -102,14 +104,16 @@ public void updateStatus(Long orderId, OrderStatus orderStatus) {
   }
 
   @Transactional(readOnly = true)
-  public Order getOrderByDeliveryId(Long deliveryId) {
-    return orderRepository.findByDeliveryId(deliveryId)
-        .orElseThrow(() -> new CustomException(ErrorCode.ORDER_NOT_FOUND));
+  public OrderResponse getOrderByDeliveryId(Long deliveryId) {
+    return OrderResponse.from(orderRepository.findByDeliveryIdWithStore(deliveryId)
+        .orElseThrow(() -> new CustomException(ErrorCode.ORDER_NOT_FOUND)));
   }
 
   @Transactional(readOnly = true)
-  public List<Order> getRiderDeliveryOrders(Long riderProfileId) {
-    return orderRepository.findByDeliveryRiderProfileId(riderProfileId);
+  public List<OrderResponse> getRiderDeliveryOrders(Long riderProfileId) {
+    return orderRepository.findAllByDeliveryRiderProfileIdWithStore(riderProfileId).stream()
+        .map(OrderResponse::from)
+        .toList();
   }
 
   @Transactional(readOnly = true)
@@ -120,7 +124,7 @@ public Order getOrderByMerchantId(String merchantId) {
 
   @Transactional(readOnly = true)
   public List<Order> getStoreOrdersWithStatuses(Long storeId, List<OrderStatus> orderStatuses) {
-    return orderRepository.findByStoreIdAndStatusInOrderByCreatedAtAsc(storeId, orderStatuses);
+    return orderRepository.findAllByStoreIdAndStatusInOrderByCreatedAtAsc(storeId, orderStatuses);
   }
 
   @Transactional(readOnly = true)