- Implemented dual input command for delete event and find event

Author: Cheezeblokz

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

@@ -1,4 +1,4 @@
-//@@ kherlenbayasgalan & jingxizhu
+//@@author kherlenbayasgalan & Cheezeblokz
 
 package seedu.duke.calendar;
 
@@ -70,13 +70,13 @@ public EventCommand parseInput(String input) {
             } else if (input.startsWith("add goal event")) {
                 return new AddGoalEventCommand(input);
             } else if (input.startsWith("delete event")) {
-                return new DeleteEventCommand();
+                return new DeleteEventCommand(input);
             } else if (input.startsWith("list events")) {
                 return new ListCalendarEventsCommand();
             } else if (input.startsWith("delete all events")) {
                 return new DeleteAllEventsCommand();
             } else if (input.startsWith("find event")) {
-                return new FindEventCommand();
+                return new FindEventCommand(input);
             }
 
         } catch (AddEventException exception) {

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

@@ -3,7 +3,6 @@
 package seedu.duke.calendar.command;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 import seedu.duke.calendar.Event;
 import seedu.duke.calendar.EventList;

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

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

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

@@ -1,4 +1,4 @@
-//@@author kherlenbayasgalan & Cheezeblokz
+//@@author kherlenbayasgalan
 
 package seedu.duke.calendar.command;
 
@@ -7,18 +7,26 @@
 
 import java.util.Scanner;
 
-public class DeleteEventCommand extends EventCommand{
+public class DeleteEventCommand extends DualEventCommand {
 
-    /**
-     * The execute method is used to delete an specified event from the EventList.
-     * It takes two parameters (Scanner , EventList). The method takes in the event name,
-     * then calls the deleteEvent function to search and delete the event.
-     * If the event is not in the EventList, then "event doesn't exist" message will be displayed.
-     * @param scanner is used to get user's desired event to be deleted.
-     * @param eventList is used to delete the specified event from the EventList.
-     */
+    public DeleteEventCommand(String input) {
+        this.input = input;
+        beginnerCommandLength = 2;
+        expertCommandLength = 3;
+        syntaxString = "delete event EVENT_NAME";
+    }
 
-    public void execute(Scanner scanner, EventList eventList) {
+        /**
+         * The execute method is used to delete an specified event from the EventList.
+         * It takes two parameters (Scanner , EventList). The method takes in the event name,
+         * then calls the deleteEvent function to search and delete the event.
+         * If the event is not in the EventList, then "event doesn't exist" message will be displayed.
+         * @param scanner is used to get user's desired event to be deleted.
+         * @param eventList is used to delete the specified event from the EventList.
+         */
+
+    @Override
+    protected void executeBeginnerMode(Scanner scanner, EventList eventList) {
         int size;
 
         System.out.print("Enter the event name: ");
@@ -31,4 +39,19 @@ public void execute(Scanner scanner, EventList eventList) {
             System.out.println("    " + eventName + " doesn't exist in your Calendar!");
         }
     }
+
+    //@@author Cheezeblokz
+
+    @Override
+    protected void executeExpertMode(Scanner scanner, EventList eventList) {
+        String[] commandParts = input.split(" ");
+        String eventName = commandParts[2];
+
+        int size = eventList.deleteEvent(eventName);
+        if (size > eventList.getSize()) {
+            System.out.println("    " + eventName + " has been deleted from your Calendar!");
+        } else if (size != 0 && size == eventList.getSize()) {
+            System.out.println("    " + eventName + " doesn't exist in your Calendar!");
+        }
+    }
 }

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

@@ -1,4 +1,4 @@
-//@@ kherlenbayasgalan
+//@@author kherlenbayasgalan
 
 package seedu.duke.calendar.command;
 
@@ -7,8 +7,18 @@
 
 import java.util.Scanner;
 
-public class FindEventCommand extends EventCommand {
+public class FindEventCommand extends DualEventCommand {
 
+    //@@author Cheezeblokz
+
+    public FindEventCommand(String input) {
+        this.input = input;
+        beginnerCommandLength = 2;
+        expertCommandLength = 3;
+        syntaxString = "find event EVENT_NAME";
+    }
+
+    //@@author kherlenbayasgalan
     /**
      * The execute method is to search and find an event from the EventList. The method has two
      * parameters (Scanner , EventList). Scanner takes the name of the event that the user
@@ -18,7 +28,8 @@ public class FindEventCommand extends EventCommand {
      * @param eventList is used to access EventList and find the specified event.
      */
 
-    public void execute(Scanner scanner, EventList eventList) {
+    @Override
+    protected void executeBeginnerMode(Scanner scanner, EventList eventList) {
         System.out.print("What event are you looking for?: ");
         String eventName = scanner.nextLine();
 
@@ -30,4 +41,21 @@ public void execute(Scanner scanner, EventList eventList) {
             System.out.println("    No such event found");
         }
     }
+
+
+    //@@author Cheezeblokz
+
+    @Override
+    protected void executeExpertMode(Scanner scanner, EventList eventList) {
+        String[] commandParts = input.split(" ");
+        String eventName = commandParts[2];
+
+        int count = eventList.findEvent(eventName);
+
+        if (count > 0) {
+            System.out.println("    These events have been found");
+        } else {
+            System.out.println("    No such event found");
+        }
+    }
 }

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

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

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

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