Update findby command with new fields

src/main/java/seedu/address/logic/commands/FindByCommand.java

@@ -2,11 +2,17 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DEVICEINFO;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ORGID;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
 import seedu.address.logic.parser.Prefix;
@@ -26,12 +32,20 @@ public class FindByCommand extends Command {
         PREFIX_PHONE,
         PREFIX_EMAIL,
         PREFIX_ADDRESS,
-        PREFIX_TAG
+        PREFIX_TAG,
+        PREFIX_STATUS,
+        PREFIX_ORGID,
+        PREFIX_DEVICEINFO,
     };
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons by specifying attributes that "
-            + "should contain any of the specified keywords (case-insensitive) and displays them as a list with index"
-            + " numbers.\nParameters: KEYWORD [MORE_KEYWORDS]...\n"
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons by specifying an attribute that"
+            + " should contain any of the specified keywords (case-insensitive) and displays them as a list with index"
+            + " numbers.\n"
+            + "Supported prefixes: "
+            + Arrays.stream(FINDBY_PREFIXES)
+            .map(Prefix::toString)
+            .collect(Collectors.joining(", "))
+            + "\nParameters: KEYWORD [MORE_KEYWORDS]...\n"
             + "Example: " + COMMAND_WORD + " e/ alice";
 
     private final AttributeContainsKeywordsPredicate predicate;

src/main/java/seedu/address/logic/parser/ArgumentMultimap.java

@@ -9,7 +9,6 @@
 
 import seedu.address.logic.Messages;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.AttributeContainsKeywordsPredicate;
 
 /**
  * Stores mapping of prefixes to their respective arguments.
@@ -84,7 +83,7 @@ public boolean equals(Object other) {
         }
 
         // instanceof handles nulls
-        if (!(other instanceof AttributeContainsKeywordsPredicate)) {
+        if (!(other instanceof ArgumentMultimap)) {
             return false;
         }
 

src/main/java/seedu/address/model/person/AttributeContainsKeywordsPredicate.java

@@ -1,9 +1,12 @@
 package seedu.address.model.person;
 
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DEVICEINFO;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ORGID;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
 import java.util.function.Predicate;
@@ -36,6 +39,12 @@ public boolean test(Person person) {
                     return StringUtil.containsSubstringIgnoreCase(person.getPhone().value, keyword);
                 } else if (prefix == PREFIX_ADDRESS) {
                     return StringUtil.containsSubstringIgnoreCase(person.getAddress().value, keyword);
+                } else if (prefix == PREFIX_STATUS) {
+                    return StringUtil.containsSubstringIgnoreCase(person.getStatus().toString(), keyword);
+                } else if (prefix == PREFIX_ORGID) {
+                    return StringUtil.containsSubstringIgnoreCase(person.getOrgID().value, keyword);
+                } else if (prefix == PREFIX_DEVICEINFO) {
+                    return StringUtil.containsSubstringIgnoreCase(person.getDeviceInfo().deviceInfo, keyword);
                 } else if (prefix == PREFIX_TAG) {
                     return person.getTags().stream()
                             .anyMatch(tag -> StringUtil.containsSubstringIgnoreCase(tag.tagName, keyword));

src/test/java/seedu/address/logic/commands/FindByCommandTest.java

@@ -0,0 +1,48 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.fail;
+import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.parser.FindByCommandParser;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindCommand}.
+ */
+public class FindByCommandTest {
+    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+    private Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+
+    @Test
+    public void equals() {
+
+        try {
+            FindByCommand findFirstCommand = new FindByCommandParser().parse(" n/first");
+            FindByCommand findSecondCommand = new FindByCommandParser().parse(" n/second");
+
+            // same object -> returns true
+            findFirstCommand.equals(findFirstCommand);
+
+            // same values -> returns true
+            FindByCommand findFirstCommandCopy = new FindByCommandParser().parse(" n/first");
+            findFirstCommand.equals(findFirstCommandCopy);
+
+            // different types -> returns false
+            findFirstCommand.equals(1);
+
+            // null -> returns false
+            findFirstCommand.equals(null);
+
+            // different person -> returns false
+            findFirstCommand.equals(findSecondCommand);
+
+        } catch (ParseException e) {
+            fail("ParseException was thrown: " + e.getMessage());
+        }
+    }
+}