Merge pull request #115 from Cheezeblokz/master

Event Updates

Author: Cheezeblokz

src/main/java/seedu/duke/calendar/CalendarCommandParser.java

@@ -15,7 +15,7 @@ public EventCommand parseInput(String input) {
         assert input != null : "input is null";
 
         if (input.startsWith("add event")) {
-            return new AddEventCommand();
+            return new AddEventCommand(input);
         } else if (input.startsWith("delete event")) {
             return new DeleteEventCommand();
         } else if (input.startsWith("list events")) {

src/main/java/seedu/duke/calendar/Event.java

@@ -41,11 +41,9 @@ public void setTo(LocalDateTime to) {
 
     @Override
     public String toString() {
-        return "Event{" +
-                "name='" + name + '\'' +
-                ", from=" + from +
-                ", to=" + to +
-                '}';
+        return "Event '" + name + '\'' +
+                " From: " + from +
+                ", To: " + to;
     }
 
 }

src/main/java/seedu/duke/calendar/EventList.java

@@ -28,8 +28,7 @@ public void findEvent(String keyword) {
         int count = 0;
         for (Event event: eventList) {
             if (event.getName().contains(keyword)) {
-                System.out.println((++count) + ". " + event.getName() + " Event from: " +event.getFrom() +
-                        " to: " + event.getTo());
+                System.out.println((++count) + ". " + event);
             }
         }
     }

src/main/java/seedu/duke/calendar/command/AddEventCommand.java

@@ -1,4 +1,4 @@
-//@@ kherlenbayasgalan & jingxizhu
+//@@ kherlenbayasgalan & Cheezeblokz
 
 package seedu.duke.calendar.command;
 
@@ -8,8 +8,17 @@
 import java.util.Scanner;
 import java.time.LocalDateTime;
 
-public class AddEventCommand extends EventCommand {
-    public void execute(Scanner scanner, EventList eventList) {
+public class AddEventCommand extends DualEventCommand {
+
+    public AddEventCommand(String input) {
+        this.input = input;
+        beginnerCommandLength = 2;
+        expertCommandLength = 5;
+        syntaxString = "add event EVENT_NAME EVENT_START_DATE (in format yyyy-mm-ddThh:mm:ss) EVENT_END_DATE (in format yyyy-mm-ddThh:mm:ss)";
+    }
+
+    @Override
+    protected void executeBeginnerMode(Scanner scanner, EventList eventList) {
         System.out.print("What's the event?: ");
         String eventName = scanner.nextLine();
         System.out.print("When does it start? (yyyy-mm-ddThh:mm:ss) (eg. 2023-12-20T12:30:30): ");
@@ -21,7 +30,22 @@ public void execute(Scanner scanner, EventList eventList) {
 
         eventList.addEvent(event);
 
-        System.out.println(event.getName() + " Event from: " +event.getFrom() +
-                " to: " + event.getTo() + " has been added to your Calendar");
+        System.out.println(event + " has been added to your Calendar");
+    }
+
+    //@@author Cheezeblokz
+    @Override
+    protected void executeExpertMode(Scanner scanner, EventList eventList) {
+
+        String[] commandParts = input.split(" ");
+        String eventName = commandParts[2];
+        LocalDateTime startTime = LocalDateTime.parse(commandParts[3]);
+        LocalDateTime endTime = LocalDateTime.parse(commandParts[4]);
+
+        Event event = new Event(eventName, startTime, endTime);
+
+        eventList.addEvent(event);
+
+        System.out.println(event + " has been added to your Calendar");
     }
 }

src/main/java/seedu/duke/calendar/command/DeleteEventCommand.java

@@ -1,4 +1,4 @@
-//@@ kherlenbayasgalan & jingxizhu
+//@@author kherlenbayasgalan & Cheezeblokz
 
 package seedu.duke.calendar.command;
 

src/main/java/seedu/duke/calendar/command/DualEventCommand.java

@@ -0,0 +1,30 @@
+//@@wendelinwemhoener-reused
+package seedu.duke.calendar.command;
+
+import seedu.duke.calendar.EventList;
+
+import java.util.Scanner;
+
+public abstract class DualEventCommand extends EventCommand {
+    protected int beginnerCommandLength;
+    protected int expertCommandLength;
+    protected String input;
+    protected String syntaxString;
+
+    protected abstract void executeBeginnerMode(Scanner scanner, EventList eventList);
+
+    protected abstract void executeExpertMode(Scanner scanner, EventList eventList);
+
+    public void execute(Scanner scanner, EventList eventList) {
+        String[] commandParts = input.split(" ");
+
+        if (commandParts.length == beginnerCommandLength) {
+            executeBeginnerMode(scanner, eventList);
+        } else if (commandParts.length == expertCommandLength) {
+            executeExpertMode(scanner, eventList);
+        } else {
+            System.out.println("    Invalid syntax! The syntax is '" + syntaxString + "'");
+            System.out.println("    Please try again.");
+        }
+    }
+}

src/main/java/seedu/duke/calendar/command/EventCommand.java

@@ -1,4 +1,4 @@
-//@@author kherlenbayasgalan & jingxizhu
+//@@author kherlenbayasgalan & Cheezeblokz
 
 package seedu.duke.calendar.command;
 

src/main/java/seedu/duke/calendar/command/ListCalendarEventsCommand.java

@@ -15,8 +15,7 @@ public void execute(Scanner scanner, EventList eventList) {
 
             int count = 0;
             for (Event event : eventList.getEvent()) {
-                System.out.println((++count) + ". " + event.getName() + " Event from: " +event.getFrom() +
-                        " to: " + event.getTo());
+                System.out.println((++count) + ". " + event);
                 printLine();
             }
         } else {