added 'remove by id' option

iselab-dearborn · Feb 13, 2020 · 8c54ea6 · 8c54ea6
1 parent ab63d13
commit 8c54ea6
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
   <artifactId>grocery</artifactId>
   <groupId>org.iselab.grocery</groupId>
   <name>Grocery</name>

diff --git a/src/main/java/org/iselab/grocery/controller/ProductController.java b/src/main/java/org/iselab/grocery/controller/ProductController.java
@@ -56,6 +56,29 @@ public void listAll() {
         SystemUtils.pressEnterKeyToContinue();
     }
 
+    public void removeById() {
+
+        SystemUtils.clearScreen();
+
+        SystemUtils.printHeader("Products", "Remove by Id");
+
+        System.out.print("Id: ");
+
+        int id = SystemUtils.getIntFromKeyboard();
+
+        System.out.println("----------------");
+
+        Product removed = productRepository.removeById(id);
+
+        if (removed == null) {
+            System.out.println("Product not found");
+        } else {
+            System.out.println("Product " + removed.getName() + " was successfully removed");
+        }
+
+        SystemUtils.pressEnterKeyToContinue();
+    }
+
     public void searchByName() {
 
         SystemUtils.clearScreen();
@@ -95,17 +118,18 @@ public void start() {
         while (option != 9) {
 
             switch (option) {
-            case 1:
-                addProduct();
-                break;
-            case 2:
-                searchByName();
-                break;
-            case 4:
-                listAll();
-                break;
-            default:
-                break;
+                case 1:
+                    addProduct();
+                    break;
+                case 2:
+                    searchByName();
+                    break;
+                case 3:
+                    removeById();
+                    break;
+                case 4:
+                    listAll();
+                    break;
             }
 
             option = showMenu();

diff --git a/src/main/java/org/iselab/grocery/repository/ProductRepository.java b/src/main/java/org/iselab/grocery/repository/ProductRepository.java
@@ -16,6 +16,18 @@ public void save(Product product) {
     public List<Product> findAll() {
         return products;
     }
+
+    public Product findById(int id) {
+
+        for (Product product : products) {
+
+            if (product.getId() == id) {
+                return product;
+            }
+        }
+
+        return null;
+    }
 
     public List<Product> findByName(String name) {
 
@@ -30,4 +42,17 @@ public List<Product> findByName(String name) {
 
         return found;
     }
+
+    public Product removeById(int id) {
+
+        Product found = findById(id);
+
+        if (found == null) {
+            return null;
+        }
+
+        products.remove(found);
+
+        return found;
+    }
 }