diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 83e24a4..8810559 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -2,15 +2,16 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingItem; import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.server.ResponseStatusException; import java.util.List; import java.util.UUID; @@ -37,5 +38,25 @@ public class ShoppingCategoryController { return category; } + @DeleteMapping("/api/category/{categoryID}") + public ResponseEntity deleteCategory(@PathVariable UUID categoryID, @RequestParam(required = false) Boolean deleteAllItems){ + + if(deleteAllItems == null){ + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Missing required parameter deleteAllItems (can be either true or false)"); + } + + List itemList = shoppingItemRepository.findAllByCategory_Id(categoryID); + if(deleteAllItems){ + itemList.forEach((item) -> shoppingItemRepository.deleteById(item.getId())); + }else{ + itemList.forEach((item) -> item.setCategory(null)); + shoppingItemRepository.saveAll(itemList); + } + + shoppingCategoryRepository.deleteById(categoryID); + + return ResponseEntity.noContent().build(); + } + } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java index 4c17a06..08090f1 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -9,4 +9,5 @@ import java.util.UUID; public interface ShoppingItemRepository extends JpaRepository { List findByListAndCategoryIsNull(Object list); + List findAllByCategory_Id(UUID categoryID); } diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 6b71dd7..4b7986a 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -26,6 +26,12 @@ function deleteItem(li) { ui.deleteItem(li); } +function deleteCategory(deleteAllItems, categoryID) { + console.log(`deleting category with allItems: ${deleteAllItems} id: ${categoryID}`); + api.deleteCategory(deleteAllItems, categoryID); + ui.deleteCategory(deleteAllItems, categoryID); +} + function init() { addCategoryForm.addEventListener("submit", (event) => { event.preventDefault(); diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index b95e281..1994d8d 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -39,6 +39,11 @@ export async function addCategory(listID, categoryName) { } -export function deleteCategory() { +export async function deleteCategory(deleteAllItems, categoryID) { + const response = await fetch(`/api/category/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" }); + if (response.status == 204) { + console.log(`deleted item ${categoryID}`); + } + return response; } diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js index 9d7d16e..34db4e2 100644 --- a/src/main/resources/static/js/list/listFrontend.js +++ b/src/main/resources/static/js/list/listFrontend.js @@ -25,6 +25,13 @@ export function addCategory(categoryAsJSON) { list.appendChild(category.render()); } -export function deleteCategory() { +export function deleteCategory(deleteAllItems, categoryID) { + const category = document.getElementById(categoryID); + if (!deleteAllItems) { + const ul = category.querySelector("ul"); + if (ul) document.querySelector(".displayedList").append(...ul.children); + } + category.remove() +} }