From cd3e5090715c9fcbf6159c6fdc63a4e6ac34288d Mon Sep 17 00:00:00 2001
From: hoon7566 <hoon7566@gmail.com>
Date: Tue, 22 Mar 2022 18:29:23 +0900
Subject: [PATCH] =?UTF-8?q?fix(customer-vue):=20=EC=9E=A5=EB=B0=94?=
 =?UTF-8?q?=EA=B5=AC=EB=8B=88=EC=97=90=20=EC=95=84=EC=9D=B4=ED=85=9C=20?=
 =?UTF-8?q?=EB=8B=B4=EC=9D=84=EC=8B=9C=20=EC=97=90=EB=9F=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 장바구니에 아이템 담을시 에러 수정
---
 customer-vue/src/views/ItemDetail.vue                         | 1 -
 customer-vue/src/views/OrderPage.vue                          | 2 +-
 .../orderservice/domain/order/service/OrderServiceImpl.java   | 4 +++-
 .../domain/itemoption/repository/ItemOptionRepository.java    | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/customer-vue/src/views/ItemDetail.vue b/customer-vue/src/views/ItemDetail.vue
index 4e9f80d..1493ab9 100644
--- a/customer-vue/src/views/ItemDetail.vue
+++ b/customer-vue/src/views/ItemDetail.vue
@@ -116,7 +116,6 @@ export default {
         storeId:-1,
         itemId:-1,
         price:0,
-        requireOption:{},
         otherOptions:[],
       },
     }
diff --git a/customer-vue/src/views/OrderPage.vue b/customer-vue/src/views/OrderPage.vue
index 4b9a2d4..105419d 100644
--- a/customer-vue/src/views/OrderPage.vue
+++ b/customer-vue/src/views/OrderPage.vue
@@ -8,7 +8,7 @@
     <v-row>
       <v-col
         v-for=" orderItem in orderData.orderItemDtoList"
-        :key = "orderItem.itemId"
+        :key = "orderItem.id"
       >
         <v-card
             class="mx-auto mb-5"
diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java
index 31110eb..add92b1 100644
--- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java
+++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java
@@ -161,7 +161,9 @@ public class OrderServiceImpl implements OrderService {
 
         //orderItemOption Entity를 생성한다.
         List<OrderItemOption> orderItemOptions = orderItemDto.getOrderItemOptionDtoList()
-                .stream().map(orderItemOptionDto -> OrderItemOption.of(orderItemDto.getId()))
+                .stream()
+                .filter(orderItemOptionDto -> orderItemOptionDto.getId()!=null)
+                .map(orderItemOptionDto -> OrderItemOption.of(orderItemOptionDto.getId()))
                 .collect(toList());
 
         //orderItem을 Entity를 생성한다.
diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/itemoption/repository/ItemOptionRepository.java b/store-service/src/main/java/com/justpickup/storeservice/domain/itemoption/repository/ItemOptionRepository.java
index 8b09e14..7c1dc6e 100644
--- a/store-service/src/main/java/com/justpickup/storeservice/domain/itemoption/repository/ItemOptionRepository.java
+++ b/store-service/src/main/java/com/justpickup/storeservice/domain/itemoption/repository/ItemOptionRepository.java
@@ -9,4 +9,5 @@ import java.util.List;
 
 public interface ItemOptionRepository extends JpaRepository<ItemOption,Long> {
 
+    List<ItemOption> findByItem(Item item);
 }