Merge pull request nus-cs2103-AY2425S1#262 from jessica2828/func-bug-fix

Fix FilterCommand bug
juliantayyc · Nov 11, 2024 · 70d1415 · 70d1415
2 parents 22887bd + b2c53f1
commit 70d1415
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -278,7 +278,7 @@ filter [KEYWORD_PREFIX] [MORE_KEYWORDS]
 
 * **For filtering by Module:**
   * Use prefix `m/`.
-  * Partial matching is supported, allowing users to input parts of module codes. e.g. `m/CS21` will match modules like "CS2103T" and "CS2101."
+  * Only full module codes will be matched, e.g. `m/CS2103T` will match the module "CS2103T", and not `m/CS21`.
 
 <!-- -->
 

diff --git a/src/main/java/seedu/address/model/person/ModuleContainsKeywordsPredicate.java b/src/main/java/seedu/address/model/person/ModuleContainsKeywordsPredicate.java
@@ -16,8 +16,9 @@ public ModuleContainsKeywordsPredicate(String keyword) {
 
     @Override
     public boolean test(Person person) {
+        String regex = "\\b" + keyword.toLowerCase() + "\\b";
         return person.getModules().stream()
-                .anyMatch(module -> module.toString().toLowerCase().contains(keyword.toLowerCase()));
+                .anyMatch(module -> module.toString().toLowerCase().matches(".*" + regex + ".*"));
     }
 
     @Override

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