diff --git a/button/src/main/java/com/button/model/entity/ProductList.java b/button/src/main/java/com/button/model/entity/ProductList.java index aaae8b7..96389e3 100644 --- a/button/src/main/java/com/button/model/entity/ProductList.java +++ b/button/src/main/java/com/button/model/entity/ProductList.java @@ -19,12 +19,15 @@ public class ProductList { @ManyToMany( fetch = FetchType.EAGER, cascade = CascadeType.PERSIST + ) + @JoinTable( name = "users_product_list", joinColumns = {@JoinColumn(name = "product_list_id")}, inverseJoinColumns = {@JoinColumn(name = "user_id")} ) + private Set users = new HashSet<>(); @OneToMany( diff --git a/button/src/main/java/com/button/web/controller/ProductListPageController.java b/button/src/main/java/com/button/web/controller/ProductListPageController.java index 4e1ce1d..4de9718 100644 --- a/button/src/main/java/com/button/web/controller/ProductListPageController.java +++ b/button/src/main/java/com/button/web/controller/ProductListPageController.java @@ -44,6 +44,7 @@ public String addNewProductList(@ModelAttribute("product_list") @Valid ProductLi @GetMapping("/delete/{id}") public String deleteProductListPage(@PathVariable Integer id) { + ProductList productList = productListRepository.findById(id).get(); Set users = productList.getUsers(); for (User user : users) { @@ -51,7 +52,6 @@ public String deleteProductListPage(@PathVariable Integer id) { } userRepository.saveAll(users); productListRepository.delete(productList); - return "redirect:/index"; }