From 02a5139e29afadb9527924cb6d79157d16e5a5d0 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:06:05 +0200 Subject: [PATCH] =?UTF-8?q?API=20Endpunkt=20umbenannt,=20Repositories=20vo?= =?UTF-8?q?n=20Item=20und=20Category=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PageController.java | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index a2f0703..2e4820a 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -1,6 +1,8 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -8,15 +10,23 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; +import java.util.Optional; import java.util.UUID; @Controller @RequestMapping("/") public class PageController { - @Autowired - private ShoppingListRepository repository; - @PostMapping("/list") + @Autowired + private ShoppingListRepository shoppingListRepository; + + @Autowired + private ShoppingListCategoryRepository shoppingListCategoryRepository; + + @Autowired + private ShoppingListItemRepository shoppingListItemRepository; + + @PostMapping("api/list") public String addList(@Valid @ModelAttribute ShoppingList newList){ shoppingListRepository.save(newList); return "redirect:/"; @@ -28,15 +38,24 @@ public class PageController { return "index"; } - @DeleteMapping("/list/{id}") + @DeleteMapping("/api/list/{id}") public String deleteList(Model model, @PathVariable UUID id){ shoppingListRepository.deleteById(id); return "redirect:/"; } + /** + * Gibt die list.html Seite einer Liste zurück mit den Attributen list, categories und items + * @param model + * @param id + * @return + */ @GetMapping("/list/{id}") public String list(Model model, @PathVariable UUID id){ - model.addAttribute("list", repository.findById(id)); + ShoppingList list = shoppingListRepository.findById(id).orElseThrow(); + model.addAttribute("list", list); + model.addAttribute("categories", shoppingListCategoryRepository.findByShoppingList(list)); + model.addAttribute("items", shoppingListItemRepository.findByListAndCategoryIsNull(list)); return "list"; } }