- Implemented dual input method (beginner and expert) for add event and add goal event command

Author: Cheezeblokz

src/main/java/seedu/duke/Duke.java

@@ -57,6 +57,7 @@ private void printHelp() {
             "review flashcards",
             "help",
             "add event",
+            "add goal event",
             "delete event",
             "delete all events",
             "find event",

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

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

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

@@ -66,9 +66,9 @@ public EventCommand parseInput(String input) {
         try {
             manageException(input);
             if (input.startsWith("add event")) {
-                return new AddEventCommand();
+                return new AddEventCommand(input);
             } else if (input.startsWith("add goal event")) {
-                return new AddGoalEventCommand();
+                return new AddGoalEventCommand(input);
             } else if (input.startsWith("delete event")) {
                 return new DeleteEventCommand();
             } else if (input.startsWith("list events")) {

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

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

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

@@ -1,4 +1,4 @@
-//@@ kherlenbayasgalan
+//@@author kherlenbayasgalan
 
 package seedu.duke.calendar;
 

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

@@ -12,10 +12,19 @@
 
 import java.util.Scanner;
 
-public class AddEventCommand extends EventCommand {
+public class AddEventCommand extends DualEventCommand {
 
+    //@@author Cheezeblokz
+    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)";
+    }
+
+    //@@author kherlenbayasgalan
     /**
-     * The execute method is used to add an event to the calendar. It has two parameters (Scanner, EventList).
+     * The executeBeginnerMode method is used to add an event to the calendar. It has two parameters (Scanner, EventList).
      * The EventList is used to add an event to the list. The scanner is used to get the user's event name input.
      * The method first takes the event name, then through parseDateTimeInput, it gets an acceptable date/time
      * from the user. If the user inserts acceptable inputs, the event will be added. If the user doesn't,
@@ -24,7 +33,8 @@ public class AddEventCommand extends EventCommand {
      * @param eventList is used to add an event to the list.
      */
 
-    public void execute(Scanner scanner, EventList eventList) {
+    @Override
+    public void executeBeginnerMode(Scanner scanner, EventList eventList) {
         System.out.print("What's the event?: ");
         String eventName = scanner.nextLine();
 
@@ -41,6 +51,28 @@ public void execute(Scanner scanner, EventList eventList) {
         }
     }
 
+    //@@author Cheezeblokz
+    @Override
+    protected void executeExpertMode(Scanner scanner, EventList eventList) {
+        String[] commandParts = input.split(" ");
+        String eventName = commandParts[2];
+        try {
+            LocalDateTime startTime = LocalDateTime.parse(commandParts[3]);
+            LocalDateTime endTime = LocalDateTime.parse(commandParts[4]);
+            if (endTime.isAfter(startTime)) {
+                Event event = new Event(eventName, startTime, endTime);
+                eventList.addEvent(event);
+                System.out.println(event + " has been added to your Calendar");
+            } else {
+                System.out.println("    End time is before or equal to the start time. Please enter the correct end time.");
+            }
+        } catch (DateTimeParseException e) {
+            System.out.println("    Invalid date and time format. Please try again.");
+        }
+    }
+
+    //@@author kherlenbayasgalan
+
     /**
      * The parseDateTimeInput takes two parameters (Scanner , String) and through those parameters
      * the method gets user's input. Using exception handling of LocalDateTime, the user checks if the

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

@@ -1,42 +1,61 @@
+//@@author Cheezeblokz
 package seedu.duke.calendar.command;
 
 import seedu.duke.calendar.Event;
 import seedu.duke.calendar.EventList;
 import seedu.duke.calendar.Goal;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.Scanner;
 
-public class AddGoalEventCommand extends EventCommand{
+public class AddGoalEventCommand extends DualEventCommand{
 
-    //@@author kherlenbayasgalan-reused
-
-    /**
-     * The execute method is used to add an event goal to the calendar. It has two parameters (Scanner, EventList).
-     * The EventList is used to add an event to the list. The scanner is used to get the user's event name input.
-     * The method first takes the event name, then through parseDateTimeInput, it gets an acceptable date/time
-     * from the user. If the user inserts acceptable inputs, the event goal will be added. If the user doesn't,
-     * either one of DateTimeParseException or Invalid input exception.
-     * @param scanner is used to get user's event name.
-     * @param eventList is used to add an event to the list.
-     */
+    public AddGoalEventCommand(String input) {
+        this.input = input;
+        beginnerCommandLength = 3;
+        expertCommandLength = 6;
+        syntaxString = "add goal event GOAL_NAME GOAL_END_DATE (in format yyyy-mm-ddThh:mm:ss) FLASHCARD_GOAL_NUMBER";
+    }
 
-    public void execute(Scanner scanner, EventList eventList) {
+    @Override
+    public void executeBeginnerMode(Scanner scanner, EventList eventList) {
         System.out.print("What's the goal event name?: ");
         String eventName = scanner.nextLine();
 
-        // checks if the acceptable format is given by the user to prevent program crash
         LocalDateTime endTime = parseDateTimeInput(scanner, "When does it end? (yyyy-MM-ddTHH:mm:ss) (e.g., 2023-12-20T12:30:30): ");
         int goal = parseIntegerInput(scanner, "How many flashcard to review by then?: ");
 
-        Event event = new Goal(eventName, endTime, goal, 0);
-        eventList.addEvent(event);
-        System.out.println(event + " has been added to your Calendar");
+        if (endTime.isAfter(LocalDateTime.now())) {
+            Event event = new Goal(eventName, endTime, goal, 0);
+            eventList.addEvent(event);
+            System.out.println(event + " has been added to your Calendar");
+        } else {
+            System.out.println("    End time is before the current time. Please enter the correct end time.");
+        }
     }
 
     //@@author Cheezeblokz
+    @Override
+    protected void executeExpertMode(Scanner scanner, EventList eventList) {
+        String[] commandParts = input.split(" ");
+        String eventName = commandParts[3];
+        try {
+            LocalDateTime endTime = LocalDateTime.parse(commandParts[4]);
+            int goal = Integer.parseInt(commandParts[5]);
+            if (endTime.isAfter(LocalDateTime.now())) {
+                Event event = new Goal(eventName, endTime, goal, 0);
+                eventList.addEvent(event);
+                System.out.println(event + " has been added to your Calendar");
+            } else {
+                System.out.println("    End time is before the current time. Please enter the correct end time.");
+            }
+        } catch (DateTimeParseException e) {
+            System.out.println("    Invalid date and time format. Please try again.");
+        } catch (NumberFormatException e) {
+            System.out.println("    Invalid integer input. Please try again.");
+        }
+    }
 
     private int parseIntegerInput(Scanner scanner, String prompt) {
         while (true) {