Merge pull request nusCS2113-AY1920S1#14 from 9hafidz6/master

added recipeCommand package
x3chillax · Oct 17, 2019 · f189a12 · f189a12
2 parents 19ff140 + 9bdd686
commit f189a12
Show file tree

Hide file tree

Showing 24 changed files with 398 additions and 120 deletions.
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
@@ -3,7 +3,8 @@
 import duke.command.Command;
 import duke.exception.DukeException;
 import duke.parser.Parser;
-import duke.recipebook.dishlist;
+import duke.recipeCommand.RecipeCommand;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.TaskList;
 import duke.ui.Ui;
@@ -16,14 +17,14 @@ public class Duke {
     private Storage storage;
     private TaskList tasks;
     private Ui ui;
-    private dishlist dish;
+    private DishList dish;
 
     /**
      * The constructor method for Duke.
      * @param filePath used to specify the location of the file in the hard disc.
      */
     public Duke(String filePath) {
-        dish = new dishlist();
+        dish = new DishList();
         ui = new Ui();
         storage = new Storage(filePath);
         try {
@@ -45,6 +46,7 @@ public void run() {
                 String fullCommand = ui.readCommand();
                 ui.showLine();
                 Command c = Parser.parse(fullCommand, tasks.size());
+//                RecipeCommand c = Parser.Parse(fullCommand); //execute the recipeCommands, add dishes etc
                 c.execute(dish, tasks, ui, storage);
                 isExit = c.isExit();
             } catch (DukeException e) {

diff --git a/src/main/java/duke/command/AddCommand.java b/src/main/java/duke/command/AddCommand.java
@@ -1,8 +1,9 @@
 package duke.command;
 
 import duke.exception.DukeException;
-import duke.recipebook.dishes;
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
+import duke.recipebook.Dishes;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
@@ -16,7 +17,6 @@
 public class AddCommand extends Command {
 
     private Task task;
-    private dishes dish;
 
     /**
      * The constructor method for AddCommand.
@@ -27,28 +27,24 @@ public AddCommand(Task task) {
         this.task = task;
     }
 
-    public AddCommand(dishes dish) {
-        this.dish = dish;
-    }
-
     /**
      * Public method used to add the task in the taskList, and write it on the hard disc.
      *
+     *
+     * @param dish1
      * @param taskList the {@link TaskList} to be expanded
      * @param ui       {@link Ui} used for printing the task output
      * @param storage  {@link Storage} writes in the file on the hard disc
      * @throws DukeException Error while adding the command to the duke.txt file
      */
     @Override
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
         taskList.addTask(task);
-        dish1.addDish(dish); // add dish into list found in dishes class
-        System.out.println("\t dish added: " + dish.toString() + "\n\t amount :" + dish.getAmount());
-//        ui.showAddCommand(task.toString(), taskList.size());
-//        try {
-//            storage.addCommandInFile(task.printInFile());
-//        } catch (IOException e) {
-//            throw new DukeException("Error while adding the command to the duke.txt file");
-//        }
+        ui.showAddCommand(task.toString(), taskList.size());
+        try {
+            storage.addCommandInFile(task.printInFile());
+        } catch (IOException e) {
+            throw new DukeException("Error while adding the command to the duke.txt file");
+        }
     }
 }
diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java
@@ -1,7 +1,8 @@
 package duke.command;
 
 import duke.exception.DukeException;
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.TaskList;
 import duke.ui.Ui;
@@ -11,7 +12,7 @@
  */
 public abstract class Command {
 
-    public abstract void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException;
+    public abstract void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException;
 
     /**
      * Returns the boolean indicating that it is( not) an {@link ExitCommand}.

diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java
@@ -1,7 +1,8 @@
 package duke.command;
 
 import duke.exception.DukeException;
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
@@ -24,7 +25,7 @@ public DeleteCommand(int taskNb) {
     }
 
     @Override
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
         if (taskNb < taskList.size() && taskNb >= 0) {
             Task removed = taskList.removeTask(taskNb);
             List<String> fileContent = null;

diff --git a/src/main/java/duke/command/DoneCommand.java b/src/main/java/duke/command/DoneCommand.java
@@ -1,7 +1,7 @@
 package duke.command;
 
 import duke.exception.DukeException;
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
@@ -18,7 +18,7 @@ public DoneCommand(int taskNb) {
     }
 
     @Override
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
         if (taskNb < taskList.size() && taskNb >= 0) {
             taskList.markTaskDone(taskNb);
             ui.showMarkDone(taskList.getTask(taskNb).toString());

diff --git a/src/main/java/duke/command/ExitCommand.java b/src/main/java/duke/command/ExitCommand.java
@@ -1,6 +1,6 @@
 package duke.command;
 
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.TaskList;
 import duke.ui.Ui;
@@ -16,7 +16,7 @@ public boolean isExit() {
     }
 
     @Override
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) {
         System.out.println("\t Bye. Hope to see you again soon!");
     }
 }
diff --git a/src/main/java/duke/command/FindToday.java b/src/main/java/duke/command/FindToday.java
@@ -1,6 +1,6 @@
 package duke.command;
 
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
@@ -21,7 +21,7 @@ public boolean isExit() {
         return false;
     }
 
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) {
         int i = 1;
         StringBuilder sb = new StringBuilder();
 

diff --git a/src/main/java/duke/command/InitCommand.java b/src/main/java/duke/command/InitCommand.java
@@ -1,11 +1,10 @@
 package duke.command;
 
 import duke.exception.DukeException;
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.TaskList;
 import duke.ui.Ui;
-import duke.recipebook.dishes;
 
 public class InitCommand extends Command {
 
@@ -16,7 +15,7 @@ public InitCommand() {
     }
 
     @Override
-    public void execute(dishlist dish, TaskList taskList, Ui ui, Storage storage) throws DukeException {
+    public void execute(DishList dish, TaskList taskList, Ui ui, Storage storage) throws DukeException {
         //something
     }
 }
diff --git a/src/main/java/duke/command/ListCommand.java b/src/main/java/duke/command/ListCommand.java
@@ -1,7 +1,7 @@
 package duke.command;
 
 import duke.exception.DukeException;
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.TaskList;
 import duke.ui.Ui;
@@ -12,7 +12,7 @@
 public class ListCommand extends Command {
 
     @Override
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
         if (taskList.size() == 0) {
             throw new DukeException("No tasks yet!");
         } else {

diff --git a/src/main/java/duke/command/RemindCommand.java b/src/main/java/duke/command/RemindCommand.java
@@ -1,7 +1,7 @@
 package duke.command;
 
 import duke.exception.DukeException;
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.TaskList;
 import duke.ui.Ui;
@@ -21,7 +21,7 @@ public RemindCommand() {
     }
 
     @Override
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
         int num = 1;
         LocalDate date = LocalDate.now();
         LocalDate date1 = date.plusDays(5);

diff --git a/src/main/java/duke/command/Snooze.java b/src/main/java/duke/command/Snooze.java
@@ -2,7 +2,7 @@
 
 import duke.exception.DukeException;
 import duke.parser.Convert;
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.TaskList;
 import duke.ui.Ui;
@@ -32,7 +32,7 @@ public Snooze(int taskNb, String until) {
     }
 
     @Override
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
         if (taskNb < taskList.size() && taskNb >= 0) {
             if (taskList.getTask(taskNb).isDone()) {
                 throw new DukeException("Seems like you've already finished that task, no need to snooze it now");

diff --git a/src/main/java/duke/command/ViewCommand.java b/src/main/java/duke/command/ViewCommand.java
@@ -1,6 +1,6 @@
 package duke.command;
 
-import duke.recipebook.dishlist;
+import duke.recipebook.DishList;
 import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
@@ -21,7 +21,7 @@ public ViewCommand(Date toView) {
     }
 
     @Override
-    public void execute(dishlist dish1, TaskList taskList, Ui ui, Storage storage) {
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) {
         StringBuilder sb = new StringBuilder();
         int i = 1;
         try {

diff --git a/src/main/java/duke/parser/Parser.java b/src/main/java/duke/parser/Parser.java
@@ -3,14 +3,17 @@
 import duke.Duke;
 import duke.command.*;
 import duke.command.AddCommand;
+import duke.command.Command;
 import duke.command.DoneCommand;
 import duke.command.ExitCommand;
 import duke.command.FindIngredientCommand;
 import duke.command.RemindCommand;
 import duke.command.ViewCommand;
 import duke.exception.DukeException;
 import duke.orderCommand.*;
-import duke.recipebook.dishes;
+import duke.recipeCommand.*;
+import duke.recipeCommand.InitCommand;
+import duke.recipebook.Dishes;
 import duke.task.Deadline;
 import duke.task.DoWithinPeriodTasks;
 import duke.task.Event;
@@ -38,7 +41,7 @@ public class Parser {
      */
     public static Command parse(String fullCommand, int size) throws DukeException {
         //splitted contains the keyword and the rest (description or task number)
-        String[] splitted = fullCommand.split(" ", 3);
+        String[] splitted = fullCommand.split(" ", 2);
         //switching on the keyword
         switch (splitted[0]) {
             case "list":
@@ -82,9 +85,29 @@ public static Command parse(String fullCommand, int size) throws DukeException {
                 String[] getPart = splitAndCheck(splitted[1], " /from ");
                 String[] part = splitAndCheck(getPart[1], " /to ");
                 return new AddCommand(new DoWithinPeriodTasks(getPart[0], part[0], part[1]));
-            case "add":
-                int amount = Integer.parseInt(splitted[2]);
-                return new AddCommand(new dishes(splitted[1], amount));
+            default:
+                throw new DukeException("I'm sorry, but I don't know what that means :-(");
+        }
+    }
+
+    public static RecipeCommand Parse(String fullCommaand) throws DukeException {
+        String[] splitted = fullCommaand.split(" ", 2);
+        switch (splitted[0]) {
+            case "dishadd":
+                String[] getnum = splitAndCheck(splitted[1], " /num ");
+                int amount = Integer.parseInt(getnum[1]);
+                return new AddDishCommand(new Dishes(getnum[0]), amount);
+            case "listdish":
+                return new ListDishCommand();
+            case "dishdelete" :
+                int Nb = Integer.parseInt(splitted[1]);
+                return new DeleteDishCommand(Nb);
+            case "addingredient" :
+                String[] getIng = splitAndCheck(splitted[1], " /add ");
+                int listNum = Integer.parseInt(getIng[1]);
+                return new AddIngredientCommand(getIng[0], listNum);
+            case "init" :
+                return new InitCommand();
             default:
                 throw new DukeException("I'm sorry, but I don't know what that means :-(");
         }
@@ -115,6 +138,8 @@ public static OrderCommand parse(String fullCommand) throws DukeException {
                 throw new DukeException("I'm sorry, but I don't know what that means :-(");
         }
     }
+
+
     /**
      * Checks the length of a String array is of size 2.
      * @throws DukeException when array is not of size 2.

diff --git a/src/main/java/duke/recipeCommand/AddDishCommand.java b/src/main/java/duke/recipeCommand/AddDishCommand.java
@@ -0,0 +1,39 @@
+package duke.recipeCommand;
+
+import duke.exception.DukeException;
+import duke.recipebook.Dishes;
+import duke.recipebook.DishList;
+import duke.storage.Storage;
+import duke.task.TaskList;
+import duke.ui.Ui;
+
+public class AddDishCommand extends RecipeCommand {
+
+    private Dishes dish;
+    private int amount;
+    private int Nb;
+
+    public AddDishCommand(Dishes dish, int amount) {
+        this.dish = dish;
+        this.amount = amount;
+    }
+
+    @Override
+    public void execute(DishList dish1, TaskList taskList, Ui ui, Storage storage) throws DukeException {
+
+        try {
+            dish1.addDish(dish); // add dish into list found in dishes class
+
+            for( int i = 1; i < DishList.getSize(); i++) {
+                if(DishList.getDish(i).getDishname().equals(dish.toString())){
+                    Nb = i;
+                    break;
+                }
+            }
+            dish1.getDish(Nb).setNumberOfOrders(amount);
+            ui.showAddedDishes(dish.toString(), DishList.getDish(Nb).getTotalNumberOfOrders());
+        } catch (Exception e) {
+            throw new DukeException("unable to add dish");
+        }
+    }
+}