Merge branch 'master' into branch-SortEvent

# Conflicts:
#	src/main/java/ezschedule/logic/Logic.java
#	src/main/java/ezschedule/logic/LogicManager.java
#	src/main/java/ezschedule/model/Model.java
#	src/test/java/ezschedule/logic/commands/AddCommandTest.java

build.gradle

@@ -70,7 +70,13 @@ dependencies {
 }
 
 shadowJar {
+    dependsOn test
+    dependsOn checkstyleMain
+    dependsOn checkstyleTest
     archiveFileName = 'Ez-Schedule.jar'
+    doLast {
+        println "Generated *.jar can be found at /build/libs/"
+    }
 }
 
 defaultTasks 'clean', 'test'

src/main/java/ezschedule/MainApp.java

@@ -118,7 +118,7 @@ protected Config initConfig(Path configFilePath) {
             initializedConfig = configOptional.orElse(new Config());
         } catch (DataConversionException e) {
             logger.warning("Config file at " + configFilePathUsed + " is not in the correct format. "
-                + "Using default config properties");
+                    + "Using default config properties");
             initializedConfig = new Config();
         }
 

src/main/java/ezschedule/logic/Logic.java

@@ -1,6 +1,7 @@
 package ezschedule.logic;
 
 import java.nio.file.Path;
+import java.util.function.Predicate;
 
 import ezschedule.commons.core.GuiSettings;
 import ezschedule.logic.commands.CommandResult;
@@ -34,18 +35,24 @@ public interface Logic {
 
     /**
      * Returns an unmodifiable view of the upcoming list of events
-     *
-     * @return
      */
     ObservableList<Event> getUpcomingEventList();
 
+    /**
+     * Returns an unmodifiable view of the list of events
+     */
+    ObservableList<Event> getEventList();
+
     /**
      * Returns an unmodifiable view of the filtered list of events
-     *
-     * @return
      */
     ObservableList<Event> getFilteredEventList();
 
+    /**
+     * Updates the filtered list of events
+     */
+    void updateFilteredEventList(Predicate<Event> predicate);
+
     /**
      * Returns the user prefs' scheduler file path.
      */

src/main/java/ezschedule/logic/LogicManager.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.function.Predicate;
 import java.util.logging.Logger;
 
 import ezschedule.commons.core.GuiSettings;
@@ -64,11 +65,21 @@ public ObservableList<Event> getUpcomingEventList() {
         return model.getUpcomingEventList();
     }
 
+    @Override
+    public ObservableList<Event> getEventList() {
+        return model.getEventList();
+    }
+
     @Override
     public ObservableList<Event> getFilteredEventList() {
         return model.getFilteredEventList();
     }
 
+    @Override
+    public void updateFilteredEventList(Predicate<Event> predicate) {
+        model.updateFilteredEventList(predicate);
+    }
+
     @Override
     public Path getSchedulerFilePath() {
         return model.getSchedulerFilePath();

src/main/java/ezschedule/logic/commands/EditCommand.java

@@ -121,8 +121,7 @@ public static class EditEventDescriptor {
         private Time startTime;
         private Time endTime;
 
-        public EditEventDescriptor() {
-        }
+        public EditEventDescriptor() {}
 
         /**
          * Copy constructor.

src/main/java/ezschedule/logic/commands/FindCommand.java

@@ -2,9 +2,17 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.util.Arrays;
+import java.util.Optional;
+
 import ezschedule.commons.core.Messages;
+import ezschedule.logic.parser.CliSyntax;
 import ezschedule.model.Model;
+import ezschedule.model.event.Date;
 import ezschedule.model.event.EventContainsKeywordsPredicate;
+import ezschedule.model.event.EventMatchesDatePredicate;
+import ezschedule.model.event.EventMatchesKeywordsAndDatePredicate;
+import ezschedule.model.event.Name;
 
 /**
  * Finds and lists all events in scheduler whose name contains any of the argument keywords.
@@ -14,29 +22,106 @@ public class FindCommand extends Command {
 
     public static final String COMMAND_WORD = "find";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds events that contain keyword provided"
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds events that contain keyword provided "
             + "and displays them as a list with index number \n"
-            + "Parameters: KEYWORD [MORE_KEYWORDS] ... \n"
-            + "Example: " + COMMAND_WORD + " booking basketball court";
+            + "Parameters: "
+            + CliSyntax.PREFIX_NAME + "NAME "
+            + CliSyntax.PREFIX_DATE + "DATE "
+            + "\nExample: " + COMMAND_WORD + " "
+            + "Example: " + COMMAND_WORD + " "
+            + CliSyntax.PREFIX_NAME + "basketball court "
+            + CliSyntax.PREFIX_DATE + "2023-01-01 ";
 
-    private final EventContainsKeywordsPredicate predicate;
+    private final FindEventDescriptor findEventDescriptor;
 
-    public FindCommand(EventContainsKeywordsPredicate predicate) {
-        this.predicate = predicate;
+    public FindCommand(FindEventDescriptor findEventDescriptor) {
+        this.findEventDescriptor = findEventDescriptor;
     }
 
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
-        model.updateFilteredEventList(predicate);
+        if (findEventDescriptor.getName().isPresent() && findEventDescriptor.getDate().isPresent()) {
+            String[] nameKeywords = findEventDescriptor.getName().get().toString().split("\\s+");
+            Date date = findEventDescriptor.getDate().get();
+            EventMatchesKeywordsAndDatePredicate predicate =
+                    new EventMatchesKeywordsAndDatePredicate(Arrays.asList(nameKeywords), date);
+            model.updateFilteredEventList(predicate);
+
+        } else if (findEventDescriptor.getName().isPresent()) {
+            String[] nameKeywords = findEventDescriptor.getName().get().toString().split("\\s+");
+            EventContainsKeywordsPredicate predicate = new EventContainsKeywordsPredicate(Arrays.asList(nameKeywords));
+            model.updateFilteredEventList(predicate);
+
+        } else {
+            Date date = findEventDescriptor.getDate().get();
+            EventMatchesDatePredicate predicate = new EventMatchesDatePredicate(date);
+            model.updateFilteredEventList(predicate);
+        }
+
         return new CommandResult(
-            String.format(Messages.MESSAGE_EVENTS_LISTED_OVERVIEW, model.getFilteredEventList().size()));
+                String.format(Messages.MESSAGE_EVENTS_LISTED_OVERVIEW, model.getFilteredEventList().size()));
     }
 
     @Override
     public boolean equals(Object other) {
         return other == this // short circuit if same object
             || (other instanceof FindCommand // instanceof handles nulls
-            && predicate.equals(((FindCommand) other).predicate)); // state check
+            && findEventDescriptor.equals(((FindCommand) other).findEventDescriptor)); // state check
+    }
+
+    /**
+     * Stores the details to find the event with.
+     * Each non-empty field value will replace the corresponding field value of the event.
+     */
+    public static class FindEventDescriptor {
+
+        private Name name;
+        private Date date;
+
+        public FindEventDescriptor() {}
+
+        /**
+         * Copy constructor.
+         */
+        public FindEventDescriptor(FindEventDescriptor toCopy) {
+            setName(toCopy.name);
+            setDate(toCopy.date);
+        }
+
+        public Optional<Name> getName() {
+            return Optional.ofNullable(name);
+        }
+
+        public void setName(Name name) {
+            this.name = name;
+        }
+
+        public Optional<Date> getDate() {
+            return Optional.ofNullable(date);
+        }
+
+        public void setDate(Date date) {
+            this.date = date;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            // short circuit if same object
+            if (other == this) {
+                return true;
+            }
+
+            // instanceof handles nulls
+            if (!(other instanceof FindEventDescriptor)) {
+                return false;
+            }
+
+            // state check
+            FindEventDescriptor e = (FindEventDescriptor) other;
+
+            return getName().equals(e.getName())
+                    && getDate().equals(e.getDate());
+        }
     }
 }

src/main/java/ezschedule/logic/parser/FindCommandParser.java

@@ -1,32 +1,49 @@
 package ezschedule.logic.parser;
 
-import java.util.Arrays;
+import java.util.stream.Stream;
 
 import ezschedule.commons.core.Messages;
 import ezschedule.logic.commands.FindCommand;
+import ezschedule.logic.commands.FindCommand.FindEventDescriptor;
 import ezschedule.logic.parser.exceptions.ParseException;
-import ezschedule.model.event.EventContainsKeywordsPredicate;
 
 /**
  * Parses input arguments and creates a new FindCommand object
  */
 public class FindCommandParser implements Parser<FindCommand> {
 
+    /**
+     * Returns true if any of the prefixes contains empty {@code Optional} values
+     * in the given {@code ArgumentMultimap}.
+     */
+    private static boolean areAnyPrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
+        return Stream.of(prefixes).anyMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
+    }
+
     /**
      * Parses the given {@code String} of arguments in the context of the FindCommand
      * and returns a FindCommand object for execution.
      *
      * @throws ParseException if the user input does not conform the expected format
      */
     public FindCommand parse(String args) throws ParseException {
-        String trimmedArgs = args.trim();
-        if (trimmedArgs.isEmpty()) {
+        ArgumentMultimap argMultimap =
+                ArgumentTokenizer.tokenize(args, CliSyntax.PREFIX_NAME, CliSyntax.PREFIX_DATE);
+
+        if (!areAnyPrefixesPresent(argMultimap, CliSyntax.PREFIX_NAME, CliSyntax.PREFIX_DATE)
+                || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(
-                String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+                    String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
         }
 
-        String[] nameKeywords = trimmedArgs.split("\\s+");
+        FindEventDescriptor findEventDescriptor = new FindEventDescriptor();
+        if (argMultimap.getValue(CliSyntax.PREFIX_NAME).isPresent()) {
+            findEventDescriptor.setName(ParserUtil.parseName(argMultimap.getValue(CliSyntax.PREFIX_NAME).get()));
+        }
+        if (argMultimap.getValue(CliSyntax.PREFIX_DATE).isPresent()) {
+            findEventDescriptor.setDate(ParserUtil.parseDate(argMultimap.getValue(CliSyntax.PREFIX_DATE).get()));
+        }
 
-        return new FindCommand(new EventContainsKeywordsPredicate(Arrays.asList(nameKeywords)));
+        return new FindCommand(findEventDescriptor);
     }
 }

src/main/java/ezschedule/model/Model.java

@@ -47,14 +47,14 @@ public interface Model {
     void setSchedulerFilePath(Path schedulerFilePath);
 
     /**
-     * Replaces scheduler data with the data in {@code scheduler}.
+     * Returns the Scheduler
      */
-    void setScheduler(ReadOnlyScheduler scheduler);
+    ReadOnlyScheduler getScheduler();
 
     /**
-     * Returns the Scheduler
+     * Replaces scheduler data with the data in {@code scheduler}.
      */
-    ReadOnlyScheduler getScheduler();
+    void setScheduler(ReadOnlyScheduler scheduler);
 
     /**
      * Returns true if an event with the same identity as {@code event} exists in the Scheduler.
@@ -90,6 +90,12 @@ public interface Model {
      */
     ObservableList<Event> getUpcomingEventList();
 
+    /**
+     * Returns an unmodifiable view of the event list
+     */
+    ObservableList<Event> getEventList();
+
+
     /**
      * Returns an unmodifiable view of the filtered event list
      */

src/main/java/ezschedule/model/ModelManager.java

@@ -116,7 +116,7 @@ public void setEvent(Event target, Event editedEvent) {
         scheduler.setEvent(target, editedEvent);
     }
 
-    //=========== Filtered Event List Accessors =============================================================
+    //=========== Event List Accessors =============================================================
 
     /**
      * Returns an unmodifiable view of the list of {@code Event} backed by the internal list of
@@ -131,6 +131,11 @@ public ObservableList<Event> getUpcomingEventList() {
      * Returns an unmodifiable view of the list of {@code Event} backed by the internal list of
      * {@code scheduler}
      */
+    @Override
+    public ObservableList<Event> getEventList() {
+        return scheduler.getEventList();
+    }
+
     @Override
     public ObservableList<Event> getFilteredEventList() {
         return filteredEvents;
@@ -157,7 +162,7 @@ public boolean equals(Object obj) {
         // state check
         ModelManager other = (ModelManager) obj;
         return scheduler.equals(other.scheduler)
-            && userPrefs.equals(other.userPrefs)
-            && filteredEvents.equals(other.filteredEvents);
+                && userPrefs.equals(other.userPrefs)
+                && filteredEvents.equals(other.filteredEvents);
     }
 }

src/main/java/ezschedule/model/Scheduler.java

@@ -79,7 +79,6 @@ public void setEvents(List<Event> events) {
      */
     public void resetData(ReadOnlyScheduler newData) {
         requireNonNull(newData);
-
         setEvents(newData.getEventList());
     }