Change predicate to contain both address and status

Author: alex-setyawan

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

@@ -6,41 +6,13 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+
 import java.util.function.Predicate;
 
-import seedu.address.commons.util.CollectionUtil;
 import seedu.address.commons.util.ToStringBuilder;
-import seedu.address.logic.Messages;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Allergies;
-import seedu.address.model.person.BloodType;
-import seedu.address.model.person.Condition;
-import seedu.address.model.person.Country;
-import seedu.address.model.person.DateOfAdmission;
-import seedu.address.model.person.DateOfBirth;
-import seedu.address.model.person.Diagnosis;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Nric;
-import seedu.address.model.person.NricContainsKeywordsPredicate;
 import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.person.Sex;
-import seedu.address.model.person.Status;
-import seedu.address.model.person.StatusContainsKeywordsPredicate;
-import seedu.address.model.person.Symptom;
-import seedu.address.model.tag.Tag;
 
 
 /**
@@ -86,10 +58,6 @@ public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
         model.updateFilteredPersonList(predicate);
 
-        ArrayList<String> statusKeywords = new ArrayList<>();
-        statusKeywords.add("UNWELL");
-        model.updateFilteredPersonList(new StatusContainsKeywordsPredicate(statusKeywords));
-
         if (model.getFilteredPersonList().size() >= clusterSize) {
             return new CommandResult(String.format(MESSAGE_CLUSTER_FOUND_SUCCESS));
         } else {

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

@@ -92,7 +92,7 @@ public CommandResult execute(Model model) throws CommandException {
                 new NricContainsKeywordsPredicate(nric.toString())).findFirst().get();
         Person updatedPerson = createUpdatedPerson(personToUpdate, updatePersonDescriptor);
 
-        if (!personToUpdate.isSamePerson(updatedPerson) && model.hasPerson(updatedPerson)) {
+        if (!(personToUpdate.isSamePerson(updatedPerson) && model.hasPerson(updatedPerson))) {
             throw new CommandException(MESSAGE_DUPLICATE_PERSON);
         }
 

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

@@ -2,12 +2,9 @@
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 
-import java.util.Arrays;
-import java.util.List;
-
 import seedu.address.logic.commands.ClusterCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.AddressContainsKeywordsPredicate;
+import seedu.address.model.person.AddressAndStatusPredicate;
 
 /**
  * Parses input arguments and creates a new FindCommand object
@@ -39,8 +36,7 @@ public ClusterCommand parse(String args) throws ParseException {
                     String.format(MESSAGE_INVALID_COMMAND_FORMAT, ClusterCommand.MESSAGE_USAGE));
         }
 
-        String addressKeywords = keywords[1];
-        List<String> list = Arrays.asList(addressKeywords);
-        return new ClusterCommand(clusterSize, new AddressContainsKeywordsPredicate(list));
+        String addressKeyword = keywords[1];
+        return new ClusterCommand(clusterSize, new AddressAndStatusPredicate(addressKeyword, "UNWELL"));
     }
 }

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

@@ -0,0 +1,50 @@
+package seedu.address.model.person;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import seedu.address.commons.util.StringUtil;
+import seedu.address.commons.util.ToStringBuilder;
+
+/**
+ * Tests that a {@code Person}'s {@code Status} matches any of the keywords given.
+ */
+public class AddressAndStatusPredicate implements Predicate<Person> {
+    private final String address;
+    private final String status;
+    public AddressAndStatusPredicate(String address, String status) {
+        this.address = address;
+        this.status = status;
+    }
+
+    @Override
+    public boolean test(Person person) {
+        return person.getAddress().toString().toLowerCase().contains(address)
+                && person.getStatus().toString().equals(status);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof AddressAndStatusPredicate)) {
+            return false;
+        }
+
+        AddressAndStatusPredicate otherAddressAndStatusPredicate =
+                (AddressAndStatusPredicate) other;
+        return address.equals(otherAddressAndStatusPredicate.address)
+                && status.equals(otherAddressAndStatusPredicate.status);
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .add("address", address)
+                .add("status", status)
+                .toString();
+    }
+}