From d738a0203bd09a5fbaae60e5a09962acffbc147b Mon Sep 17 00:00:00 2001
From: 1223v <1223v@naver.com>
Date: Mon, 27 Nov 2023 07:40:45 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20=EC=82=AD=EC=A0=9C=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=ED=85=9C=20=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../readyvery/readyverydemo/src/order/dto/OrderDto.java   | 1 +
 .../readyverydemo/src/order/dto/OrderMapper.java          | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderDto.java b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderDto.java
index 93f059e..e3fb43c 100644
--- a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderDto.java
+++ b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderDto.java
@@ -16,5 +16,6 @@ public class OrderDto {
 	private List<FoodieDto> foodies;
 	private String phone;
 	private LocalDateTime time;
+	private String method;
 	private Long price;
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java
index 914320f..e52a0c7 100644
--- a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java
+++ b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java
@@ -29,7 +29,13 @@ private OrderDto toOrderDto(Order order) {
 			.time(order.getCreatedAt())
 			.phone(order.getUserInfo().getPhone())
 			.price(order.getAmount())
-			.foodies(order.getCart().getCartItems().stream().map(this::cartItemToFoodieDto).toList())
+			.method(order.getMethod())
+			.foodies(order.getCart()
+				.getCartItems()
+				.stream()
+				.filter(cartItem -> !cartItem.getIsDeleted())
+				.map(this::cartItemToFoodieDto)
+				.toList())
 			.build();
 
 	}