[W5][W16-3]Zhang Jiayu

src/seedu/addressbook/commands/FindPhoneNumberCommand.java

@@ -0,0 +1,60 @@
+package seedu.addressbook.commands;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import seedu.addressbook.data.person.ReadOnlyPerson;
+
+/**
+ * Finds and lists all persons in address book whose telephone number is the argument keywords.
+ * Keyword matching is case sensitive.
+ */
+public class FindPhoneNumberCommand extends Command {
+
+    public static final String COMMAND_WORD = "findPhoneNumber";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds the person whose telephone number is "
+            + "the specified keywords (case-sensitive) and displays the person's information.\n"
+            + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
+            + "Example: " + COMMAND_WORD + " 12345678";
+
+    private final Set<String> keywords;
+
+    public FindPhoneNumberCommand(Set<String> keywords) {
+        this.keywords = keywords;
+    }
+
+    /**
+     * Returns a copy of keywords in this command.
+     */
+    public Set<String> getKeywords() {
+        return new HashSet<>(keywords);
+    }
+
+    @Override
+    public CommandResult execute() {
+        final List<ReadOnlyPerson> numberFound = getPersonsWithNameContainingAnyKeyword(keywords);
+        return new CommandResult(getMessageForPersonListShownSummary(numberFound), numberFound);
+    }
+
+    /**
+     * Retrieves all persons in the address book whose names contain some of the specified keywords.
+     *
+     * @param keywords for searching
+     * @return list of persons found
+     */
+    private List<ReadOnlyPerson> getPersonsWithNameContainingAnyKeyword(Set<String> keywords) {
+        final List<ReadOnlyPerson> matchedPersons = new ArrayList<>();
+        for (ReadOnlyPerson person : addressBook.getAllPersons()) {
+            final Set<String> wordsInName = new HashSet<>(person.getPhone().getWordsInPhone());
+            if (!Collections.disjoint(wordsInName, keywords)) {
+                matchedPersons.add(person);
+            }
+        }
+        return matchedPersons;
+    }
+
+}

src/seedu/addressbook/commands/HelpCommand.java

@@ -23,6 +23,7 @@ public CommandResult execute() {
                 + "\n" + ViewAllCommand.MESSAGE_USAGE
                 + "\n" + HelpCommand.MESSAGE_USAGE
                 + "\n" + ExitCommand.MESSAGE_USAGE
+                + "\n" + FindPhoneNumberCommand.MESSAGE_USAGE
         );
     }
 }

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,10 @@ public static boolean isValidPhone(String test) {
         return test.matches(PHONE_VALIDATION_REGEX);
     }
 
+    public List<String> getWordsInPhone() {
+        return Arrays.asList(value.split("\\s+"));
+    }
+
     @Override
     public String toString() {
         return value;

src/seedu/addressbook/parser/Parser.java

@@ -11,17 +11,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import seedu.addressbook.commands.AddCommand;
-import seedu.addressbook.commands.ClearCommand;
-import seedu.addressbook.commands.Command;
-import seedu.addressbook.commands.DeleteCommand;
-import seedu.addressbook.commands.ExitCommand;
-import seedu.addressbook.commands.FindCommand;
-import seedu.addressbook.commands.HelpCommand;
-import seedu.addressbook.commands.IncorrectCommand;
-import seedu.addressbook.commands.ListCommand;
-import seedu.addressbook.commands.ViewAllCommand;
-import seedu.addressbook.commands.ViewCommand;
+import seedu.addressbook.commands.*;
 import seedu.addressbook.data.exception.IllegalValueException;
 
 /**
@@ -88,6 +78,9 @@ public Command parseCommand(String userInput) {
         case ListCommand.COMMAND_WORD:
             return new ListCommand();
 
+        case FindPhoneNumberCommand.COMMAND_WORD:
+            return prepareFindPhoneNumber(arguments);
+
         case ViewCommand.COMMAND_WORD:
             return prepareView(arguments);
 
@@ -248,5 +241,18 @@ private Command prepareFind(String args) {
         return new FindCommand(keywordSet);
     }
 
+    private Command prepareFindPhoneNumber(String args) {
+        final Matcher matcher = KEYWORDS_ARGS_FORMAT.matcher(args.trim());
+        if (!matcher.matches()) {
+            return new IncorrectCommand(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                    FindCommand.MESSAGE_USAGE));
+        }
+
+        // keywords delimited by whitespace
+        final String[] keywords = matcher.group("keywords").split("\\s+");
+        final Set<String> keywordSet = new HashSet<>(Arrays.asList(keywords));
+        return new FindPhoneNumberCommand(keywordSet);
+    }
+
 
 }