Merge pull request #90 from comp3053/hot_fix

Hot fix
comp3053 · May 13, 2019 · 0d7728b · 0d7728b
2 parents cc73488 + bd863e2
commit 0d7728b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/model/Recipe.java b/src/model/Recipe.java
@@ -215,7 +215,7 @@ public boolean insert() {
     @Override
     public boolean delete() {
         DatabaseHelper dbHelper = new DatabaseHelper();
-        boolean status;
+        boolean status = true;
         String query = String.format("DELETE FROM Recipe WHERE Recipe_ID=%d", this.getID());
 
         try {
@@ -225,13 +225,9 @@ public boolean delete() {
             e.printStackTrace();
             return false;
         }
-        for (RecipeIngredient ingredient : ingredients) {
-            status = ingredient.delete();
-            if (!status)
-                return false;
-        }
+        status = RecipeIngredient.deleteAll(this.getID());
         notifyListener();
-        return true;
+        return status;
     }
 
     @Override

diff --git a/src/model/RecipeForm.java b/src/model/RecipeForm.java
@@ -35,12 +35,6 @@ public boolean save() {
 
     private boolean insert() {
         recipe.setIngredients(recipeIngredients);
-        try {
-            recipe.amountConversion(batchSize, 1000);
-        } catch (InvalidInputException e) {
-            e.printStackTrace();
-            return false;
-        }
         return recipe.insert();
     }