Merge branch 'master' into V1.3-post-testing

# Conflicts:
#	src/test/java/seedu/address/logic/commands/CommandTestUtil.java
#	src/test/java/seedu/address/logic/commands/EditCommandTest.java
#	src/test/java/seedu/address/model/person/HousekeeperTest.java
#	src/test/java/seedu/address/model/person/LeadsFilterPredicateTest.java
#	src/test/java/seedu/address/testutil/PersonBuilder.java
#	src/test/java/seedu/address/testutil/TypicalPersons.java

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

@@ -105,7 +105,6 @@ public static class EditPersonDescriptor {
         private Email email;
         private Address address;
         private Set<Tag> tags;
-        private Type type;
         private BookingList bookingList;
         private HousekeepingDetails details;
         private Area area;
@@ -122,7 +121,6 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
             setEmail(toCopy.email);
             setAddress(toCopy.address);
             setTags(toCopy.tags);
-            setType(toCopy.type);
             setBookingList(toCopy.bookingList);
             setDetails(toCopy.details);
             setArea(toCopy.area);
@@ -132,7 +130,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(name, phone, email, address, tags, type, area, bookingList);
+            return CollectionUtil.isAnyNonNull(name, phone, email, address, tags, area, bookingList);
         }
 
         public void setName(Name name) {
@@ -184,14 +182,6 @@ public Optional<Set<Tag>> getTags() {
             return (tags != null) ? Optional.of(Collections.unmodifiableSet(tags)) : Optional.empty();
         }
 
-        public void setType(Type type) {
-            this.type = type;
-        }
-
-        public Optional<Type> getType() {
-            return Optional.ofNullable(type);
-        }
-
         public void setBookingList(BookingList bookingList) {
             this.bookingList = bookingList;
         }
@@ -234,7 +224,6 @@ public boolean equals(Object other) {
                     && Objects.equals(address, otherEditPersonDescriptor.address)
                     && Objects.equals(area, otherEditPersonDescriptor.area)
                     && Objects.equals(tags, otherEditPersonDescriptor.tags)
-                    && Objects.equals(type, otherEditPersonDescriptor.type)
                     && Objects.equals(bookingList, otherEditPersonDescriptor.bookingList);
         }
 
@@ -246,7 +235,6 @@ public String toString() {
                     .add("email", email)
                     .add("address", address)
                     .add("tags", tags)
-                    .add("type", type)
                     .add("area", area)
                     .add("booking list", bookingList)
                     .toString();

src/main/java/seedu/address/model/AddressBook.java

@@ -132,18 +132,6 @@ public void setHousekeeper(Housekeeper target, Housekeeper editedHousekeeper) {
         housekeepers.setPerson(target, editedHousekeeper);
     }
 
-    /**
-     * Removes {@code key} from this {@code AddressBook}.
-     * {@code key} must exist in the address book.
-     */
-    public void removePerson(Person key) {
-        if (key.isClient()) {
-            clients.remove((Client) key);
-        } else {
-            housekeepers.remove((Housekeeper) key);
-        }
-    }
-
     /**
      * Removes {@code client} from this {@code AddressBook}.
      * {@code client} must exist in the address book.

src/test/java/seedu/address/logic/LogicManagerTest.java

@@ -7,7 +7,6 @@
 import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.TYPE_DESC_AMY;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.AMY;
 
@@ -28,11 +27,11 @@
 import seedu.address.model.ModelManager;
 import seedu.address.model.ReadOnlyAddressBook;
 import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Client;
 import seedu.address.storage.JsonAddressBookStorage;
 import seedu.address.storage.JsonUserPrefsStorage;
 import seedu.address.storage.StorageManager;
-import seedu.address.testutil.PersonBuilder;
+import seedu.address.testutil.ClientBuilder;
 
 public class LogicManagerTest {
     private static final IOException DUMMY_IO_EXCEPTION = new IOException("dummy IO exception");
@@ -85,7 +84,7 @@ public void execute_storageThrowsAdException_throwsCommandException() {
 
     @Test
     public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException() {
-        assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredPersonList().remove(0));
+        assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredClientList().remove(0));
     }
 
     /**
@@ -166,11 +165,11 @@ public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath)
         logic = new LogicManager(model, storage);
 
         // Triggers the saveAddressBook method by executing an add command
-        String addCommand = AddCommand.COMMAND_WORD + TYPE_DESC_AMY + NAME_DESC_AMY + PHONE_DESC_AMY
+        String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY
                 + EMAIL_DESC_AMY + ADDRESS_DESC_AMY;
-        Person expectedPerson = new PersonBuilder(AMY).withTags().build();
+        Client expectedClient = new ClientBuilder(AMY).withTags().build();
         ModelManager expectedModel = new ModelManager();
-        expectedModel.addPerson(expectedPerson);
+        expectedModel.addClient(expectedClient);
         assertCommandFailure(addCommand, CommandException.class, expectedMessage, expectedModel);
     }
 }

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

@@ -11,8 +11,10 @@
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
 import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.PersonBuilder;
+import seedu.address.model.person.Client;
+import seedu.address.model.person.Housekeeper;
+import seedu.address.testutil.ClientBuilder;
+import seedu.address.testutil.HousekeeperBuilder;
 
 /**
  * Contains integration tests (interaction with the Model) for {@code AddCommand}.
@@ -27,22 +29,41 @@ public void setUp() {
     }
 
     @Test
-    public void execute_newPerson_success() {
-        Person validPerson = new PersonBuilder().build();
+    public void execute_newClient_success() {
+        Client validClient = new ClientBuilder().build();
 
         Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
-        expectedModel.addPerson(validPerson);
+        expectedModel.addClient(validClient);
 
-        assertCommandSuccess(new AddCommand(validPerson), model,
-                String.format(AddCommand.MESSAGE_SUCCESS, Messages.format(validPerson)),
+        assertCommandSuccess(new AddClientCommand(validClient), model,
+                String.format(AddClientCommand.MESSAGE_SUCCESS, Messages.formatClient(validClient)),
                 expectedModel);
     }
 
     @Test
-    public void execute_duplicatePerson_throwsCommandException() {
-        Person personInList = model.getAddressBook().getPersonList().get(0);
-        assertCommandFailure(new AddCommand(personInList), model,
-                AddCommand.MESSAGE_DUPLICATE_PERSON);
+    public void execute_newHousekeeper_success() {
+        Housekeeper validHousekeeper = new HousekeeperBuilder().build();
+
+        Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
+        expectedModel.addHousekeeper(validHousekeeper);
+
+        assertCommandSuccess(new AddHousekeeperCommand(validHousekeeper), model,
+                String.format(AddHousekeeperCommand.MESSAGE_SUCCESS, validHousekeeper),
+                expectedModel);
+    }
+
+    @Test
+    public void execute_duplicateClient_throwsCommandException() {
+        Client clientInList = model.getAddressBook().getClientList().get(0);
+        assertCommandFailure(new AddClientCommand(clientInList), model,
+                AddClientCommand.MESSAGE_DUPLICATE_CLIENT);
+    }
+
+    @Test
+    public void execute_duplicateHousekeeper_throwsCommandException() {
+        Housekeeper housekeeperInList = model.getAddressBook().getHousekeeperList().get(0);
+        assertCommandFailure(new AddHousekeeperCommand(housekeeperInList), model,
+                AddHousekeeperCommand.MESSAGE_DUPLICATE_HOUSEKEEPER);
     }
 
 }

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

@@ -6,10 +6,12 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.ALICE;
+import static seedu.address.testutil.TypicalPersons.BOB;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.function.Predicate;
 
 import org.junit.jupiter.api.Test;
@@ -27,7 +29,6 @@
 import seedu.address.model.person.Person;
 import seedu.address.testutil.ClientBuilder;
 import seedu.address.testutil.HousekeeperBuilder;
-import seedu.address.testutil.PersonBuilder;
 
 public class AddCommandTest {
 
@@ -124,8 +125,12 @@ public void equals() {
     @Test
     public void toStringMethod() {
         AddClientCommand addClientCommand = new AddClientCommand(ALICE);
-        String expected = AddClientCommand.class.getCanonicalName() + "{toAdd=" + ALICE + "}";
-        assertEquals(expected, addClientCommand.toString());
+        String expectedOne = AddClientCommand.class.getCanonicalName() + "{toAdd=" + ALICE + "}";
+        assertEquals(expectedOne, addClientCommand.toString());
+
+        AddHousekeeperCommand addHousekeeperCommand = new AddHousekeeperCommand(BOB);
+        String expectedTwo = AddHousekeeperCommand.class.getCanonicalName() + "{toAdd=" + BOB + "}";
+        assertEquals(expectedTwo, addHousekeeperCommand.toString());
     }
 
     /**
@@ -223,14 +228,23 @@ public ObservableList<Housekeeper> getFilteredHousekeeperList() {
         }
 
         @Override
-        public void updateFilteredClientList(Predicate<Client> predicate) {
+        public void updateFilteredClientList(Predicate<? extends Person> predicate) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void updateFilteredHousekeeperList(Predicate<? extends Person> predicate) {
             throw new AssertionError("This method should not be called.");
         }
 
         @Override
-        public void updateFilteredHousekeeperList(Predicate<Housekeeper> predicate) {
+        public void updateAndSortFilteredClientList(Predicate<Client> predicate, Comparator<Client> comparator) {
             throw new AssertionError("This method should not be called.");
         }
+
+        @Override
+        public void updateFilteredHousekeeperListWithHousekeeperPredicate(Predicate<Housekeeper> predicate) {
+        }
     }
 
     /**

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

@@ -152,4 +152,4 @@ public static void showHousekeeperAtIndex(Model model, Index targetIndex) {
 
         assertEquals(1, model.getFilteredHousekeeperList().size());
     }
-}
+}