Merge branch 'branch-Level-8'

yunbinmo · yunbinmo · commit 881efaea94f2 · 2022-01-23T15:11:37.000+08:00
diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java
@@ -1,28 +1,31 @@
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 /**
  * Encapsulate information of task with deadline.
  */
 public class Deadline extends Task{
-    protected String by;
 
     /**
      * Normal constructor.
      */
-    public Deadline(String description, String by) {
-        super(description);
-        this.by = by;
+    public Deadline(String description, LocalDateTime by) {
+        super(description, by);
     }
 
     /**
      * Returns the representative string for saving in data file.
      */
     @Override
     public String toFileFormat() {
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm");
         int status = super.isDone ? 1 : 0;
-        return "E" + " | " + status + " | " + super.description + " | " + by;
+        return "D" + " | " + status + " | " + super.description + " | " + dtf.format(super.dateTime);
     }
 
     @Override
     public String toString() {
-        return "[D]" + super.toString() + " (by: " + by + ")";
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        return "[D]" + super.toString() + " (by: " + dtf.format(super.dateTime) + ")";
     }
 }
diff --git a/src/main/java/Event.java b/src/main/java/Event.java
@@ -1,28 +1,31 @@
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 /**
  * Encapsulate information of event task.
  */
 public class Event extends Task {
-    protected String at;
 
     /**
      * Normal constructor.
      */
-    public Event(String description, String at) {
-        super(description);
-        this.at = at;
+    public Event(String description, LocalDateTime at) {
+        super(description, at);
     }
 
     /**
      * Returns the representative string for saving in data file.
      */
     @Override
     public String toFileFormat() {
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm");
         int status = super.isDone ? 1 : 0;
-        return "E" + " | " + status + " | " + super.description + " | " + at;
+        return "E" + " | " + status + " | " + super.description + " | " + dtf.format(super.dateTime);
     }
 
     @Override
     public String toString() {
-        return "[E]" + super.toString() + " (at: " + at + ")";
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        return "[E]" + super.toString() + " (at: " + dtf.format(super.dateTime) + ")";
     }
 }
diff --git a/src/main/java/Spike.java b/src/main/java/Spike.java
@@ -2,9 +2,9 @@
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Scanner;
 
@@ -33,7 +33,15 @@ public String getCommand() {
         public static void processCommand(Command c, String command, String[] commandWords) {
             switch (c) {
             case LIST:
-                printList();
+                try {
+                    if (commandWords.length >= 2) {
+                        printListByDate(command);
+                    } else {
+                        printList();
+                    }
+                } catch (SpikeException d) {
+                    printMsg(d.toString());
+                }
                 break;
             case MARK:
                 try {
@@ -97,15 +105,16 @@ public static void main(String[] args) {
                     String currLine = fileRead.nextLine();
                     String[] info = currLine.split(" \\| ");
                     Task task = null;
+                    DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm");
                     switch (info[0]) {
                     case "T":
                         task = new ToDo(info[2]);
                         break;
                     case "E":
-                        task = new Event(info[2], info[3]);
+                        task = new Event(info[2], LocalDateTime.parse(info[3], dtf));
                         break;
                     case "D":
-                        task = new Deadline(info[2], info[3]);
+                        task = new Deadline(info[2], LocalDateTime.parse(info[3], dtf));
                         break;
                     default:
                         break;
@@ -189,6 +198,7 @@ public static void saveChanges() {
      * Adds task into the list and prints.
      */
     public static void addTask(Command c, String command, String[] commandWords) throws SpikeException {
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm");
         switch (c) {
         case TODO:
             if (command.length() <= 5) {
@@ -204,26 +214,45 @@ public static void addTask(Command c, String command, String[] commandWords) thr
                     || commandWords[1].equals("/by") || command.indexOf("/by") + 3 == command.length()) {
                 throw new SpikeException("Deadline or task description missing.");
             }
-            Deadline newD = new Deadline(command.substring(command.indexOf("deadline") + 9,
-                    command.indexOf("/by") - 1), command.substring(command.indexOf("/by") + 4));
-            taskList.add(newD);
-            printAddedTask(newD);
+            LocalDateTime deadlineT = parseDateTime(command.substring(command.indexOf("/by") + 4), dtf);
+            if (!(deadlineT == null)) {
+                Deadline newD = new Deadline(command.substring(command.indexOf("deadline") + 9,
+                        command.indexOf("/by") - 1), deadlineT);
+                taskList.add(newD);
+                printAddedTask(newD);
+            }
             break;
         case EVENT:
             if (commandWords.length <= 2 || command.indexOf("/at") == -1
                     || commandWords[1].equals("/at") || command.indexOf("/at") + 3 == command.length()) {
                 throw new SpikeException("Event time or event description missing.");
             }
-            Event newE = new Event(command.substring(command.indexOf("event") + 6,
-                    command.indexOf("/at") - 1), command.substring(command.indexOf("/at") + 4));
-            taskList.add(newE);
-            printAddedTask(newE);
+            LocalDateTime eventT = parseDateTime(command.substring(command.indexOf("/at") + 4), dtf);
+            if (!(eventT == null)) {
+                Event newE = new Event(command.substring(command.indexOf("event") + 6,
+                        command.indexOf("/at") - 1), eventT);
+                taskList.add(newE);
+                printAddedTask(newE);
+            }
             break;
         default:
             break;
         }
     }
 
+    /**
+     * Parses date and time input by user and returns valid LocalDateTime object
+     */
+    public static LocalDateTime parseDateTime(String s, DateTimeFormatter dtf) {
+        try {
+            LocalDateTime dateTime = LocalDateTime.parse(s, dtf);
+            return dateTime;
+        } catch (DateTimeParseException e) {
+            printMsg("Please enter a valid date in the format yyyy-MM-dd HHmm");
+            return null;
+        }
+    }
+
     /**
      * Marks the task as done.
      */
@@ -307,10 +336,32 @@ public static void printList() {
         int i = 1;
         String result = "Here are the task(s) in your list:\n";
         for (Task task : taskList) {
-            if (i == taskList.size()) {
+            result += i + "." + task;
+            if (i != taskList.size()) {
+                result += "\n";
+            }
+            i++;
+        }
+        printMsg(result);
+    }
+
+    /**
+     * Prints deadlines/events occurring on the given date.
+     */
+    public static void printListByDate(String command) throws SpikeException {
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm");
+        LocalDateTime ldt = parseDateTime(command.substring(5), dtf);
+        if (ldt == null) {
+            throw new SpikeException("Kindly enter the date in the format yyyy-MM-dd 0000 to filter by date");
+        }
+        int i = 1;
+        String result = "Here are the task(s) in your list filtered by date:\n";
+        for (Task task : taskList) {
+            if (task.getDateTime().toLocalDate().equals(ldt.toLocalDate())) {
                 result = result + i + "." + task;
-            } else {
-                result = result + i + "." + task + "\n";
+                if (i != taskList.size()) {
+                    result += "\n";
+                }
             }
             i++;
         }
diff --git a/src/main/java/Task.java b/src/main/java/Task.java
@@ -1,16 +1,26 @@
+import java.time.LocalDateTime;
+
 /**
  * Encapsulate information of a user task.
  */
 public class Task {
     protected String description;
     protected boolean isDone;
+    protected LocalDateTime dateTime;
 
     /**
      * Constructor for Task objects.
      */
     public Task(String description) {
         this.description = description;
         this.isDone = false;
+        this.dateTime = LocalDateTime.parse("1700-01-01T00:00:00");
+    }
+
+    public Task(String description, LocalDateTime dateTime) {
+        this.description = description;
+        this.isDone = false;
+        this.dateTime = dateTime;
     }
 
     /**
@@ -21,14 +31,14 @@ public String getStatusIcon() {
     }
 
     /**
-     * Change status of task to be 'Done'.
+     * Changes status of task to be 'Done'.
      */
     public void markAsDone() {
         this.isDone = true;
     }
 
     /**
-     * Change status of task to be 'Not done'.
+     * Changes status of task to be 'Not done'.
      */
     public void markAsNotDone() {
         this.isDone = false;
@@ -43,6 +53,14 @@ public String toFileFormat() {
 
     /**
      * Format the string representation of Task objects.
+     * Gets the date and time for tasks with such information.
+     */
+    public LocalDateTime getDateTime() {
+        return this.dateTime;
+    }
+
+    /**
+     * Formats the string representation of Task objects.
      */
     @Override
     public String toString() {
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
@@ -15,7 +15,7 @@ IF ERRORLEVEL 1 (
 REM no error here, errorlevel == 0
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ..\bin Duke < input.txt > ACTUAL.TXT
+java -classpath ..\bin Spike < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT
diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
@@ -20,7 +20,7 @@ then
 fi
 
 # run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ../bin Duke < input.txt > ACTUAL.TXT
+java -classpath ../bin Spike < input.txt > ACTUAL.TXT
 
 # convert to UNIX format
 cp EXPECTED.TXT EXPECTED-UNIX.TXT
