From 5ee3ac28cf73804071b26b54abf3a904946b485a Mon Sep 17 00:00:00 2001
From: hoon7566 <hoon7566@gmail.com>
Date: Wed, 2 Mar 2022 15:48:58 +0900
Subject: [PATCH] refactor(store-service): refactoring user-id hardcode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

store-service에 user-id 하드코딩 된 코드를 access token에 담긴 userid로 변경
---
 .../src/main/resources/application.yml                 |  3 ++-
 owner-vue/src/api/store.js                             |  2 +-
 owner-vue/src/{views => components}/ItemOption.vue     |  0
 owner-vue/src/{views => components}/MenuItem.vue       |  2 +-
 owner-vue/src/main.js                                  |  4 ----
 owner-vue/src/util/customUtil.js                       |  9 ---------
 owner-vue/src/views/Menu.vue                           |  3 +--
 .../storeservice/domain/category/entity/Category.java  |  2 +-
 .../domain/category/web/CategoryController.java        |  6 +++---
 .../storeservice/domain/item/web/ItemController.java   | 10 ++++++----
 .../justpickup/userservice/UserServiceApplication.java |  2 ++
 11 files changed, 17 insertions(+), 26 deletions(-)
 rename owner-vue/src/{views => components}/ItemOption.vue (100%)
 rename owner-vue/src/{views => components}/MenuItem.vue (98%)
 delete mode 100644 owner-vue/src/util/customUtil.js

diff --git a/owner-apigateway-service/src/main/resources/application.yml b/owner-apigateway-service/src/main/resources/application.yml
index 8a02c6f..89e798f 100644
--- a/owner-apigateway-service/src/main/resources/application.yml
+++ b/owner-apigateway-service/src/main/resources/application.yml
@@ -46,14 +46,15 @@ spring:
           predicates:
             - Path=/order-service/**
           filters:
-            - RewritePath=/order-service/(?<segment>.*),/$\{segment}
             - AuthorizationHeaderFilter
+            - RewritePath=/order-service/(?<segment>.*),/$\{segment}
 
         - id: store-service
           uri: lb://STORE-SERVCIE
           predicates:
             - Path=/store-service/**
           filters:
+            - AuthorizationHeaderFilter
             - RewritePath=/store-service/(?<segment>.*),/$\{segment}
 
         - id: user-service
diff --git a/owner-vue/src/api/store.js b/owner-vue/src/api/store.js
index 9dfa558..5fba5bf 100644
--- a/owner-vue/src/api/store.js
+++ b/owner-vue/src/api/store.js
@@ -5,7 +5,7 @@ export default {
         return axios.get(process.env.VUE_APP_OWNER_SERVICE_BASEURL+'/store-service/category');
     },
     putCategoryList(data){
-        return this.$axios({
+        return axios({
             method:'put',
             url:process.env.VUE_APP_OWNER_SERVICE_BASEURL+'/store-service/category',
             headers: {
diff --git a/owner-vue/src/views/ItemOption.vue b/owner-vue/src/components/ItemOption.vue
similarity index 100%
rename from owner-vue/src/views/ItemOption.vue
rename to owner-vue/src/components/ItemOption.vue
diff --git a/owner-vue/src/views/MenuItem.vue b/owner-vue/src/components/MenuItem.vue
similarity index 98%
rename from owner-vue/src/views/MenuItem.vue
rename to owner-vue/src/components/MenuItem.vue
index 8894259..72a8b89 100644
--- a/owner-vue/src/views/MenuItem.vue
+++ b/owner-vue/src/components/MenuItem.vue
@@ -130,7 +130,7 @@
 </template>
 
 <script>
-import ItemOption from "@/views/ItemOption";
+import ItemOption from "@/components/ItemOption";
 export default {
   name: "MenuItem",
   components:{
diff --git a/owner-vue/src/main.js b/owner-vue/src/main.js
index b5462aa..a459994 100644
--- a/owner-vue/src/main.js
+++ b/owner-vue/src/main.js
@@ -8,10 +8,6 @@ import auth from "./api/auth.js";
 axios.defaults.withCredentials = true;
 
 Vue.config.productionTip = false
-Vue.prototype.$axios = axios;
-Vue.prototype.$customUtil = customUtil;
-
-console.log(process.env)
 
 new Vue({
   vuetify,
diff --git a/owner-vue/src/util/customUtil.js b/owner-vue/src/util/customUtil.js
deleted file mode 100644
index 4c3ddde..0000000
--- a/owner-vue/src/util/customUtil.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export default {
-    deepCopy : function (o) {
-        let result = {};
-        if (typeof o === "object" && o !== null)
-            for (let i in o) result[i] = this.deepCopy(o[i]);
-        else result = o;
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/owner-vue/src/views/Menu.vue b/owner-vue/src/views/Menu.vue
index 516cfd5..bfe0276 100644
--- a/owner-vue/src/views/Menu.vue
+++ b/owner-vue/src/views/Menu.vue
@@ -70,8 +70,7 @@ import {
   mdiPlus,
 
 } from '@mdi/js'
-// import axios from "axios";
-import MenuItem from "@/views/MenuItem";
+import MenuItem from "@/components/MenuItem";
 import store from "@/api/store";
 
 export default {
diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/category/entity/Category.java b/store-service/src/main/java/com/justpickup/storeservice/domain/category/entity/Category.java
index 5b982be..7fd7607 100644
--- a/store-service/src/main/java/com/justpickup/storeservice/domain/category/entity/Category.java
+++ b/store-service/src/main/java/com/justpickup/storeservice/domain/category/entity/Category.java
@@ -30,7 +30,7 @@ public class Category extends BaseEntity {
     @JoinColumn(name = "store_id")
     private Store store;
 
-    @OneToMany(mappedBy = "category")
+    @OneToMany(mappedBy = "category", cascade = CascadeType.ALL)
     private List<Item> items;
 
     // == 연관관계 편의 메소드 == //
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 3100513..722b1b8 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
@@ -10,6 +10,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -21,9 +22,8 @@ public class CategoryController {
     private final CategoryService categoryService;
 
     @GetMapping("/category")
-    public ResponseEntity getCategoryList( ){
-        // TODO: 2022-02-09 storeId hard coding 변경해야함
-        Long storeId = 1L;
+    public ResponseEntity getCategoryList(@RequestHeader(value = "user-id") String userId ){
+        Long storeId = Long.parseLong(userId);
         List<CategoryDto> categoryList = categoryService.getCategoryList(storeId);
 
         List<CategoryResponse> categoryResponseList = categoryList.stream()
diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/item/web/ItemController.java b/store-service/src/main/java/com/justpickup/storeservice/domain/item/web/ItemController.java
index 5487501..a616504 100644
--- a/store-service/src/main/java/com/justpickup/storeservice/domain/item/web/ItemController.java
+++ b/store-service/src/main/java/com/justpickup/storeservice/domain/item/web/ItemController.java
@@ -27,9 +27,10 @@ public class ItemController {
 
     @GetMapping("/item")
     public ResponseEntity<Result<GetItemResponse>> getItemList( @RequestParam String word,
-                                                               @PageableDefault(page = 0, size = 10) Pageable pageable){
+                                                               @PageableDefault(page = 0, size = 10) Pageable pageable,
+                                                                @RequestHeader(value = "user-id") String userId ){
 
-        Long storeId = 1L;
+        Long storeId = Long.parseLong(userId);
 
         Page<ItemDto> itemDtoList = itemService.findItemList(storeId,word,pageable);
         List<GetItemListResponse.Item> itemList = itemDtoList.stream()
@@ -191,9 +192,10 @@ public class ItemController {
     }
 
     @PostMapping("/item")
-    public ResponseEntity createItem( @RequestBody @Valid ItemRequest itemRequest){
+    public ResponseEntity createItem( @RequestBody @Valid ItemRequest itemRequest,
+                                      @RequestHeader(value = "user-id") String userId ){
 
-        Long storeId = 1L;
+        Long storeId = Long.parseLong(userId);
 
         List<ItemOptionDto> itemOption = itemRequest.getRequiredOption().stream()
                 .map(ItemRequest.ItemOptionRequest::createItemOptionDto)
diff --git a/user-service/src/main/java/com/justpickup/userservice/UserServiceApplication.java b/user-service/src/main/java/com/justpickup/userservice/UserServiceApplication.java
index 9b26de3..3e62bf9 100644
--- a/user-service/src/main/java/com/justpickup/userservice/UserServiceApplication.java
+++ b/user-service/src/main/java/com/justpickup/userservice/UserServiceApplication.java
@@ -8,6 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 
+import java.util.List;
+
 @SpringBootApplication
 @EnableEurekaClient
 public class UserServiceApplication {