diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java new file mode 100644 index 0000000..83e24a4 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -0,0 +1,41 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.UUID; + +@RestController +public class ShoppingCategoryController { + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + @PostMapping("/api/list/{listID}/category/") + public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ + + String name = newCategory.categoryName(); + ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); + + ShoppingCategory category = new ShoppingCategory(name, List.of(),list); + + shoppingCategoryRepository.save(category); + + return category; + } + + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java new file mode 100644 index 0000000..a9eb767 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java @@ -0,0 +1,51 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO; +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@RestController +public class ShoppingItemController { + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + @PostMapping("/api/item") + public ShoppingItemResponseDTO addItem(@RequestBody ShoppingItemDTO newItem){ + String name = newItem.itemName(); + String amount = newItem.itemAmount(); + ShoppingCategory c; + if(newItem.categoryID() != null){ + c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(); + }else{ + c = null; + } + ShoppingList list = shoppingListRepository.findById(newItem.listID()).orElseThrow(); + ShoppingItem item = new ShoppingItem(name, amount, false, c, list); + shoppingItemRepository.save(item); + + return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null); + } + + @DeleteMapping("/api/item/{itemID}") + public ResponseEntity deleteItem(@PathVariable UUID itemID){ + if(!shoppingItemRepository.existsById(itemID)){ + return ResponseEntity.notFound().build(); + } + shoppingItemRepository.deleteById(itemID); + return ResponseEntity.noContent().build(); + } +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index 142a0e2..1f30f38 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -26,42 +26,5 @@ public class ShoppingListController { @Autowired private ShoppingItemRepository shoppingItemRepository; - @PostMapping("/api/list/{listID}/category/") - public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ - String name = newCategory.categoryName(); - ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); - - ShoppingCategory category = new ShoppingCategory(name, List.of(),list); - - shoppingCategoryRepository.save(category); - - return category; - } - - @PostMapping("/api/item") - public ShoppingItemResponseDTO addItem(@RequestBody ShoppingItemDTO newItem){ - String name = newItem.itemName(); - String amount = newItem.itemAmount(); - ShoppingCategory c; - if(newItem.categoryID() != null){ - c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(); - }else{ - c = null; - } - ShoppingList list = shoppingListRepository.findById(newItem.listID()).orElseThrow(); - ShoppingItem item = new ShoppingItem(name, amount, false, c, list); - shoppingItemRepository.save(item); - - return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null); - } - - @DeleteMapping("/api/item/{itemID}") - public ResponseEntity deleteItem(@PathVariable UUID itemID){ - if(!shoppingItemRepository.existsById(itemID)){ - return ResponseEntity.notFound().build(); - } - shoppingItemRepository.deleteById(itemID); - return ResponseEntity.noContent().build(); - } }