Add Changes and Predicate

Some minor leftovers from AddressBook have to be cleared. Following the Delete Person tests carefully,
some classes should be introduced like Predicate classes for checking keywords in meeting names. Some
meeting test util functions are also ported over to be able to aid in testing meetings.

Lets
-Add an extension to Predicate, to check for certain keywords in meeting names.

Author: Maurice2n97

src/main/java/seedu/address/commons/core/Messages.java

@@ -9,5 +9,7 @@ public class Messages {
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
     public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
     public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
+    public static final String MESSAGE_INVALID_MEETING_DISPLAYED_INDEX = "The person index provided is invalid";
+
 
 }

src/main/java/seedu/address/logic/commands/meetings/DeleteMeetingCommand.java

@@ -5,7 +5,6 @@
 import seedu.address.logic.commands.Command;
 import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.commands.persons.DeletePersonCommand;
 import seedu.address.model.Model;
 import seedu.address.model.meeting.Meeting;
 
@@ -21,7 +20,7 @@ public class DeleteMeetingCommand extends Command {
             + "Parameters: INDEX (must be a positive integer)\n"
             + "Example: " + COMMAND_WORD + " 1";
 
-    public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Meeting: %1$s";
+    public static final String MESSAGE_DELETE_MEETING_SUCCESS = "Deleted Meeting: %1$s";
 
 
     private final Index targetIndex;
@@ -36,12 +35,12 @@ public CommandResult execute(Model model) throws CommandException {
         List<Meeting> lastShownList = model.getFilteredMeetingList();
 
         if (targetIndex.getZeroBased() >= lastShownList.size()) {
-            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+            throw new CommandException(Messages.MESSAGE_INVALID_MEETING_DISPLAYED_INDEX);
         }
 
         Meeting meetingToDelete = lastShownList.get(targetIndex.getZeroBased());
         model.deleteMeeting(meetingToDelete);
-        return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, meetingToDelete));
+        return new CommandResult(String.format(MESSAGE_DELETE_MEETING_SUCCESS, meetingToDelete));
     }
 
     @Override

src/main/java/seedu/address/model/Model.java

@@ -98,7 +98,7 @@ public interface Model {
      */
     void setMeetingBook(ReadOnlyMeetingBook meetingBook);
 
-    /** Returns the AddressBook */
+    /** Returns the Book */
     ReadOnlyMeetingBook getMeetingBook();
 
     /**

src/main/java/seedu/address/model/ModelManager.java

@@ -29,23 +29,42 @@ public class ModelManager implements Model {
     private final FilteredList<Person> filteredPersons;
 
     // TODO: Modify the signature of ModelManager so that we can add meetings inside it.
-    private final MeetingBook meetingBook = new MeetingBook();
-    private final FilteredList<Meeting> filteredMeetings = new FilteredList<Meeting>(this.meetingBook.getMeetingList());
-
+    private final MeetingBook meetingBook;
+    private final FilteredList<Meeting> filteredMeetings;
     /**
-     * Initializes a ModelManager with the given addressBook and userPrefs.
+     * Initializes a ModelManager with the given addressBook and userPrefs. MeetingBook will be set to default.
      */
     public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyUserPrefs userPrefs) {
         super();
         requireAllNonNull(addressBook, userPrefs);
 
         logger.fine("Initializing with address book: " + addressBook + " and user prefs " + userPrefs);
 
+        this.meetingBook = new MeetingBook();
+        this.filteredMeetings = new FilteredList<Meeting>(this.meetingBook.getMeetingList());
+        this.addressBook = new AddressBook(addressBook);
+        this.userPrefs = new UserPrefs(userPrefs);
+        filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
+    }
+
+    /**
+     * Initializes a ModelManager with the given addressBook, meetingBOok and userPrefs
+     */
+    public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyMeetingBook meetingBook,
+                        ReadOnlyUserPrefs userPrefs) {
+        super();
+        requireAllNonNull(addressBook, userPrefs);
+
+        logger.fine("Initializing with address book: " + addressBook + " and user prefs " + userPrefs);
+
+        this.meetingBook = new MeetingBook(meetingBook);
+        this.filteredMeetings = new FilteredList<Meeting>(this.meetingBook.getMeetingList());
         this.addressBook = new AddressBook(addressBook);
         this.userPrefs = new UserPrefs(userPrefs);
         filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
     }
 
+
     public ModelManager() {
         this(new AddressBook(), new UserPrefs());
     }

src/main/java/seedu/address/model/meeting/NameContainsKeywordsPredicate.java

@@ -0,0 +1,36 @@
+package seedu.address.model.meeting;
+
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import seedu.address.commons.util.StringUtil;
+
+/**
+ * Tests that a {@code Meeting}'s {@code MeetingName} matches any of the keywords given.
+ */
+public class NameContainsKeywordsPredicate implements Predicate<Meeting> {
+    private final List<String> keywords;
+
+    public NameContainsKeywordsPredicate(List<String> keywords) {
+        this.keywords = keywords;
+    }
+
+    @Override
+    public boolean test(Meeting meeting) {
+        return keywords.stream()
+                .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(meeting.getName().fullName, keyword));
+    }
+
+
+    @Override
+    //TODO: Do we have to include full path name to disntinguish from other NamePredicate? Feels redundant.
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof NameContainsKeywordsPredicate // instanceof handles
+                // nulls
+                && keywords.equals(((NameContainsKeywordsPredicate) other).keywords));
+        // state check
+    }
+
+}

src/test/java/seedu/address/logic/commands/meetings/MeetingCommandTestUtil.java

@@ -1,5 +1,14 @@
 package seedu.address.logic.commands.meetings;
 
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.meeting.Meeting;
+import seedu.address.model.meeting.NameContainsKeywordsPredicate;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_END_TIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_GROUP;
@@ -13,15 +22,15 @@
  */
 public class MeetingCommandTestUtil {
 
-    public static final String VALID_NAME_MEETING1 = "CS2103 Conference";
+    public static final String VALID_NAME_MEETING1 = "JCP Conference";
     public static final String VALID_NAME_MEETING2 = "NUS Seminar";
     public static final String VALID_START_MEETING1 = "2021-01-01 19:00";
     public static final String VALID_START_MEETING2 = "2021-03-15 17:00";
     public static final String VALID_TERMINATE_MEETING1 = "2021-01-01 20:00";
     public static final String VALID_TERMINATE_MEETING2 = "2021-03-15 18:00";
     public static final String VALID_PRIORITY_MEETING1 = "2";
     public static final String VALID_PRIORITY_MEETING2 = "5";
-    public static final String VALID_DESCRIPTION_MEETING1 = "CS2103 Conference Test";
+    public static final String VALID_DESCRIPTION_MEETING1 = "JCP Conference Test";
     public static final String VALID_DESCRIPTION_MEETING2 = "NUS Seminar Test";
     public static final String VALID_TAG_MEETING1 = "SoC";
     public static final String VALID_TAG_MEETING2 = "University";
@@ -46,7 +55,7 @@ public class MeetingCommandTestUtil {
     public static final String INVALID_DATETIME_DESC = " " + PREFIX_START_TIME + "2020/02/03 09:00";
     public static final String INVALID_PRIORITY_DESC = " " + PREFIX_PRIORITY + "-2";
     public static final String INVALID_TAG_DESC = " " + PREFIX_GROUP + "hubby*"; // '*' not allowed in tags
-}
+
 
 //
 //    public static final String PREAMBLE_WHITESPACE = "\t  \r  \n";
@@ -106,16 +115,18 @@ public class MeetingCommandTestUtil {
 //        assertEquals(expectedAddressBook, actualModel.getAddressBook());
 //        assertEquals(expectedFilteredList, actualModel.getFilteredPersonList());
 //    }
-//    /**
-//     * Updates {@code model}'s filtered list to show only the person at the given {@code targetIndex} in the
-//     * {@code model}'s address book.
-//     */
-//    public static void showPersonAtIndex(Model model, Index targetIndex) {
-//        assertTrue(targetIndex.getZeroBased() < model.getFilteredPersonList().size());
-//
-//        Person person = model.getFilteredPersonList().get(targetIndex.getZeroBased());
-//        final String[] splitName = person.getName().fullName.split("\\s+");
-//        model.updateFilteredPersonList(new NameContainsKeywordsPredicate(Arrays.asList(splitName[0])));
-//
-//        assertEquals(1, model.getFilteredPersonList().size());//}
+   /**
+    * Updates {@code model}'s filtered meetings list to show only the meeting at the given {@code targetIndex} in the
+    * {@code model}'s meeting book. It is mandatory for this case meeting names are unique with respect to their first
+    * word in their name.
+    */
+    public static void showMeetingAtIndex(Model model, Index targetIndex) {
+        assertTrue(targetIndex.getZeroBased() < model.getFilteredMeetingList().size());
+
+        Meeting meeting = model.getFilteredMeetingList().get(targetIndex.getZeroBased());
+        final String[] splitName = meeting.getName().fullName.split("\\s+");
+        model.updateFilteredMeetingList(new NameContainsKeywordsPredicate(Arrays.asList(splitName[0])));
+        assertEquals(1, model.getFilteredMeetingList().size());
+    }
+}
 

src/test/java/seedu/address/logic/commands/persons/DeletePersonCommandTest.java

@@ -106,4 +106,6 @@ private void showNoPerson(Model model) {
 
         assertTrue(model.getFilteredPersonList().isEmpty());
     }
+
+
 }

src/test/java/seedu/address/testutil/TypicalMeetings.java

@@ -18,6 +18,9 @@
 import java.util.List;
 
 import seedu.address.model.meeting.Meeting;
+import seedu.address.model.meeting.MeetingBook;
+import seedu.address.model.person.AddressBook;
+import seedu.address.model.person.Person;
 
 /**
  * A utility class containing a list of {@code Person} objects to be used in tests.
@@ -65,6 +68,14 @@ public class TypicalMeetings {
     //        return ab;
     //    }
 
+    public static MeetingBook getTypicalMeetingBook() {
+        MeetingBook mb = new MeetingBook();
+        for (Meeting meeting : getTypicalMeetings()) {
+            mb.addMeeting(meeting);
+        }
+        return mb;
+    }
+
     public static List<Meeting> getTypicalMeetings() {
         return new ArrayList<>(Arrays.asList(MEETING1, MEETING2, MEETING3, MEETING4, MEETING5));
     }