diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 0fbe6a5..69ae203 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,12 +12,11 @@ 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; 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; @@ -32,6 +32,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){ 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/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); 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/ShoppingListsGetDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java new file mode 100644 index 0000000..acde421 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Get/ShoppingListsGetDTO.java @@ -0,0 +1,7 @@ +package de.timaldinger.einkaufsliste.Dto.Get; + +import java.util.UUID; + +public record ShoppingListsGetDTO(String listName, UUID listID){ + +} \ No newline at end of file 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..147c6f3 --- /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.getId(), + item.getCategory() != null ? item.getCategory().getId() : null, + item.getList().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..0cf7a09 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Mapper/ShoppingListMapper.java @@ -0,0 +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() + ); + } +} 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); + + } 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..c3e6e91 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingItemService.java @@ -0,0 +1,26 @@ +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; + +@Service +public class ShoppingItemService { + + @Autowired + private ShoppingItemMapper shoppingItemMapper; + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + public ShoppingItemGetDTO getItem(UUID itemID){ + ShoppingItem item = shoppingItemRepository.findById(itemID).orElseThrow(() -> new ResourceNotFoundException("itemID", itemID)); + return shoppingItemMapper.toGetDTO(item); + } + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java index 9620159..a7b2216 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Service/ShoppingListService.java @@ -1,5 +1,11 @@ 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.Mapper.ShoppingListMapper; +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 +13,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 +24,12 @@ public class ShoppingListService { private ShoppingListRepository shoppingListRepository; @Autowired private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingCategoryMapper shoppingCategoryMapper; + @Autowired + private ShoppingItemMapper shoppingItemMapper; + @Autowired + private ShoppingListMapper shoppingListMapper; @Transactional public void deleteList(UUID listID){ @@ -24,4 +37,21 @@ public class ShoppingListService { shoppingCategoryRepository.deleteByListId(listID); shoppingListRepository.deleteById(listID); } + + public List getLists(){ + return shoppingListMapper.toListsGetDTOs(shoppingListRepository.findAll()); + } + + 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); + } + + }