Revert "Revert "#28 [update]""

This reverts commit 8a05930.
MeongPanNyaengPan-MPNP · Jul 13, 2022 · ff0b570 · ff0b570
1 parent 8a05930
commit ff0b570
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 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
@@ -40,8 +40,8 @@ public void folderUpdate (@PathVariable int folderId, @RequestParam String newFo
     }
 
     /** 폴더 리스트 */
-    @PutMapping("/folderList/{userId}")
-    public List<FolderResponseDto> folderList (@PathVariable int userId){
+    @PostMapping("/folderList")
+    public List<FolderResponseDto> folderList (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
@@ -1,6 +1,7 @@
 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.*;
 
@@ -26,4 +27,8 @@ 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
@@ -67,7 +67,6 @@ 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
@@ -19,10 +19,10 @@ public class Tag extends TimeStamped {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    int id;
+    private int id;
 
     @Column
-    String tag;
+    private 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
@@ -1,6 +1,7 @@
 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;
@@ -55,6 +56,9 @@ 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;