Edit: edit test case for addDeadline and addEvent command + minor edi…

…t on conversion from date to data string

data/duke.txt

@@ -1,9 +1,11 @@
-D | 0 | return book | 2020-06-12 2311
-E | 0 | project meeting | 2020-06-12 2311 | 2021-11-12 2311
+E | 0 | project meeting | 2020-06-12 2311 | 2020-06-12 2311
 T | 1 | join sports club
-E | 1 | test | 2020-08-15 2311 | 2021-12-12 2311
 T | 0 | test
 T | 0 | nth
 T | 0 | what
 T | 0 | 2101
 T | 0 | ma2001
+D | 0 | this | 2021-12-12 2011
+E | 0 | this | 2021-12-12 2011 | 2021-12-12 2011
+D | 0 | this | 2021-11-11 2311
+E | 0 | that | 2021-11-11 2311 | 2021-11-11 2311

src/main/java/duke/exception/InvalidDateTimeException.java

@@ -2,6 +2,6 @@
 
 public class InvalidDateTimeException extends DukeException {
     public InvalidDateTimeException() {
-        super("Please insert your date using the format, YYYY-MM-DD (e.g. 2000-01-01)");
+        super("Please insert your date using the format, YYYY-MM-DD (e.g. 2000-01-01 2311)");
     }
 }

src/main/java/duke/task/Deadline.java

@@ -21,8 +21,10 @@ public Deadline(String task, LocalDateTime dueDate) {
 
     @Override
     public String toData() {
+        String[] dateTime = this.dueDate.toString().split("T");
+        String dueDateData = dateTime[0] + " " + dateTime[1].replace(":", "");
         String status = this.completed ? "1" : "0";
-        return "D | " + status + " | " + this.task + " | " + this.dueDate;
+        return "D | " + status + " | " + this.task + " | " + dueDateData;
     }
 
     @Override

src/main/java/duke/task/Event.java

@@ -24,8 +24,12 @@ public Event(String task, LocalDateTime from, LocalDateTime to) {
 
     @Override
     public String toData() {
+        String[] fromDate = this.from.toString().split("T");
+        String fromDateData = fromDate[0] + " " + fromDate[1].replace(":", "");
+        String[] toDate = this.from.toString().split("T");
+        String toDateData = toDate[0] + " " + toDate[1].replace(":", "");
         String status = this.completed ? "1" : "0";
-        return "E | " + status + " | " + this.task + " | " + this.from + " | " + this.to;
+        return "E | " + status + " | " + this.task + " | " + fromDateData + " | " + toDateData;
     }
 
     @Override

src/test/java/command/AddDeadlineCommandTest.java

@@ -20,9 +20,9 @@ public void init() {
 
     @Test
     public void deadlineTest() {
-        Command addDeadlineTest = new AddDeadlineCommand("deadline test /by 2023-01-29");
+        Command addDeadlineTest = new AddDeadlineCommand("deadline test /by 2023-01-29 2311");
         addDeadlineTest.execute(tasks);
-        String expected = "[D][ ] test (by: Jan 29 2023)";
+        String expected = "[D][ ] test (by: Jan 29 2023, 11:11PM)";
         assertEquals(expected, tasks.getTask(0).toString());
     }
 

src/test/java/command/AddEventCommandTest.java

@@ -20,9 +20,9 @@ public void init() {
 
     @Test
     public void eventTest() {
-        Command addEventTest = new AddEventCommand("event testing /from 2023-01-27 /to 2023-01-29");
+        Command addEventTest = new AddEventCommand("event testing /from 2023-01-27 2311 /to 2023-01-29 2311");
         addEventTest.execute(tasks);
-        String expected = "[E][ ] testing (from: Jan 27 2023 to: Jan 29 2023)";
+        String expected = "[E][ ] testing (from: Jan 27 2023, 11:11PM to: Jan 29 2023, 11:11PM)";
         assertEquals(expected, tasks.getTask(0).toString());
     }
 }

src/test/java/duke/task/DeadlineTest.java

@@ -10,15 +10,15 @@
 public class DeadlineTest {
     @Test
     public void testDeadlineString() {
-        Deadline deadline = new Deadline("test", DateTimeParser.parse("2023-01-30"));
-        String expected = "[D][ ] test (by: Jan 30 2023)";
+        Deadline deadline = new Deadline("test", DateTimeParser.parse("2023-01-30 2311"));
+        String expected = "[D][ ] test (by: Jan 30 2023, 11:11PM)";
         assertEquals(expected, deadline.toString());
     }
 
     @Test
     public void testDeadlineData() {
-        Deadline deadline = new Deadline("test", DateTimeParser.parse("2023-01-30"));
-        String expected = "D | 0 | test | 2023-01-30";
+        Deadline deadline = new Deadline("test", DateTimeParser.parse("2023-01-30 2311"));
+        String expected = "D | 0 | test | 2023-01-30 2311";
         assertEquals(expected, deadline.toData());
     }
 }