From 85727d0bf85ad56ddc1dcdb3f5ad143039fa9e32 Mon Sep 17 00:00:00 2001
From: HongGit <soojam@konkuk.ac.kr>
Date: Fri, 4 Oct 2024 16:34:37 +0900
Subject: [PATCH] =?UTF-8?q?[FEAT/#26]=20=EC=B5=9C=EA=B7=BC=20=EC=A0=91?=
 =?UTF-8?q?=EC=88=98=20=EC=A3=BC=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rootandfruit/server/repository/OrdersRepository.java   | 6 ++++--
 .../com/rootandfruit/server/service/OrdersService.java     | 7 +++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/rootandfruit/server/repository/OrdersRepository.java b/src/main/java/com/rootandfruit/server/repository/OrdersRepository.java
index f1ca8a0..2fde31a 100644
--- a/src/main/java/com/rootandfruit/server/repository/OrdersRepository.java
+++ b/src/main/java/com/rootandfruit/server/repository/OrdersRepository.java
@@ -2,6 +2,7 @@
 
 import com.rootandfruit.server.domain.DeliveryStatus;
 import com.rootandfruit.server.domain.Orders;
+import com.rootandfruit.server.dto.RecentOrderResponseDto;
 import com.rootandfruit.server.global.exception.CustomException;
 import com.rootandfruit.server.global.exception.ErrorType;
 import java.util.List;
@@ -21,11 +22,12 @@ default List<Orders> findByOrderNumberOrThrow(int orderNumber) {
         return orders;
     }
 
-    @Query("SELECT o.orderNumber FROM Orders o " +
+    @Query("SELECT new com.rootandfruit.server.dto.RecentOrderResponseDto(o.orderNumber, d.senderName) " +
+            "FROM Orders o " +
             "JOIN o.deliveryInfo d " +
             "WHERE d.deliveryStatus = :deliveryStatus " +
             "ORDER BY o.createdAt DESC")
-    List<Integer> findDistinctOrderNumbersByDeliveryStatus(
+    List<RecentOrderResponseDto> findRecentOrdersByDeliveryStatus(
             @Param("deliveryStatus") DeliveryStatus deliveryStatus,
             Pageable pageable
     );
diff --git a/src/main/java/com/rootandfruit/server/service/OrdersService.java b/src/main/java/com/rootandfruit/server/service/OrdersService.java
index dd72b9a..c801ea9 100644
--- a/src/main/java/com/rootandfruit/server/service/OrdersService.java
+++ b/src/main/java/com/rootandfruit/server/service/OrdersService.java
@@ -11,6 +11,7 @@
 import com.rootandfruit.server.dto.OrderNumberResponseDto;
 import com.rootandfruit.server.dto.OrderRequestDto;
 import com.rootandfruit.server.dto.OrderResponseDto;
+import com.rootandfruit.server.dto.RecentOrderResponseDto;
 import com.rootandfruit.server.repository.DeliveryInfoRepository;
 import com.rootandfruit.server.repository.MemberRepository;
 import com.rootandfruit.server.repository.OrderMetaDataRepository;
@@ -174,10 +175,8 @@ public void cancel(int orderNumber) {
     }
 
     @Transactional(readOnly = true)
-    public List<Integer> getRecentTen() {
+    public List<RecentOrderResponseDto> getRecentTen() {
         Pageable limitTen = PageRequest.of(0, 10);
-        List<Integer> orderNumbers = ordersRepository.findDistinctOrderNumbersByDeliveryStatus(DeliveryStatus.ORDER_ACCEPTED, limitTen);
-
-        return orderNumbers.stream().distinct().collect(Collectors.toList());
+        return ordersRepository.findRecentOrdersByDeliveryStatus(DeliveryStatus.ORDER_ACCEPTED, limitTen);
     }
 }