From 4a0c70fb98502facfb15a29d2f4784db0597fe27 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:51:03 +0200 Subject: [PATCH 01/11] deleteAllDoneItems zu itemsAPI gemoved, api-pfad angepasst --- .../resources/static/js/pages/list/api/itemAPI.js | 10 ++++++++++ .../resources/static/js/pages/list/api/listAPI.js | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/resources/static/js/pages/list/api/itemAPI.js b/src/main/resources/static/js/pages/list/api/itemAPI.js index d18328a..9113a8c 100644 --- a/src/main/resources/static/js/pages/list/api/itemAPI.js +++ b/src/main/resources/static/js/pages/list/api/itemAPI.js @@ -41,4 +41,14 @@ export async function editItem(itemID, toChange) { return response; } +export async function deleteAllDoneItems(listID) { + + const response = await fetch(`/api/item?listID=${listID}&done=true`, { method: "DELETE" }); + + if (response.status == 204) { + console.log(`items have been deleted`); + } + return response; + +} diff --git a/src/main/resources/static/js/pages/list/api/listAPI.js b/src/main/resources/static/js/pages/list/api/listAPI.js index f072cf4..ee3e99e 100644 --- a/src/main/resources/static/js/pages/list/api/listAPI.js +++ b/src/main/resources/static/js/pages/list/api/listAPI.js @@ -1,14 +1,3 @@ export * from "./itemAPI.js"; export * from "./categoryAPI.js" -export async function deleteAllDoneItems(listID) { - - const response = await fetch(`/api/list/${listID}?deleteAllDoneItems=true`, { method: "DELETE" }); - - if (response.status == 204) { - console.log(`items have been deleted`); - } - return response; - -} - From c104754ff39ca61e2d20aedce53a735012321490 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:51:15 +0200 Subject: [PATCH 02/11] =?UTF-8?q?neuer=20apiPfad=20f=C3=BCr=20deleteALlDon?= =?UTF-8?q?eItems?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ShoppingItemController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java index aa9830e..63595ba 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.UUID; @RestController @@ -63,4 +64,15 @@ public class ShoppingItemController { shoppingItemRepository.deleteById(itemID); return ResponseEntity.noContent().build(); } + + + @DeleteMapping("/api/item") + public ResponseEntity deleteAllDoneItems(@RequestParam UUID listID, @RequestParam boolean done){ + if(!done) return ResponseEntity.badRequest().build(); + + List items = shoppingItemRepository.findByList_IdAndIsDoneIsTrue(listID); + shoppingItemRepository.deleteAll(items); + + return ResponseEntity.noContent().build(); + } } From 18ac0273bd101aed60c506436d14e3b0923d2f86 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:51:34 +0200 Subject: [PATCH 03/11] deleteAllDoneItems entefernt weil nu in ShoppingItemcontroller --- .../einkaufsliste/Controller/ShoppingListController.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index 482d7d8..a41e9fc 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -33,13 +33,4 @@ public class ShoppingListController { return new ShoppingListResponseDTO(list.getListName(), list.getId()); } - @DeleteMapping("/api/list/{listID}") - public ResponseEntity deleteAllDoneItems(@PathVariable UUID listID, @RequestParam(required = false) boolean deleteAllDoneItems){ - if(deleteAllDoneItems){ - List items = shoppingItemRepository.findByList_IdAndIsDoneIsTrue(listID); - shoppingItemRepository.deleteAll(items); - } - return ResponseEntity.noContent().build(); - } - } From 080f61a0c84c76c582951078787b44c3e271a8cb Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 22:36:25 +0200 Subject: [PATCH 04/11] refactor --- .../de/timaldinger/einkaufsliste/Controller/PageController.java | 2 +- .../de/timaldinger/einkaufsliste/Models/ShoppingCategory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index 7116a08..c901d90 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -41,7 +41,7 @@ public class PageController { public String list(Model model, @PathVariable UUID id){ ShoppingList list = shoppingListRepository.findById(id).orElseThrow(); model.addAttribute("list", list); - model.addAttribute("categories", shoppingCategoryRepository.findByShoppingList(list)); + model.addAttribute("categories", shoppingCategoryRepository.findByList(list)); model.addAttribute("items", shoppingItemRepository.findByList_IdAndCategoryIsNull(id)); return "list"; } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java index b39e680..7ad1a87 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java @@ -22,6 +22,6 @@ public class ShoppingCategory extends ShoppingElement{ private List itemsInCategory; @ManyToOne //mehrere Kategorien (Many) gehören (to) einer Liste an (one) @JoinColumn(name="list_id", nullable = false) - private ShoppingList shoppingList; + private ShoppingList list; } From f7d11a77d1dca09ce7c539ecd11af6b4fc5185c0 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 22:37:18 +0200 Subject: [PATCH 05/11] =?UTF-8?q?eventListener=20f=C3=9Cr=20Listenl=C3=B6s?= =?UTF-8?q?chen=20und=20editbutton=20geamcht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/pages/index/index.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/resources/static/js/pages/index/index.js b/src/main/resources/static/js/pages/index/index.js index 09ddba9..4a410f3 100644 --- a/src/main/resources/static/js/pages/index/index.js +++ b/src/main/resources/static/js/pages/index/index.js @@ -26,6 +26,15 @@ function init() { addList(formData.listName); }); + document.querySelector(".index").addEventListener("click", (event) => { + if (event.target.matches(".list__editButton")) { + + } else if (event.target.matches(".list__deleteButton")) { + deleteList(event.target.closest("li")); + } + + }); + } document.addEventListener('DOMContentLoaded', init); From e579044ed59178b8c629dacfa999b3e944d5c2b5 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 22:37:25 +0200 Subject: [PATCH 06/11] deleteList implementiert --- src/main/resources/static/js/pages/index/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/pages/index/index.js b/src/main/resources/static/js/pages/index/index.js index 4a410f3..f684840 100644 --- a/src/main/resources/static/js/pages/index/index.js +++ b/src/main/resources/static/js/pages/index/index.js @@ -14,8 +14,11 @@ function editList() { } -function deleteList() { +function deleteList(listElement) { + const response = api.deleteList(listElement.id); + + if (response.status == 204) ui.deleteList(listElement); } From 18daded2c25a526f95d6382657cbfd534c590556 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 22:37:33 +0200 Subject: [PATCH 07/11] Element wird entfernt --- src/main/resources/static/js/pages/index/frontend/indexUI.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/static/js/pages/index/frontend/indexUI.js b/src/main/resources/static/js/pages/index/frontend/indexUI.js index 4a924a4..fdd9764 100644 --- a/src/main/resources/static/js/pages/index/frontend/indexUI.js +++ b/src/main/resources/static/js/pages/index/frontend/indexUI.js @@ -6,3 +6,7 @@ export function addList(listAsJSON) { const listElement = ShoppingList.fromJSON(listAsJSON); list.append(listElement.render()); } + +export function deleteList(listElement) { + listElement.remove(); +} From 9f436720e9d2342fc56f81263a8b2ed1d188d941 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 22:37:46 +0200 Subject: [PATCH 08/11] =?UTF-8?q?response=20wird=20jtz=20in=20index.js=20g?= =?UTF-8?q?epr=C3=BCft?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/pages/index/api/indexAPI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/pages/index/api/indexAPI.js b/src/main/resources/static/js/pages/index/api/indexAPI.js index 7a85ba6..f02b2d2 100644 --- a/src/main/resources/static/js/pages/index/api/indexAPI.js +++ b/src/main/resources/static/js/pages/index/api/indexAPI.js @@ -14,8 +14,8 @@ export async function addList(listName) { } export async function deleteList(id) { - const response = await fetch(`/api/list/${id}`, { method: "DELETE" }) - .then(r => console.log("Liste entfernt")) + const response = await fetch(`/api/list/${id}`, { method: "DELETE" }); + return response; } From e8fcb5ed9caf3f95741b0f61cb81f6b1348859cc Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 22:39:46 +0200 Subject: [PATCH 09/11] =?UTF-8?q?ShoppingListService=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Da die Löschung von den Spalten eine Transaktion seien muss, weil nicht abgeleitet CRUD Operation nicht automatisch transactional sind, und die Reihenfolge steuerbar seien muss (erst items, dann kateogiren, dann liste), ergibt es Sinn, die Löschung in eine Service KLasse auszulagern, welche dann im Controller aufgerufen wird --- .../Service/ShoppingListService.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java new file mode 100644 index 0000000..9620159 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java @@ -0,0 +1,27 @@ +package de.timaldinger.einkaufsliste.Service; + +import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; +import jakarta.transaction.Transactional; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.UUID; + +@Service +public class ShoppingListService { + @Autowired + private ShoppingItemRepository shoppingItemRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + + @Transactional + public void deleteList(UUID listID){ + shoppingItemRepository.deleteByListId(listID); + shoppingCategoryRepository.deleteByListId(listID); + shoppingListRepository.deleteById(listID); + } +} From de72438a0bb641d6aee02f0ed1e236636f5a4def Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 22:41:20 +0200 Subject: [PATCH 10/11] =?UTF-8?q?Implementierung=20einer=20custom=20query?= =?UTF-8?q?=20um=20alle=20items/categories=20einer=20liste=20zu=20l=C3=B6s?= =?UTF-8?q?chen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Das Schreiben einer eigenen Query erlaubt es uns Bulk-Deletes zu nutzen. Mit abgeleiteter CRUD (zb deleteByList_id) würde jedes einzelne Element mit .remove() aufgerunfen werden --- .../Repository/ShoppingCategoryRepository.java | 9 +++++++-- .../einkaufsliste/Repository/ShoppingItemRepository.java | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java index ad361f8..2eb1bfa 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java @@ -3,11 +3,16 @@ package de.timaldinger.einkaufsliste.Repository; import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Models.ShoppingCategory; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; import java.util.UUID; public interface ShoppingCategoryRepository extends JpaRepository{ - List findByShoppingList(ShoppingList list); - + List findByList(ShoppingList list); + @Modifying + @Query("DELETE FROM ShoppingCategory c WHERE c.list.id = :listID") + void deleteByListId(@Param("listID") UUID listID); } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java index fa5e64f..c2c7841 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -3,6 +3,9 @@ package de.timaldinger.einkaufsliste.Repository; import de.timaldinger.einkaufsliste.Models.ShoppingItem; import de.timaldinger.einkaufsliste.Models.ShoppingList; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; import java.util.UUID; @@ -12,4 +15,7 @@ public interface ShoppingItemRepository extends JpaRepository findByList_IdAndCategoryIsNull(UUID list); List findAllByCategory_Id(UUID categoryID); List findByList_IdAndIsDoneIsTrue(UUID listID); + @Modifying + @Query("DELETE FROM ShoppingItem i WHERE i.list.id = :listID") + void deleteByListId(@Param("listID") UUID listID); } From 844decd9631517e10f6a682c966071c31d240647 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 22:41:28 +0200 Subject: [PATCH 11/11] implementierung deleteList --- .../einkaufsliste/Controller/ShoppingListController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index a41e9fc..858ae39 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -7,6 +7,7 @@ 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 de.timaldinger.einkaufsliste.Service.ShoppingListService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -23,6 +24,8 @@ public class ShoppingListController { private ShoppingListRepository shoppingListRepository; @Autowired private ShoppingItemRepository shoppingItemRepository; + @Autowired + private ShoppingListService shoppingListService; @PostMapping("/api/list") public ShoppingListResponseDTO addList(@RequestBody ShoppingListPostDTO newList){ @@ -32,5 +35,9 @@ public class ShoppingListController { return new ShoppingListResponseDTO(list.getListName(), list.getId()); } - + @DeleteMapping("/api/list/{listID}") + public ResponseEntity deleteList(@PathVariable UUID listID){ + shoppingListService.deleteList(listID); + return ResponseEntity.noContent().build(); + } }