diff options
Diffstat (limited to 'src/main')
3 files changed, 18 insertions, 14 deletions
diff --git a/src/main/java/dev/submelon/pantry/PantryItem.java b/src/main/java/dev/submelon/pantry/PantryItem.java index 459c3b7..97ab62d 100644 --- a/src/main/java/dev/submelon/pantry/PantryItem.java +++ b/src/main/java/dev/submelon/pantry/PantryItem.java @@ -17,7 +17,7 @@ import lombok.Setter; public class PantryItem { @Id @GeneratedValue(strategy=GenerationType.AUTO) - private Integer id; + private Long id; @Column(nullable=false) private String name; diff --git a/src/main/java/dev/submelon/pantry/PantryItemController.java b/src/main/java/dev/submelon/pantry/PantryItemController.java index 1968139..c1da12e 100644 --- a/src/main/java/dev/submelon/pantry/PantryItemController.java +++ b/src/main/java/dev/submelon/pantry/PantryItemController.java @@ -3,9 +3,10 @@ package dev.submelon.pantry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @Controller @@ -14,17 +15,20 @@ public class PantryItemController { @Autowired private PantryItemRepository itemRepository; - @PostMapping(path="/add") + @PutMapping(path="/{id}") @ResponseBody - Integer addNewItem(@RequestParam String name, @RequestParam String description, @RequestParam double quantity, @RequestParam String quantityUnitType) { - PantryItem item = new PantryItem(); - item.setName(name); - item.setDescription(description); - item.setQuantity(quantity); - item.setQuantityUnitType(quantityUnitType); - - PantryItem updatedItem = itemRepository.save(item); - return updatedItem.getId(); + PantryItem addNewItem(@RequestBody PantryItem item, @PathVariable Long id) { + return itemRepository.findById(id) + .map(existingItem -> { + existingItem.setName(item.getName()); + existingItem.setDescription(item.getDescription()); + existingItem.setQuantity(item.getQuantity()); + existingItem.setQuantityUnitType(item.getQuantityUnitType()); + return itemRepository.save(existingItem); + }) + .orElseGet(() -> { + return itemRepository.save(item); + }); } @GetMapping(path="") diff --git a/src/main/java/dev/submelon/pantry/PantryItemRepository.java b/src/main/java/dev/submelon/pantry/PantryItemRepository.java index 24b4bee..947ad6b 100644 --- a/src/main/java/dev/submelon/pantry/PantryItemRepository.java +++ b/src/main/java/dev/submelon/pantry/PantryItemRepository.java @@ -4,7 +4,7 @@ import java.util.Optional; import org.springframework.data.repository.CrudRepository; -public interface PantryItemRepository extends CrudRepository<PantryItem, Integer> { +public interface PantryItemRepository extends CrudRepository<PantryItem, Long> { Optional<PantryItem> findByName(String name); |
