From f4822ceb4d6e562c1cd50ff6311858d502a4a741 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 13:56:01 +0200 Subject: [PATCH] =?UTF-8?q?refactor,=20Pr=C3=A4fix=20ShoppingList=20->=20S?= =?UTF-8?q?hopping?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PageController.java | 13 ++++---- .../Controller/ShoppingListController.java | 33 +++++++++---------- .../einkaufsliste/Dto/ShoppingItemDTO.java | 6 ++++ .../Dto/ShoppingListItemDTO.java | 6 ---- ...istCategory.java => ShoppingCategory.java} | 4 +-- ...hoppingListItem.java => ShoppingItem.java} | 4 +-- .../ShoppingCategoryRepository.java | 13 ++++++++ .../Repository/ShoppingItemRepository.java | 12 +++++++ .../ShoppingListCategoryRepository.java | 13 -------- .../ShoppingListItemRepository.java | 13 -------- 10 files changed, 56 insertions(+), 61 deletions(-) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java delete mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java rename src/main/java/de/timaldinger/einkaufsliste/Models/{ShoppingListCategory.java => ShoppingCategory.java} (82%) rename src/main/java/de/timaldinger/einkaufsliste/Models/{ShoppingListItem.java => ShoppingItem.java} (86%) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java delete mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java delete mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index 2e4820a..7105e56 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -1,8 +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.ShoppingCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +10,6 @@ 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 @@ -21,10 +20,10 @@ public class PageController { private ShoppingListRepository shoppingListRepository; @Autowired - private ShoppingListCategoryRepository shoppingListCategoryRepository; + private ShoppingCategoryRepository shoppingCategoryRepository; @Autowired - private ShoppingListItemRepository shoppingListItemRepository; + private ShoppingItemRepository shoppingItemRepository; @PostMapping("api/list") public String addList(@Valid @ModelAttribute ShoppingList newList){ @@ -54,8 +53,8 @@ public class PageController { public String list(Model model, @PathVariable UUID id){ ShoppingList list = shoppingListRepository.findById(id).orElseThrow(); model.addAttribute("list", list); - model.addAttribute("categories", shoppingListCategoryRepository.findByShoppingList(list)); - model.addAttribute("items", shoppingListItemRepository.findByListAndCategoryIsNull(list)); + model.addAttribute("categories", shoppingCategoryRepository.findByShoppingList(list)); + model.addAttribute("items", shoppingItemRepository.findByListAndCategoryIsNull(list)); return "list"; } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index eee6d1b..ab8004c 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -1,20 +1,17 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; -import de.timaldinger.einkaufsliste.Dto.ShoppingListItemDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO; import de.timaldinger.einkaufsliste.Models.ShoppingList; -import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; -import de.timaldinger.einkaufsliste.Models.ShoppingListItem; -import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository; -import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +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.http.HttpStatus; -import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import org.thymeleaf.expression.Lists; import java.util.List; import java.util.UUID; @@ -23,21 +20,21 @@ import java.util.UUID; public class ShoppingListController { @Autowired - private ShoppingListCategoryRepository shoppingListCategoryRepository; + private ShoppingCategoryRepository shoppingCategoryRepository; @Autowired private ShoppingListRepository shoppingListRepository; @Autowired - private ShoppingListItemRepository shoppingListItemRepository; + private ShoppingItemRepository shoppingItemRepository; @PostMapping("/api/list/{listID}/category/") - public ShoppingListCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ + public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ String name = newCategory.categoryName(); ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); - ShoppingListCategory category = new ShoppingListCategory(name, List.of(),list); + ShoppingCategory category = new ShoppingCategory(name, List.of(),list); - shoppingListCategoryRepository.save(category); + shoppingCategoryRepository.save(category); return category; } @@ -46,9 +43,9 @@ public class ShoppingListController { public ShoppingListItem addItem(@PathVariable UUID listID, @RequestBody ShoppingListItemDTO newItem){ String name = newItem.itemName(); String amount = newItem.itemAmount(); - ShoppingListCategory c; + ShoppingCategory c; if(newItem.categoryID() != null){ - c = shoppingListCategoryRepository.findById(newItem.categoryID()).orElseThrow(); + c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(); }else{ c = null; } @@ -60,10 +57,10 @@ public class ShoppingListController { @DeleteMapping("/api/item/{itemID}") public ResponseEntity deleteItem(@PathVariable UUID itemID){ - if(!shoppingListItemRepository.existsById(itemID)){ + if(!shoppingItemRepository.existsById(itemID)){ return ResponseEntity.notFound().build(); } - shoppingListItemRepository.deleteById(itemID); + shoppingItemRepository.deleteById(itemID); return ResponseEntity.noContent().build(); } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java new file mode 100644 index 0000000..3626d9a --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingItemDTO(String itemName, String itemAmount, UUID categoryID, UUID listID){ +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java deleted file mode 100644 index 970a34f..0000000 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java +++ /dev/null @@ -1,6 +0,0 @@ -package de.timaldinger.einkaufsliste.Dto; - -import java.util.UUID; - -public record ShoppingListItemDTO (String itemName, String itemAmount, UUID categoryID){ -} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java similarity index 82% rename from src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java rename to src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java index c9d8e87..2141ddb 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java @@ -14,12 +14,12 @@ import java.util.List; @Entity @AllArgsConstructor @NoArgsConstructor -public class ShoppingListCategory extends ShoppingElement{ +public class ShoppingCategory extends ShoppingElement{ @NotBlank private String categoryName; @OneToMany(mappedBy = "category") - private List itemsInCategory; + private List itemsInCategory; @ManyToOne @JoinColumn(name="list_id", nullable = false) private ShoppingList shoppingList; diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java similarity index 86% rename from src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java rename to src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java index 84db48e..67567c7 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java @@ -14,7 +14,7 @@ import lombok.Setter; @Entity @AllArgsConstructor @NoArgsConstructor -public class ShoppingListItem extends ShoppingElement { +public class ShoppingItem extends ShoppingElement { @NotBlank private String itemName; @@ -23,7 +23,7 @@ public class ShoppingListItem extends ShoppingElement { @ManyToOne @JoinColumn(name = "category_id", nullable = true) - private ShoppingListCategory category; + private ShoppingCategory category; @ManyToOne @JoinColumn(name = "list_id", nullable = false) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java new file mode 100644 index 0000000..ad361f8 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java @@ -0,0 +1,13 @@ +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 java.util.List; +import java.util.UUID; + +public interface ShoppingCategoryRepository extends JpaRepository{ + List findByShoppingList(ShoppingList list); + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java new file mode 100644 index 0000000..4c17a06 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -0,0 +1,12 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.UUID; + +public interface ShoppingItemRepository extends JpaRepository { + + List findByListAndCategoryIsNull(Object list); +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java deleted file mode 100644 index 54e4a9f..0000000 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.timaldinger.einkaufsliste.Repository; - -import de.timaldinger.einkaufsliste.Models.ShoppingList; -import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.UUID; - -public interface ShoppingListCategoryRepository extends JpaRepository{ - List findByShoppingList(ShoppingList list); - -} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java deleted file mode 100644 index 6193528..0000000 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.timaldinger.einkaufsliste.Repository; - -import de.timaldinger.einkaufsliste.Models.ShoppingElement; -import de.timaldinger.einkaufsliste.Models.ShoppingListItem; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.UUID; - -public interface ShoppingListItemRepository extends JpaRepository { - - List findByListAndCategoryIsNull(Object list); -}