From 5ba2472e72f3b29cf456c3f9fd7deeed45506c1c Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <khoerr@ksmpartners.com>
Date: Thu, 27 Jan 2022 15:27:03 -0500
Subject: Remove shortid; Add quantityUnitType

---
 src/main/java/dev/submelon/pantry/PantryItem.java           | 10 +++++-----
 src/main/java/dev/submelon/pantry/PantryItemController.java | 11 ++---------
 src/main/java/dev/submelon/pantry/PantryItemRepository.java |  4 +++-
 3 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/main/java/dev/submelon/pantry')

diff --git a/src/main/java/dev/submelon/pantry/PantryItem.java b/src/main/java/dev/submelon/pantry/PantryItem.java
index 36850bf..459c3b7 100644
--- a/src/main/java/dev/submelon/pantry/PantryItem.java
+++ b/src/main/java/dev/submelon/pantry/PantryItem.java
@@ -24,17 +24,17 @@ public class PantryItem {
 
     private String description;
     
-    @Column(unique=true, nullable=false)
-    private String shortid;
-
     @Column(nullable=false)
     private double quantity;
+
+    @Column(nullable=false)
+    private String quantityUnitType;
     
-    public PantryItem(String name, String description, String shortid, double quantity) {
+    public PantryItem(String name, String description, double quantity, String quantityUnitType) {
         this.name = name;
         this.description = description;
-        this.shortid = shortid;
         this.quantity = quantity;
+        this.quantityUnitType = quantityUnitType;
     }
 
 }
diff --git a/src/main/java/dev/submelon/pantry/PantryItemController.java b/src/main/java/dev/submelon/pantry/PantryItemController.java
index 37a71e9..1968139 100644
--- a/src/main/java/dev/submelon/pantry/PantryItemController.java
+++ b/src/main/java/dev/submelon/pantry/PantryItemController.java
@@ -3,7 +3,6 @@ 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.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -17,12 +16,12 @@ public class PantryItemController {
 
     @PostMapping(path="/add")
     @ResponseBody
-    Integer addNewItem(@RequestParam String name, @RequestParam String description, @RequestParam String shortid, @RequestParam double quantity) {
+    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.setShortid(shortid);
         item.setQuantity(quantity);
+        item.setQuantityUnitType(quantityUnitType);
 
         PantryItem updatedItem = itemRepository.save(item);
         return updatedItem.getId();
@@ -34,10 +33,4 @@ public class PantryItemController {
         return itemRepository.findAll();
     }
     
-    @GetMapping(path="/{shortid}")
-    @ResponseBody
-    PantryItem getByShortid(@PathVariable String shortid) {
-        return itemRepository.findByShortid(shortid).get();
-    }
-    
 }
diff --git a/src/main/java/dev/submelon/pantry/PantryItemRepository.java b/src/main/java/dev/submelon/pantry/PantryItemRepository.java
index 7808186..24b4bee 100644
--- a/src/main/java/dev/submelon/pantry/PantryItemRepository.java
+++ b/src/main/java/dev/submelon/pantry/PantryItemRepository.java
@@ -5,5 +5,7 @@ import java.util.Optional;
 import org.springframework.data.repository.CrudRepository;
 
 public interface PantryItemRepository extends CrudRepository<PantryItem, Integer> {
-    Optional<PantryItem> findByShortid(String shortid);
+
+    Optional<PantryItem> findByName(String name);
+
 }
-- 
cgit