Update module filter matching

jessica2828 · Nov 10, 2024 · 39b0066 · 39b0066
1 parent 22887bd
commit 39b0066
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/seedu/address/model/person/ModuleContainsKeywordsPredicate.java b/src/main/java/seedu/address/model/person/ModuleContainsKeywordsPredicate.java
@@ -14,11 +14,12 @@ public ModuleContainsKeywordsPredicate(String keyword) {
         this.keyword = keyword;
     }
 
-    @Override
-    public boolean test(Person person) {
-        return person.getModules().stream()
-                .anyMatch(module -> module.toString().toLowerCase().contains(keyword.toLowerCase()));
-    }
+@Override
+public boolean test(Person person) {
+    String regex = "\\b" + keyword.toLowerCase() + "\\b";
+    return person.getModules().stream()
+            .anyMatch(module -> module.toString().toLowerCase().matches(".*" + regex + ".*"));
+}
 
     @Override
     public boolean equals(Object other) {

diff --git a/src/test/java/seedu/address/model/person/ModuleContainsKeywordsPredicateTest.java b/src/test/java/seedu/address/model/person/ModuleContainsKeywordsPredicateTest.java
@@ -45,9 +45,6 @@ public void test_moduleContainsKeyword_returnsTrue() {
 
         predicate = new ModuleContainsKeywordsPredicate("cs1010");
         assertTrue(predicate.test(new PersonBuilder().addUngradedModule("CS1010").build()));
-
-        predicate = new ModuleContainsKeywordsPredicate("1010");
-        assertTrue(predicate.test(new PersonBuilder().addUngradedModule("CS1010").build()));
     }
 
     @Test