From 8a059306f23bd9bb739147538662d47246dd6e76 Mon Sep 17 00:00:00 2001
From: kokoa322 <tjsgus223@gmail.com>
Date: Thu, 14 Jul 2022 05:52:21 +0900
Subject: [PATCH] Revert "#28 [update]"

This reverts commit 1db1566f978cc4eb78af5071b9a29c69ec6347c0.
---
 .../mpnp/baechelin/bookmark/controller/FolderController.java | 4 ++--
 .../java/com/mpnp/baechelin/bookmark/domain/Bookmark.java    | 5 -----
 src/main/java/com/mpnp/baechelin/store/domain/Store.java     | 1 +
 src/main/java/com/mpnp/baechelin/tag/domain/Tag.java         | 4 ++--
 src/main/java/com/mpnp/baechelin/user/domain/User.java       | 4 ----
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java b/src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java
index 3b73052..bdf18b6 100644
--- a/src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java
+++ b/src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java
@@ -40,8 +40,8 @@ public void folderUpdate (@PathVariable int folderId, @RequestParam String newFo
     }
 
     /** 폴더 리스트 */
-    @PostMapping("/folderList")
-    public List<FolderResponseDto> folderList (int userId){
+    @PutMapping("/folderList/{userId}")
+    public List<FolderResponseDto> folderList (@PathVariable int userId){
 
         return folderService.folderList(userId);
     }
diff --git a/src/main/java/com/mpnp/baechelin/bookmark/domain/Bookmark.java b/src/main/java/com/mpnp/baechelin/bookmark/domain/Bookmark.java
index b8fb85e..b7e7b27 100644
--- a/src/main/java/com/mpnp/baechelin/bookmark/domain/Bookmark.java
+++ b/src/main/java/com/mpnp/baechelin/bookmark/domain/Bookmark.java
@@ -1,7 +1,6 @@
 package com.mpnp.baechelin.bookmark.domain;
 
 import com.mpnp.baechelin.store.domain.Store;
-import com.mpnp.baechelin.user.domain.User;
 import com.mpnp.baechelin.util.TimeStamped;
 import lombok.*;
 
@@ -27,8 +26,4 @@ public class Bookmark extends TimeStamped {
     @JoinColumn(name="STORE_ID", nullable = false)
     private Store storeId;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name="USER_ID", nullable = false)
-    private User userId;
-
 }
diff --git a/src/main/java/com/mpnp/baechelin/store/domain/Store.java b/src/main/java/com/mpnp/baechelin/store/domain/Store.java
index 4a15c1b..a1dcdfd 100644
--- a/src/main/java/com/mpnp/baechelin/store/domain/Store.java
+++ b/src/main/java/com/mpnp/baechelin/store/domain/Store.java
@@ -67,6 +67,7 @@ public class Store {
     @OneToMany(mappedBy = "store", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<StoreImage> storeImageList = new ArrayList<>();
 
+
     @OneToMany(mappedBy = "storeId", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Review> reviewList = new ArrayList<>();
 
diff --git a/src/main/java/com/mpnp/baechelin/tag/domain/Tag.java b/src/main/java/com/mpnp/baechelin/tag/domain/Tag.java
index 8d575af..3682b91 100644
--- a/src/main/java/com/mpnp/baechelin/tag/domain/Tag.java
+++ b/src/main/java/com/mpnp/baechelin/tag/domain/Tag.java
@@ -19,10 +19,10 @@ public class Tag extends TimeStamped {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
+    int id;
 
     @Column
-    private String tag;
+    String tag;
     //jpa를 리스트/JSON 집어넣는 방법?
 
     @ManyToOne(fetch = FetchType.LAZY)
diff --git a/src/main/java/com/mpnp/baechelin/user/domain/User.java b/src/main/java/com/mpnp/baechelin/user/domain/User.java
index 5654aab..9f395b0 100644
--- a/src/main/java/com/mpnp/baechelin/user/domain/User.java
+++ b/src/main/java/com/mpnp/baechelin/user/domain/User.java
@@ -1,7 +1,6 @@
 package com.mpnp.baechelin.user.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.mpnp.baechelin.bookmark.domain.Bookmark;
 import com.mpnp.baechelin.bookmark.domain.Folder;
 import com.mpnp.baechelin.oauth.entity.ProviderType;
 import com.mpnp.baechelin.oauth.entity.RoleType;
@@ -56,9 +55,6 @@ public class User extends TimeStamped {
     @OneToMany(mappedBy = "userId", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Folder> folderList;
 
-    @OneToMany(mappedBy = "userId", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Bookmark> bookmarkList;
-
     @OneToMany(mappedBy = "userId", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Review> reviewList;