[W5.4][T14-A4]Melanie Ng

doc/UserGuide.md

@@ -41,6 +41,8 @@ Format: `list`
 ## Finding all persons containing any keyword in their name: `find`
 Finds persons whose names contain any of the given keywords.<br>
 Format: `find KEYWORD [MORE_KEYWORDS]`
+Finds person with their recorded phone number. <br>
+Format: `find 11111111`
 
 > The search is case sensitive, the order of the keywords does not matter, only the name is searched, 
 and persons matching at least one keyword will be returned (i.e. `OR` search).

src/seedu/addressbook/commands/FindCommand.java

@@ -46,11 +46,17 @@ private List<ReadOnlyPerson> getPersonsWithNameContainingAnyKeyword(Set<String>
         final List<ReadOnlyPerson> matchedPersons = new ArrayList<>();
         for (ReadOnlyPerson person : addressBook.getAllPersons()) {
             final Set<String> wordsInName = new HashSet<>(person.getName().getWordsInName());
-            if (!Collections.disjoint(wordsInName, keywords)) {
+            final Set<String> numInPhone = new HashSet<>(person.getPhone().getNumInPhone());
+            if (!Collections.disjoint(numInPhone, keywords)) {
                 matchedPersons.add(person);
             }
+            else if (!Collections.disjoint(wordsInName, keywords)) {
+                matchedPersons.add(person);
+            }
+
         }
         return matchedPersons;
     }
 
+
 }

src/seedu/addressbook/data/person/Phone.java

@@ -2,6 +2,9 @@
 
 import seedu.addressbook.data.exception.IllegalValueException;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Represents a Person's phone number in the address book.
  * Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)}
@@ -36,6 +39,13 @@ public static boolean isValidPhone(String test) {
         return test.matches(PHONE_VALIDATION_REGEX);
     }
 
+    /**
+     * Retrieves a listing of every number in the name, in order.
+     */
+    public List<String> getNumInPhone() {
+        return Arrays.asList(value);
+    }
+
     @Override
     public String toString() {
         return value;

test/java/seedu/addressbook/logic/LogicTest.java

@@ -433,28 +433,50 @@ public void execute_find_isCaseSensitive() throws Exception {
         assertCommandBehavior("find KEY",
                                 Command.getMessageForPersonListShownSummary(expectedList),
                                 expectedAB,
-                                true,
+                                 true,
                                 expectedList);
     }
 
-    @Test
+     @Test
     public void execute_find_matchesIfAnyKeywordPresent() throws Exception {
         TestDataHelper helper = new TestDataHelper();
         Person pTarget1 = helper.generatePersonWithName("bla bla KEY bla");
         Person pTarget2 = helper.generatePersonWithName("bla rAnDoM bla bceofeia");
         Person p1 = helper.generatePersonWithName("key key");
         Person p2 = helper.generatePersonWithName("KEy sduauo");
+        Person pTarget3 = helper.generatePersonWithName("12345678");
+        Person pTarget4 = helper.generatePersonWithName("87654321");
+        Person p3 = helper.generatePersonWithName("24681012");
+        Person p4 = helper.generatePersonWithName("12108642");
 
         List<Person> fourPersons = helper.generatePersonList(p1, pTarget1, p2, pTarget2);
         AddressBook expectedAB = helper.generateAddressBook(fourPersons);
         List<Person> expectedList = helper.generatePersonList(pTarget1, pTarget2);
         helper.addToAddressBook(addressBook, fourPersons);
 
+        List<Person> fourNum = helper.generatePersonList(p3, pTarget3, p4, pTarget4);
+        AddressBook expectedCD = helper.generateAddressBook(fourNum);
+        List<Person> expectedL = helper.generatePersonList(pTarget3, pTarget4);
+        helper.addToAddressBook(addressBook, fourNum);
+
         assertCommandBehavior("find KEY rAnDoM",
                                 Command.getMessageForPersonListShownSummary(expectedList),
                                 expectedAB,
                                 true,
                                 expectedList);
+
+        assertCommandBehavior("find 12348765",
+                                Command.getMessageForPersonListShownSummary(expectedL),
+                                expectedCD,
+                                true,
+                                expectedL);
+
+//        assertCommandBehavior("find 8765 4321",
+//                                Command.getMessageForPersonListShownSummary(expectedL),
+//                                expectedCD,
+//                                true,
+//                                expectedL);
+
     }
 
     /**
@@ -586,6 +608,7 @@ Person generatePersonWithName(String name) throws Exception {
                     new UniqueTagList(new Tag("tag"))
             );
         }
+
     }
 
 }