From 9b442e7828fda024c0bf1e80d6508b8f2810617a Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 11 Oct 2026 11:00:54 +0200 Subject: [PATCH] refactor von api-endpukten --- .../Controller/ShoppingCategoryController.java | 6 +++--- .../Controller/ShoppingItemController.java | 10 +++++----- .../Controller/ShoppingListController.java | 6 +++--- .../resources/static/js/pages/index/api/indexAPI.js | 6 +++--- .../resources/static/js/pages/list/api/categoryAPI.js | 6 +++--- src/main/resources/static/js/pages/list/api/itemAPI.js | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 7db0eec..e2b0d48 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -27,7 +27,7 @@ public class ShoppingCategoryController { @Autowired private ShoppingItemRepository shoppingItemRepository; - @PostMapping("/api/category") + @PostMapping("/api/categories") public ShoppingCategoryResponseDTO addCategory(@RequestBody ShoppingCategoryPostDTO newCategory){ String name = newCategory.categoryName(); @@ -40,7 +40,7 @@ public class ShoppingCategoryController { return new ShoppingCategoryResponseDTO(name, category.getId()); } - @PatchMapping("/api/category/{categoryID}") + @PatchMapping("/api/categories/{categoryID}") public ResponseEntity editCategory(@PathVariable UUID categoryID,@RequestBody ShoppingCategoryPatchDTO toChange){ ShoppingCategory category = shoppingCategoryRepository.findById(categoryID).orElseThrow(); @@ -52,7 +52,7 @@ public class ShoppingCategoryController { } - @DeleteMapping("/api/category/{categoryID}") + @DeleteMapping("/api/categories/{categoryID}") public ResponseEntity deleteCategory(@PathVariable UUID categoryID, @RequestParam(required = false) Boolean deleteAllItems){ if(deleteAllItems == null){ diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java index 63595ba..88de5f3 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java @@ -25,7 +25,7 @@ public class ShoppingItemController { @Autowired private ShoppingItemRepository shoppingItemRepository; - @PostMapping("/api/item") + @PostMapping("/api/items") public ShoppingItemResponseDTO addItem(@RequestBody ShoppingItemPostDTO newItem){ String name = newItem.itemName(); String amount = newItem.itemAmount(); @@ -42,7 +42,7 @@ public class ShoppingItemController { return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null); } - @PatchMapping("/api/item/{itemID}") + @PatchMapping("/api/items/{itemID}") public ResponseEntity editItem(@PathVariable UUID itemID ,@RequestBody ShoppingItemPatchDTO toChange){ ShoppingItem item = shoppingItemRepository.findById(itemID).orElseThrow(); @@ -56,7 +56,7 @@ public class ShoppingItemController { return ResponseEntity.noContent().build(); } - @DeleteMapping("/api/item/{itemID}") + @DeleteMapping("/api/items/{itemID}") public ResponseEntity deleteItem(@PathVariable UUID itemID){ if(!shoppingItemRepository.existsById(itemID)){ return ResponseEntity.notFound().build(); @@ -66,8 +66,8 @@ public class ShoppingItemController { } - @DeleteMapping("/api/item") - public ResponseEntity deleteAllDoneItems(@RequestParam UUID listID, @RequestParam boolean done){ + @DeleteMapping("/api/lists/{listID}/items") + public ResponseEntity deleteAllDoneItems(@PathVariable UUID listID, @RequestParam boolean done){ if(!done) return ResponseEntity.badRequest().build(); List items = shoppingItemRepository.findByList_IdAndIsDoneIsTrue(listID); diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index ae09c8a..a2b0185 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -28,7 +28,7 @@ public class ShoppingListController { @Autowired private ShoppingListService shoppingListService; - @PostMapping("/api/list") + @PostMapping("/api/lists") public ShoppingListResponseDTO addList(@RequestBody ShoppingListPostDTO newList){ ShoppingList list = new ShoppingList(newList.listName(), null, null, 0, 0); @@ -36,13 +36,13 @@ public class ShoppingListController { return new ShoppingListResponseDTO(list.getListName(), list.getId()); } - @DeleteMapping("/api/list/{listID}") + @DeleteMapping("/api/lists/{listID}") public ResponseEntity deleteList(@PathVariable UUID listID){ shoppingListService.deleteList(listID); return ResponseEntity.noContent().build(); } - @PatchMapping("/api/list/{listID}") + @PatchMapping("/api/lists/{listID}") public ResponseEntity editList(@PathVariable UUID listID,@RequestBody ShoppingListPatchDTO toChange){ ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); 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 32966f9..b7b1580 100644 --- a/src/main/resources/static/js/pages/index/api/indexAPI.js +++ b/src/main/resources/static/js/pages/index/api/indexAPI.js @@ -2,7 +2,7 @@ export async function addList(listName) { - const response = await fetch(`/api/list`, + const response = await fetch(`/api/lists`, { method: "POST", body: JSON.stringify({ listName: listName }), @@ -14,7 +14,7 @@ export async function addList(listName) { } export async function deleteList(id) { - const response = await fetch(`/api/list/${id}`, { method: "DELETE" }); + const response = await fetch(`/api/lists/${id}`, { method: "DELETE" }); return response; } @@ -22,7 +22,7 @@ export async function deleteList(id) { export async function editList(listID, toChange) { - const response = await fetch(`/api/list/${listID}`, + const response = await fetch(`/api/lists/${listID}`, { method: "PATCH", body: JSON.stringify(toChange), diff --git a/src/main/resources/static/js/pages/list/api/categoryAPI.js b/src/main/resources/static/js/pages/list/api/categoryAPI.js index bd328e8..f1b77c3 100644 --- a/src/main/resources/static/js/pages/list/api/categoryAPI.js +++ b/src/main/resources/static/js/pages/list/api/categoryAPI.js @@ -1,5 +1,5 @@ export async function addCategory(listID, categoryName) { - const newCategory = await fetch(`/api/category`, + const newCategory = await fetch(`/api/categories`, { method: "POST" , body: JSON.stringify({ "categoryName": categoryName, "listID": listID }) @@ -10,7 +10,7 @@ export async function addCategory(listID, categoryName) { export async function editCategory(categoryID, toChange) { - const response = await fetch(`/api/category/${categoryID}`, + const response = await fetch(`/api/categories/${categoryID}`, { method: "PATCH", body: JSON.stringify(toChange), @@ -21,7 +21,7 @@ export async function editCategory(categoryID, toChange) { } export async function deleteCategory(deleteAllItems, categoryID) { - const response = await fetch(`/api/category/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" }); + const response = await fetch(`/api/categories/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" }); if (response.status == 204) { console.log(`deleted item ${categoryID}`); 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 9113a8c..86f5108 100644 --- a/src/main/resources/static/js/pages/list/api/itemAPI.js +++ b/src/main/resources/static/js/pages/list/api/itemAPI.js @@ -1,7 +1,7 @@ export async function addItem(listID, itemName, itemAmount, categoryID) { - const newItem = await fetch(`/api/item`, + const newItem = await fetch(`/api/items`, { method: "POST", body: JSON.stringify({ @@ -20,7 +20,7 @@ export async function addItem(listID, itemName, itemAmount, categoryID) { export async function deleteItem(itemID) { - const response = await fetch(`/api/item/${itemID}`, { method: "DELETE" }); + const response = await fetch(`/api/items/${itemID}`, { method: "DELETE" }); if (response.status == 204) { console.log(`deleted item ${itemID}`); @@ -31,7 +31,7 @@ export async function deleteItem(itemID) { } export async function editItem(itemID, toChange) { - const response = await fetch(`/api/item/${itemID}`, + const response = await fetch(`/api/items/${itemID}`, { method: "PATCH", body: JSON.stringify(toChange), @@ -43,7 +43,7 @@ export async function editItem(itemID, toChange) { export async function deleteAllDoneItems(listID) { - const response = await fetch(`/api/item?listID=${listID}&done=true`, { method: "DELETE" }); + const response = await fetch(`/api/lists/${listID}/items?done=true`, { method: "DELETE" }); if (response.status == 204) { console.log(`items have been deleted`);