From d4b5382f70a24da428ae7a81c5e4a9743830842d Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 16:17:52 +0200 Subject: [PATCH 01/14] =?UTF-8?q?DTO=20f=C3=BCr=20/api/lists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../einkaufsliste/Dto/Get/ShoppingListsGetDTO.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java new file mode 100644 index 0000000..1a22b90 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java @@ -0,0 +1,11 @@ +package de.timaldinger.einkaufsliste.Dto.Get; + +import java.util.List; +import java.util.UUID; + +public record ShoppingListsGetDTO(List lists) { +} + +record ShoppingListOneGetDTO(String listName, UUID listID){ + +} \ No newline at end of file From e8d35385ca5ad07dd73039b1f1bf2fa61a242a23 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:11:48 +0200 Subject: [PATCH 02/14] implementierung von Mappern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit da wir sehr oft von Model zu DTO Mappen müssen, lohnt es sich eine seperate Mapperklasse zu erstellen --- .../Mapper/ShoppingCategoryMapper.java | 27 +++++++++++++++++++ .../Mapper/ShoppingItemMapper.java | 25 +++++++++++++++++ .../Mapper/ShoppingListMapper.java | 4 +++ 3 files changed, 56 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingCategoryMapper.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingCategoryMapper.java b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingCategoryMapper.java new file mode 100644 index 0000000..baff4c5 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingCategoryMapper.java @@ -0,0 +1,27 @@ +package de.timaldinger.einkaufsliste.Mapper; + +import de.timaldinger.einkaufsliste.Dto.Get.ShoppingCategoryGetDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class ShoppingCategoryMapper { + + @Autowired + ShoppingItemMapper shoppingItemMapper; + + public ShoppingCategoryGetDTO toGetDTO(ShoppingCategory category){ + return new ShoppingCategoryGetDTO( + category.getCategoryName(), + shoppingItemMapper.toGetDTOs(category.getItemsInCategory()), + category.getId() + ); + } + + public List toGetDTOs(List categories){ + return categories.stream().map(this::toGetDTO).toList(); + } +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java new file mode 100644 index 0000000..ab05806 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java @@ -0,0 +1,25 @@ +package de.timaldinger.einkaufsliste.Mapper; + +import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class ShoppingItemMapper { + public ShoppingItemGetDTO toGetDTO(ShoppingItem item){ + return new ShoppingItemGetDTO( + item.isDone(), + item.getItemName(), + item.getItemAmount(), + item.getList().getId(), + item.getCategory() != null ? item.getCategory().getId() : null, + item.getId() + ); + } + + public List toGetDTOs(List items){ + return items.stream().map(this::toGetDTO).toList(); + } +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java new file mode 100644 index 0000000..900da96 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java @@ -0,0 +1,4 @@ +package de.timaldinger.einkaufsliste.Mapper; + +public class ShoppingListMapper { +} From c0cddc3ef8781b0a07fd16ddadd449ac3d219da4 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:12:01 +0200 Subject: [PATCH 03/14] erstellen von getDTOs --- .../einkaufsliste/Dto/Get/ShoppingCategoryGetDTO.java | 7 +++++++ .../einkaufsliste/Dto/Get/ShoppingItemGetDTO.java | 6 ++++++ .../einkaufsliste/Dto/Get/ShoppingListGetDTO.java | 6 ++++++ .../einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java | 7 +++++++ .../einkaufsliste/Dto/Get/ShoppingListsGetDTO.java | 4 ---- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingCategoryGetDTO.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingItemGetDTO.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListGetDTO.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingCategoryGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingCategoryGetDTO.java new file mode 100644 index 0000000..d003698 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingCategoryGetDTO.java @@ -0,0 +1,7 @@ +package de.timaldinger.einkaufsliste.Dto.Get; + +import java.util.List; +import java.util.UUID; + +public record ShoppingCategoryGetDTO(String categoryName, List items, UUID categoryID) { +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingItemGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingItemGetDTO.java new file mode 100644 index 0000000..58bac65 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingItemGetDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto.Get; + +import java.util.UUID; + +public record ShoppingItemGetDTO(boolean status, String itemName, String itemAmount, UUID itemID, UUID categoryID, UUID listID) { +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListGetDTO.java new file mode 100644 index 0000000..243767d --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListGetDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto.Get; + +import java.util.List; + +public record ShoppingListGetDTO(List categories, List itemsNoCategory) { +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java new file mode 100644 index 0000000..877bb88 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java @@ -0,0 +1,7 @@ +package de.timaldinger.einkaufsliste.Dto.Get; + +import java.util.UUID; + +public record ShoppingListOneGetDTO(String listName, UUID listID){ + +} \ No newline at end of file diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java index 1a22b90..363fcd7 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java @@ -5,7 +5,3 @@ import java.util.UUID; public record ShoppingListsGetDTO(List lists) { } - -record ShoppingListOneGetDTO(String listName, UUID listID){ - -} \ No newline at end of file From df20f8c4263a63e834f483844297e46f2d5fed5f Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:12:30 +0200 Subject: [PATCH 04/14] Erstelen von item und category Service klassen sieht besser aus --- .../Service/ShoppingCategoryService.java | 26 +++++++++++++++++++ .../Service/ShoppingItemService.java | 16 ++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingCategoryService.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingCategoryService.java b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingCategoryService.java new file mode 100644 index 0000000..e573d32 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingCategoryService.java @@ -0,0 +1,26 @@ +package de.timaldinger.einkaufsliste.Service; + +import de.timaldinger.einkaufsliste.Dto.Get.ShoppingCategoryGetDTO; +import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException; +import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.UUID; + +@Service +public class ShoppingCategoryService { + + @Autowired + private ShoppingCategoryMapper shoppingCategoryMapper; + + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + + public ShoppingCategoryGetDTO getCategory(UUID categoryID){ + ShoppingCategory category = shoppingCategoryRepository.findById(categoryID).orElseThrow(() -> new ResourceNotFoundException("categoryID", categoryID)); + return shoppingCategoryMapper.toGetDTO(category); + } +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java new file mode 100644 index 0000000..08ab805 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java @@ -0,0 +1,16 @@ +package de.timaldinger.einkaufsliste.Service; + +import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO; +import org.springframework.stereotype.Service; + +import java.util.UUID; + +@Service +public class ShoppingItemService { + + + public ShoppingItemGetDTO getItem(UUID itemID){ + return null; + } + +} From c1bd997e33b37e10a2603ddc399b4549d07bb6ea Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:12:38 +0200 Subject: [PATCH 05/14] implementierung getLists und getList --- .../Service/ShoppingListService.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java index 9620159..46fd305 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java @@ -1,5 +1,10 @@ package de.timaldinger.einkaufsliste.Service; +import de.timaldinger.einkaufsliste.Dto.Get.*; +import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException; +import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper; +import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper; +import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; @@ -7,6 +12,7 @@ import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.UUID; @Service @@ -17,6 +23,10 @@ public class ShoppingListService { private ShoppingListRepository shoppingListRepository; @Autowired private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingCategoryMapper shoppingCategoryMapper; + @Autowired + private ShoppingItemMapper shoppingItemMapper; @Transactional public void deleteList(UUID listID){ @@ -24,4 +34,23 @@ public class ShoppingListService { shoppingCategoryRepository.deleteByListId(listID); shoppingListRepository.deleteById(listID); } + + public ShoppingListsGetDTO getLists(){ + return new ShoppingListsGetDTO(shoppingListRepository.findAll().stream() + .map(l -> new ShoppingListOneGetDTO(l.getListName(), l.getId())).toList()); + + } + + public ShoppingListGetDTO getList(UUID listID){ + + ShoppingList l = shoppingListRepository.findById(listID).orElseThrow( () -> new ResourceNotFoundException("listID", listID)); + + List categories = shoppingCategoryMapper.toGetDTOs(shoppingCategoryRepository.findByList(l)); + + List items = shoppingItemMapper.toGetDTOs(shoppingItemRepository.findByList_IdAndCategoryIsNull(listID)); + + return new ShoppingListGetDTO(categories,items); + } + + } From 7db358721dd7d513b5736306196039981f315bb1 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:12:52 +0200 Subject: [PATCH 06/14] category kann nach listen ID gefunden werden --- .../einkaufsliste/Repository/ShoppingCategoryRepository.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java index 2eb1bfa..ab9826b 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java @@ -12,7 +12,10 @@ import java.util.UUID; public interface ShoppingCategoryRepository extends JpaRepository{ List findByList(ShoppingList list); + List findByList_Id(UUID listID); @Modifying @Query("DELETE FROM ShoppingCategory c WHERE c.list.id = :listID") void deleteByListId(@Param("listID") UUID listID); + + } From 1c1d3f657193cef964203e908c79c9c6bf871194 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:43:08 +0200 Subject: [PATCH 07/14] getCategory implementiert --- .../Controller/ShoppingCategoryController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 0fbe6a5..23930d0 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -1,5 +1,6 @@ package de.timaldinger.einkaufsliste.Controller; +import de.timaldinger.einkaufsliste.Dto.Get.ShoppingCategoryGetDTO; import de.timaldinger.einkaufsliste.Dto.Post.ShoppingCategoryPostDTO; import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingCategoryPatchDTO; import de.timaldinger.einkaufsliste.Dto.Response.ShoppingCategoryResponseDTO; @@ -11,6 +12,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.ShoppingCategoryService; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -32,6 +34,14 @@ public class ShoppingCategoryController { @Autowired private ShoppingItemRepository shoppingItemRepository; + @Autowired + private ShoppingCategoryService shoppingCategoryService; + + @GetMapping("/api/categories/{categoryID}") + public ResponseEntity getCategory(@PathVariable UUID categoryID){ + return ResponseEntity.ok().body(shoppingCategoryService.getCategory(categoryID)); + } + @PostMapping("/api/categories") public ResponseEntity addCategory(@Valid @RequestBody ShoppingCategoryPostDTO newCategory){ From 4f387d2b7ff098796cb6490c12ee48d669d1b5c4 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:43:21 +0200 Subject: [PATCH 08/14] getItem implementiert --- .../Controller/ShoppingItemController.java | 17 ++++++++++++++--- .../Service/ShoppingItemService.java | 12 +++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java index 59b824a..fd38ba6 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java @@ -1,23 +1,23 @@ package de.timaldinger.einkaufsliste.Controller; +import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO; import de.timaldinger.einkaufsliste.Dto.Post.ShoppingItemPostDTO; import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingItemPatchDTO; import de.timaldinger.einkaufsliste.Dto.Response.ShoppingItemResponseDTO; import de.timaldinger.einkaufsliste.Exceptions.BadRequestException; import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException; +import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper; 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 jakarta.annotation.Resource; +import de.timaldinger.einkaufsliste.Service.ShoppingItemService; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import java.net.URI; @@ -33,6 +33,17 @@ public class ShoppingItemController { @Autowired private ShoppingItemRepository shoppingItemRepository; + @Autowired + private ShoppingItemService shoppingItemService; + + @Autowired + private ShoppingItemMapper shoppingItemMapper; + + @GetMapping("/api/items/{itemID}") + public ResponseEntity getItem(@PathVariable UUID itemID){ + return ResponseEntity.ok().body(shoppingItemService.getItem(itemID)); + } + @PostMapping("/api/items") public ResponseEntity addItem(@Valid @RequestBody ShoppingItemPostDTO newItem){ String name = newItem.itemName(); diff --git a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java index 08ab805..c3e6e91 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java @@ -1,6 +1,11 @@ package de.timaldinger.einkaufsliste.Service; import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO; +import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException; +import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper; +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.UUID; @@ -8,9 +13,14 @@ import java.util.UUID; @Service public class ShoppingItemService { + @Autowired + private ShoppingItemMapper shoppingItemMapper; + @Autowired + private ShoppingItemRepository shoppingItemRepository; public ShoppingItemGetDTO getItem(UUID itemID){ - return null; + ShoppingItem item = shoppingItemRepository.findById(itemID).orElseThrow(() -> new ResourceNotFoundException("itemID", itemID)); + return shoppingItemMapper.toGetDTO(item); } } From 4bbc1b73d5111f18a286a5f555481bde89ef191c Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:43:29 +0200 Subject: [PATCH 09/14] falsche reihenfolge gefixt --- .../timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java index ab05806..147c6f3 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingItemMapper.java @@ -13,9 +13,9 @@ public class ShoppingItemMapper { item.isDone(), item.getItemName(), item.getItemAmount(), - item.getList().getId(), + item.getId(), item.getCategory() != null ? item.getCategory().getId() : null, - item.getId() + item.getList().getId() ); } From 966705ec9094e8bd3e957fba0e38ae6cae89bab9 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:43:58 +0200 Subject: [PATCH 10/14] =?UTF-8?q?vorherige=20GetDTOs=20von=20List=20zusamm?= =?UTF-8?q?engef=C3=BChrt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java | 7 ------- .../einkaufsliste/Dto/Get/ShoppingListsGetDTO.java | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java deleted file mode 100644 index 877bb88..0000000 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListOneGetDTO.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.timaldinger.einkaufsliste.Dto.Get; - -import java.util.UUID; - -public record ShoppingListOneGetDTO(String listName, UUID listID){ - -} \ No newline at end of file diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java index 363fcd7..acde421 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java @@ -1,7 +1,7 @@ package de.timaldinger.einkaufsliste.Dto.Get; -import java.util.List; import java.util.UUID; -public record ShoppingListsGetDTO(List lists) { -} +public record ShoppingListsGetDTO(String listName, UUID listID){ + +} \ No newline at end of file From ea8ebf79b222680475c4106d6a21046c9a29a0b7 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:44:11 +0200 Subject: [PATCH 11/14] ListDTO Mapper implementiert --- .../Mapper/ShoppingListMapper.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java index 900da96..0cf7a09 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java @@ -1,4 +1,22 @@ package de.timaldinger.einkaufsliste.Mapper; +import de.timaldinger.einkaufsliste.Dto.Get.ShoppingListsGetDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component public class ShoppingListMapper { + + public List toListsGetDTOs(List list){ + return list.stream().map(this::toListsGetDTO).toList(); + } + + public ShoppingListsGetDTO toListsGetDTO(ShoppingList list){ + return new ShoppingListsGetDTO( + list.getListName(), + list.getId() + ); + } } From d373ecce2b00f3d9beea512e59180409f8464940 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:44:16 +0200 Subject: [PATCH 12/14] =?UTF-8?q?getLists=20=C3=BCberabreitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../einkaufsliste/Service/ShoppingListService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java index 46fd305..a7b2216 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java @@ -4,6 +4,7 @@ import de.timaldinger.einkaufsliste.Dto.Get.*; import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException; import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper; import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper; +import de.timaldinger.einkaufsliste.Mapper.ShoppingListMapper; import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; @@ -27,6 +28,8 @@ public class ShoppingListService { private ShoppingCategoryMapper shoppingCategoryMapper; @Autowired private ShoppingItemMapper shoppingItemMapper; + @Autowired + private ShoppingListMapper shoppingListMapper; @Transactional public void deleteList(UUID listID){ @@ -35,10 +38,8 @@ public class ShoppingListService { shoppingListRepository.deleteById(listID); } - public ShoppingListsGetDTO getLists(){ - return new ShoppingListsGetDTO(shoppingListRepository.findAll().stream() - .map(l -> new ShoppingListOneGetDTO(l.getListName(), l.getId())).toList()); - + public List getLists(){ + return shoppingListMapper.toListsGetDTOs(shoppingListRepository.findAll()); } public ShoppingListGetDTO getList(UUID listID){ From 0ac781114fc00bcc0c7ab06c84407e9ec30e65c8 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 17 Oct 2026 17:44:28 +0200 Subject: [PATCH 13/14] getlist und lilsts im cotnroller implementiert --- .../Controller/ShoppingListController.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index f72da78..92f9be5 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -1,10 +1,12 @@ package de.timaldinger.einkaufsliste.Controller; +import de.timaldinger.einkaufsliste.Dto.Get.*; import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingListPatchDTO; import de.timaldinger.einkaufsliste.Dto.Post.ShoppingListPostDTO; import de.timaldinger.einkaufsliste.Dto.Response.ShoppingListResponseDTO; import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException; -import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper; +import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper; import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; @@ -12,10 +14,8 @@ import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import de.timaldinger.einkaufsliste.Service.ShoppingListService; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import java.net.URI; @@ -34,6 +34,21 @@ public class ShoppingListController { @Autowired private ShoppingListService shoppingListService; + @Autowired + private ShoppingItemMapper shoppingItemMapper; + @Autowired + private ShoppingCategoryMapper shoppingCategoryMapper; + + @GetMapping("/api/lists") + public ResponseEntity> getLists(){ + return ResponseEntity.ok().body(shoppingListService.getLists()); + } + + @GetMapping("/api/lists/{listID}") + public ResponseEntity getList(@PathVariable UUID listID){ + return ResponseEntity.ok().body(shoppingListService.getList(listID)); + } + @PostMapping("/api/lists") public ResponseEntity addList(@Valid @RequestBody ShoppingListPostDTO newList){ ShoppingList list = new ShoppingList(newList.listName(), null, null, 0, 0); From 16775b45ee65c717ec8a9efb0e4521fc7055d611 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 19 Oct 2026 09:08:37 +0200 Subject: [PATCH 14/14] imports --- .../einkaufsliste/Controller/ShoppingCategoryController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 23930d0..69ae203 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -15,10 +15,8 @@ import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import de.timaldinger.einkaufsliste.Service.ShoppingCategoryService; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import java.net.URI;