Merge pull request #120 from EthanWong6362/master

last minutes changes for demo
AY2122S1-CS2103T-W12-4 · Oct 28, 2021 · 04469f6 · 04469f6
2 parents 9e47469 + 25f625f
commit 04469f6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/src/main/java/seedu/modulink/logic/commands/AddFavCommand.java b/src/main/java/seedu/modulink/logic/commands/AddFavCommand.java
@@ -1,9 +1,5 @@
 package seedu.modulink.logic.commands;
 
-import static seedu.modulink.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-
-import java.util.function.Predicate;
-
 import javafx.collections.ObservableList;
 import seedu.modulink.commons.core.Messages;
 import seedu.modulink.model.Model;
@@ -52,9 +48,7 @@ public CommandResult execute(Model model) {
             }
         }
         // included this so the list will be properly updated
-        Predicate<Person> updatePredicate = unused -> false;
-        model.updateFilteredPersonList(updatePredicate);
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        model.refreshFilteredPersonList();
 
         if (noPersonFound) {
             return new CommandResult(

diff --git a/src/main/java/seedu/modulink/logic/commands/RemFavCommand.java b/src/main/java/seedu/modulink/logic/commands/RemFavCommand.java
@@ -1,9 +1,5 @@
 package seedu.modulink.logic.commands;
 
-import static seedu.modulink.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-
-import java.util.function.Predicate;
-
 import javafx.collections.ObservableList;
 import seedu.modulink.commons.core.Messages;
 import seedu.modulink.model.Model;
@@ -46,9 +42,8 @@ public CommandResult execute(Model model) {
             }
         }
         // included this so the list will be properly updated
-        Predicate<Person> updatePredicate = unused -> false;
-        model.updateFilteredPersonList(updatePredicate);
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        model.refreshFilteredPersonList();
+
         if (noPersonFound) {
             return new CommandResult(Messages.MESSAGE_NO_SUCH_ID_FOUND);
         } else {

diff --git a/src/main/java/seedu/modulink/model/Model.java b/src/main/java/seedu/modulink/model/Model.java
@@ -91,6 +91,9 @@ public interface Model {
     /** Returns an unmodifiable view of the filtered person list */
     ObservableList<Person> getFilteredPersonList();
 
+    /** Refreshes current filtered person list to show any changes */
+    void refreshFilteredPersonList();
+
     /**
      * Updates the filter of the filtered person list to filter by the given {@code predicate}.
      * @throws NullPointerException if {@code predicate} is null.

diff --git a/src/main/java/seedu/modulink/model/ModelManager.java b/src/main/java/seedu/modulink/model/ModelManager.java
@@ -153,6 +153,15 @@ public void updateFilteredPersonList(Predicate<Person> predicate) {
         filteredPersons.setPredicate(predicate);
     }
 
+    @Override
+    public void refreshFilteredPersonList() {
+        @SuppressWarnings("unchecked")
+        Predicate<Person> predicate = (Predicate<Person>) filteredPersons.getPredicate();
+        Predicate<Person> updatePredicate = unused -> false;
+        updateFilteredPersonList(updatePredicate);
+        updateFilteredPersonList(predicate);
+    }
+
     @Override
     public boolean equals(Object obj) {
         // short circuit if same object

diff --git a/src/main/java/seedu/modulink/model/tag/Status.java b/src/main/java/seedu/modulink/model/tag/Status.java
@@ -51,7 +51,7 @@ public static Status parseStatusFromString(String s) {
         s = s.trim();
         if (s.equals("need group")) {
             return Status.NEED_GROUP;
-        } else if (s.equals("need member")) {
+        } else if (s.equals("need member") || s.equals("need members")) {
             return Status.NEED_MEMBER;
         } else {
             return Status.NONE;

diff --git a/src/test/java/seedu/modulink/logic/commands/CreateCommandTest.java b/src/test/java/seedu/modulink/logic/commands/CreateCommandTest.java
@@ -165,6 +165,11 @@ public void updateFilteredPersonList(Predicate<Person> predicate) {
             throw new AssertionError("This method should not be called.");
         }
 
+        @Override
+        public void refreshFilteredPersonList() {
+            throw new AssertionError("This method should not be called.");
+        }
+
         @Override
         public ObservableList<Person> getPersonList() {
             throw new AssertionError("This method should not be called.");