Includes history log V1.0 (nusCS2113-AY1920S1#69)

muserr · web-flow · commit a48c1fc56879 · 2019-10-04T10:09:42.000+08:00
* Remove instanceof from ReminderCommand

* Updates to ReminderCommand V1.0

* Sorts reminders in ascending order

* Includes Event as part of reminder display

* Merges with upstream

* Changes to Indent Case

* Changes to switch case alignment

* Includes history log V1.0

* Includes history log V1.1
diff --git a/.gitignore b/.gitignore
@@ -15,5 +15,6 @@ bin/
 
 # Data files
 data.json
+/data.json
 text_file
 
diff --git a/data.json b/data.json
@@ -1 +1,3 @@
-["duchess.model.task.TaskList",{"tasks":["java.util.ArrayList",[]]}]
+[ "duchess.storage.Store", {
+  "taskList" : [ "java.util.ArrayList", [ [ "duchess.model.task.Todo", {
+    "description" : "work"
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
@@ -1,16 +1,17 @@
 import duchess.logic.commands.Command;
 import duchess.logic.parser.Parser;
+import duchess.model.task.DuchessLog;
 import duchess.storage.Storage;
 import duchess.storage.Store;
 import duchess.ui.Ui;
 import duchess.logic.commands.exceptions.DukeException;
-import duchess.model.task.TaskList;
 
 public class Duke {
 
     private Storage storage;
     private Store store;
     private Ui ui;
+    private DuchessLog duchessLog;
 
     /**
      * Creates an instant of Duke to be executed.
@@ -34,10 +35,13 @@ private Duke(String filePath) {
      */
     private void run() {
         ui.showWelcome();
+        duchessLog = new DuchessLog();
+
         boolean isExit = false;
         while (!isExit) {
             try {
                 String fullCommand = ui.readCommand();
+                duchessLog.add(fullCommand);
                 ui.beginBlock();
                 Command c = Parser.parse(fullCommand);
                 c.execute(store, ui, storage);
diff --git a/src/main/java/duchess/logic/commands/AddDeadlineCommand.java b/src/main/java/duchess/logic/commands/AddDeadlineCommand.java
@@ -1,7 +1,6 @@
 package duchess.logic.commands;
 
 import duchess.storage.Storage;
-import duchess.model.task.TaskList;
 import duchess.model.task.Task;
 import duchess.model.task.Deadline;
 import duchess.logic.commands.exceptions.DukeException;
diff --git a/src/main/java/duchess/logic/commands/AddEventCommand.java b/src/main/java/duchess/logic/commands/AddEventCommand.java
@@ -3,7 +3,6 @@
 import duchess.storage.Storage;
 import duchess.logic.commands.exceptions.DukeException;
 import duchess.model.task.Event;
-import duchess.model.task.TaskList;
 import duchess.storage.Store;
 import duchess.ui.Ui;
 
diff --git a/src/main/java/duchess/logic/commands/AddTodoCommand.java b/src/main/java/duchess/logic/commands/AddTodoCommand.java
@@ -1,7 +1,6 @@
 package duchess.logic.commands;
 
 import duchess.storage.Storage;
-import duchess.model.task.TaskList;
 import duchess.model.task.Todo;
 import duchess.model.task.Task;
 import duchess.logic.commands.exceptions.DukeException;
diff --git a/src/main/java/duchess/logic/commands/ByeCommand.java b/src/main/java/duchess/logic/commands/ByeCommand.java
@@ -1,7 +1,6 @@
 package duchess.logic.commands;
 
 import duchess.storage.Storage;
-import duchess.model.task.TaskList;
 import duchess.logic.commands.exceptions.DukeException;
 import duchess.storage.Store;
 import duchess.ui.Ui;
diff --git a/src/main/java/duchess/logic/commands/Command.java b/src/main/java/duchess/logic/commands/Command.java
@@ -13,4 +13,4 @@ public boolean isExit() {
     }
 
     public abstract void execute(Store store, Ui ui, Storage storage) throws DukeException;
-}
+}
diff --git a/src/main/java/duchess/logic/commands/DeleteCommand.java b/src/main/java/duchess/logic/commands/DeleteCommand.java
@@ -1,7 +1,6 @@
 package duchess.logic.commands;
 
 import duchess.storage.Storage;
-import duchess.model.task.TaskList;
 import duchess.model.task.Task;
 import duchess.logic.commands.exceptions.DukeException;
 import duchess.storage.Store;
diff --git a/src/main/java/duchess/logic/commands/DoneCommand.java b/src/main/java/duchess/logic/commands/DoneCommand.java
@@ -1,7 +1,6 @@
 package duchess.logic.commands;
 
 import duchess.storage.Storage;
-import duchess.model.task.TaskList;
 import duchess.logic.commands.exceptions.DukeException;
 import duchess.model.task.Task;
 import duchess.storage.Store;
diff --git a/src/main/java/duchess/logic/commands/FindCommand.java b/src/main/java/duchess/logic/commands/FindCommand.java
@@ -2,7 +2,6 @@
 
 import duchess.storage.Storage;
 import duchess.model.task.Task;
-import duchess.model.task.TaskList;
 import duchess.logic.commands.exceptions.DukeException;
 import duchess.storage.Store;
 import duchess.ui.Ui;
diff --git a/src/main/java/duchess/logic/commands/ListCommand.java b/src/main/java/duchess/logic/commands/ListCommand.java
@@ -2,7 +2,6 @@
 
 import duchess.storage.Storage;
 import duchess.logic.commands.exceptions.DukeException;
-import duchess.model.task.TaskList;
 import duchess.storage.Store;
 import duchess.ui.Ui;
 
diff --git a/src/main/java/duchess/logic/commands/LogCommand.java b/src/main/java/duchess/logic/commands/LogCommand.java
@@ -0,0 +1,18 @@
+package duchess.logic.commands;
+
+import duchess.logic.commands.exceptions.DukeException;
+import duchess.model.task.DuchessLog;
+import duchess.storage.Storage;
+import duchess.storage.Store;
+import duchess.ui.Ui;
+
+/**
+ * Command to display input history.
+ */
+public class LogCommand extends Command {
+
+    @Override
+    public void execute(Store store, Ui ui, Storage storage) throws DukeException {
+        ui.showUserHistory(DuchessLog.getLog());
+    }
+}
diff --git a/src/main/java/duchess/logic/commands/SnoozeCommand.java b/src/main/java/duchess/logic/commands/SnoozeCommand.java
@@ -3,7 +3,6 @@
 import duchess.storage.Storage;
 import duchess.logic.commands.exceptions.DukeException;
 import duchess.model.task.Task;
-import duchess.model.task.TaskList;
 import duchess.storage.Store;
 import duchess.ui.Ui;
 
diff --git a/src/main/java/duchess/logic/commands/ViewScheduleCommand.java b/src/main/java/duchess/logic/commands/ViewScheduleCommand.java
@@ -3,7 +3,6 @@
 import duchess.logic.commands.exceptions.DukeException;
 import duchess.model.TimeFrame;
 import duchess.model.task.Task;
-import duchess.model.task.TaskList;
 import duchess.storage.Storage;
 import duchess.storage.Store;
 import duchess.ui.Ui;
diff --git a/src/main/java/duchess/logic/parser/Parser.java b/src/main/java/duchess/logic/parser/Parser.java
@@ -9,6 +9,7 @@
 import duchess.logic.commands.DoneCommand;
 import duchess.logic.commands.FindCommand;
 import duchess.logic.commands.ListCommand;
+import duchess.logic.commands.LogCommand;
 import duchess.logic.commands.ReminderCommand;
 import duchess.logic.commands.SnoozeCommand;
 import duchess.logic.commands.ViewScheduleCommand;
@@ -53,6 +54,8 @@ public static Command parse(String input) throws DukeException {
             return new ViewScheduleCommand(arguments);
         case "bye":
             return new ByeCommand();
+        case "log":
+            return new LogCommand();
         default:
             throw new DukeException("Please enter a valid command.");
         }
diff --git a/src/main/java/duchess/model/task/DuchessLog.java b/src/main/java/duchess/model/task/DuchessLog.java
@@ -0,0 +1,20 @@
+package duchess.model.task;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DuchessLog {
+    private static List<String> duchessLog;
+
+    public DuchessLog() {
+        duchessLog = new ArrayList<>();
+    }
+
+    public void add(String input) {
+        duchessLog.add(input);
+    }
+
+    public static List<String> getLog() {
+        return duchessLog;
+    }
+}
diff --git a/src/main/java/duchess/ui/Ui.java b/src/main/java/duchess/ui/Ui.java
@@ -1,6 +1,7 @@
 
 package duchess.ui;
 
+import duchess.logic.commands.Command;
 import duchess.model.task.Task;
 
 import java.util.List;
@@ -197,6 +198,19 @@ public void showDeadlines(List<Task> tasks) {
         showTasks(tasks);
     }
 
+    /**
+     * Displays user history.
+     *
+     * @param log list of user log
+     */
+    public void showUserHistory(List<String> log) {
+        printIndented("These are the commands you entered:");
+        int counter = 1;
+        for (String userInput : log) {
+            printIndented(counter++ + ". " + userInput);
+        }
+    }
+
     /**
      * Prints a straight line.
      */
diff --git a/src/test/java/ReminderCommandTest.java b/src/test/java/ReminderCommandTest.java
@@ -1,6 +1,7 @@
 import duchess.logic.commands.AddDeadlineCommand;
 import duchess.logic.commands.ReminderCommand;
 import duchess.logic.parser.Parser;
+import duchess.model.task.DuchessLog;
 import duchess.storage.Storage;
 import duchess.storage.Store;
 import duchess.ui.Ui;
@@ -38,6 +39,7 @@ public void testExecuteWithDeadlines() throws DukeException {
         Ui ui = new Ui();
         Storage storage = new Storage(filename);
         Parser parser = new Parser();
+        DuchessLog duchessLog = new DuchessLog();
 
         // Adding the firstDeadline
         List<String> firstWords = Arrays.asList(firstDeadline.split(" "));
@@ -53,4 +55,4 @@ public void testExecuteWithDeadlines() throws DukeException {
         assertTrue(store.getTaskList().size() == 2);
         ReminderCommand reminderCommand = new ReminderCommand();
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@ public boolean isExit() {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public abstract void execute(Store store, Ui ui, Storage storage) throws DukeException;`
`16`		`-}`
	`16`	`+}`