From dd123a9623d5e5313cbe4482d8d206b27c837e83 Mon Sep 17 00:00:00 2001
From: hoon7566 <hoon7566@gmail.com>
Date: Thu, 24 Feb 2022 14:46:32 +0900
Subject: [PATCH] =?UTF-8?q?feat(owner-vue,=20store-service):=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=EC=97=90=EC=84=9C=20=EB=B0=94?=
 =?UTF-8?q?=EB=A1=9C=20item=EB=A6=AC=EC=8A=A4=ED=8A=B8=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

owner-vue에 item view 개발,
store-service에서 item을 Response하도록 수정
---
 owner-vue/src/views/Category.vue               | 12 +++++++++---
 .../domain/category/dto/CategoryDto.java       |  8 ++++++--
 .../category/web/CategoryController.java       | 18 ++++++++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/owner-vue/src/views/Category.vue b/owner-vue/src/views/Category.vue
index a9679ee..6023641 100644
--- a/owner-vue/src/views/Category.vue
+++ b/owner-vue/src/views/Category.vue
@@ -24,10 +24,10 @@
     <v-expansion-panels style="display: block">
       <draggable v-model="categoryList" id="categoryEl" >
         <v-expansion-panel
-            v-for="item in categoryList" :key="item.categoryId" class="category-item" :data-id="item.categoryId"
+            v-for="category in categoryList" :key="category.categoryId" class="category-item" :data-id="category.categoryId"
         >
           <v-expansion-panel-header >
-            <span contenteditable="true" >{{ item.name }}</span>
+            <span contenteditable="true" >{{ category.name }}</span>
 
             <template v-slot:actions>
               <v-btn
@@ -39,7 +39,13 @@
 
           </v-expansion-panel-header>
           <v-expansion-panel-content>
-            item-list
+
+            <v-list-item v-for=" item in category.items" :key="item.id" >
+              <v-list-item-content>
+                <v-list-item-title> {{item.name}}</v-list-item-title>
+              </v-list-item-content>
+            </v-list-item>
+
           </v-expansion-panel-content>
         </v-expansion-panel>
       </draggable>
diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/category/dto/CategoryDto.java b/store-service/src/main/java/com/justpickup/storeservice/domain/category/dto/CategoryDto.java
index 0cd39ad..7de1527 100644
--- a/store-service/src/main/java/com/justpickup/storeservice/domain/category/dto/CategoryDto.java
+++ b/store-service/src/main/java/com/justpickup/storeservice/domain/category/dto/CategoryDto.java
@@ -2,11 +2,13 @@ package com.justpickup.storeservice.domain.category.dto;
 
 import com.justpickup.storeservice.domain.category.entity.Category;
 import com.justpickup.storeservice.domain.category.web.CategoryController;
+import com.justpickup.storeservice.domain.item.dto.ItemDto;
 import com.justpickup.storeservice.domain.item.entity.Item;
 import com.justpickup.storeservice.domain.store.entity.Store;
 import lombok.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Getter
 @Builder
@@ -18,14 +20,16 @@ public class CategoryDto {
     private String name;
     private Integer order;
     private Store store;
-    private List<Item> items;
+    private List<ItemDto> items;
 
     public CategoryDto(Category category) {
         this.id = category.getId();
         this.name = category.getName();
         this.order = category.getOrder();
         this.store = category.getStore();
-        this.items = category.getItems();
+        this.items = category.getItems().stream()
+                .map(ItemDto::createItemDto)
+                .collect(Collectors.toList());
     }
 
     public CategoryDto(CategoryController.PutCategoryRequest.Category category) {
diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/category/web/CategoryController.java b/store-service/src/main/java/com/justpickup/storeservice/domain/category/web/CategoryController.java
index c18b90f..3100513 100644
--- a/store-service/src/main/java/com/justpickup/storeservice/domain/category/web/CategoryController.java
+++ b/store-service/src/main/java/com/justpickup/storeservice/domain/category/web/CategoryController.java
@@ -2,6 +2,7 @@ package com.justpickup.storeservice.domain.category.web;
 
 import com.justpickup.storeservice.domain.category.dto.CategoryDto;
 import com.justpickup.storeservice.domain.category.service.CategoryService;
+import com.justpickup.storeservice.domain.item.dto.ItemDto;
 import com.justpickup.storeservice.global.dto.Result;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
@@ -35,16 +36,33 @@ public class CategoryController {
     }
 
 
+
     @Data
     static class CategoryResponse{
         private Long categoryId;
         private String name;
         private Integer order;
+        private List<ItemResponse> items;
 
         public  CategoryResponse (CategoryDto categoryDto){
             this.categoryId = categoryDto.getId();
             this.name= categoryDto.getName();
             this.order= categoryDto.getOrder();
+            this.items = categoryDto.getItems().stream()
+                    .map(ItemResponse::new)
+                    .collect(Collectors.toList());
+        }
+
+        @Data
+        static class ItemResponse{
+            private Long id;
+            private String name;
+
+            public ItemResponse(ItemDto itemDto) {
+                this.id = itemDto.getId();
+                this.name = itemDto.getName();
+            }
+
         }
     }