Move Item to use shortid

4 files changed, 25 insertions, 9 deletions

diff --git a/src/main/java/dev/submelon/pantry/Item.java b/src/main/java/dev/submelon/pantry/Item.java
index bdd4631..a17f5a1 100644
--- a/src/main/java/dev/submelon/pantry/Item.java
+++ b/src/main/java/dev/submelon/pantry/Item.java
@@ -1,5 +1,6 @@
 package dev.submelon.pantry;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -11,18 +12,24 @@ public class Item {
     @GeneratedValue(strategy=GenerationType.AUTO)
     private Integer id;
 
+    @Column(nullable=false)
     private String name;
 
     private String description;
+    
+    @Column(unique=true, nullable=false)
+    private String shortid;
 
+    @Column(nullable=false)
     private double quantity;
     
     public Item() {
     }
     
-    public Item(String name, String description, double quantity) {
+    public Item(String name, String description, String shortid, double quantity) {
         this.name = name;
         this.description = description;
+        this.shortid = shortid;
         this.quantity = quantity;
     }
 
@@ -50,6 +57,14 @@ public class Item {
         this.description = description;
     }
 
+    public String getShortid() {
+        return shortid;
+    }
+
+    public void setShortid(String shortid) {
+        this.shortid = shortid;
+    }
+
     public double getQuantity() {
         return quantity;
     }
diff --git a/src/main/java/dev/submelon/pantry/ItemController.java b/src/main/java/dev/submelon/pantry/ItemController.java
index 778f93b..bac1a9c 100644
--- a/src/main/java/dev/submelon/pantry/ItemController.java
+++ b/src/main/java/dev/submelon/pantry/ItemController.java
@@ -10,30 +10,31 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-@RequestMapping(path="/item")
+@RequestMapping(path="/items")
 public class ItemController {
     @Autowired
     private ItemRepository itemRepository;
 
     @PostMapping(path="/add")
-    public @ResponseBody String addNewItem (@RequestParam String name, @RequestParam String description, @RequestParam double quantity) {
+    public @ResponseBody String addNewItem (@RequestParam String name, @RequestParam String description, @RequestParam String shortid, @RequestParam double quantity) {
         Item item = new Item();
         item.setName(name);
         item.setDescription(description);
+        item.setShortid(shortid);
         item.setQuantity(quantity);
 
         itemRepository.save(item);
         return "Ok";
     }
 
-    @GetMapping(path="/all")
+    @GetMapping(path="")
     public @ResponseBody Iterable<Item> getAllItems() {
         return itemRepository.findAll();
     }
     
-    @GetMapping(path="/name/{name}")
-    public @ResponseBody Item getByName(@PathVariable String name) {
-        return itemRepository.findByName(name);
+    @GetMapping(path="/{shortid}")
+    public @ResponseBody Item getByShortid(@PathVariable String shortid) {
+        return itemRepository.findByShortid(shortid);
     }
     
 }
diff --git a/src/main/java/dev/submelon/pantry/ItemRepository.java b/src/main/java/dev/submelon/pantry/ItemRepository.java
index f1fd3f0..01451e3 100644
--- a/src/main/java/dev/submelon/pantry/ItemRepository.java
+++ b/src/main/java/dev/submelon/pantry/ItemRepository.java
@@ -3,5 +3,5 @@ package dev.submelon.pantry;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ItemRepository extends CrudRepository<Item, Integer> {
-    Item findByName(String name);
+    Item findByShortid(String shortid);
 }
diff --git a/src/main/java/dev/submelon/pantry/PantryApplication.java b/src/main/java/dev/submelon/pantry/PantryApplication.java
index f63fd04..71f31a8 100644
--- a/src/main/java/dev/submelon/pantry/PantryApplication.java
+++ b/src/main/java/dev/submelon/pantry/PantryApplication.java
@@ -11,7 +11,7 @@ public class PantryApplication {
 
   @RequestMapping("/")
   public String home() {
-    return "Check this out: http://localhost:8080/item/all";
+    return "Check this out: http://localhost:8080/items/";
   }
 
   public static void main(String[] args) {