From f59fb7c82063d195ec2e5e3f40f3d792b87aabb3 Mon Sep 17 00:00:00 2001
From: zengzihui <zeng_zihui@outlook.com>
Date: Wed, 20 Mar 2024 16:59:34 +0800
Subject: [PATCH 1/6] Fix contact list not displaying issue and add
 BuyerBuilder

Fix the Label id in PersonCardList.fmxl to solve the contact list not displaying issue.
Add BuyerBuilder to create buyer object for testing, separating it out from PersonBuilder.
---
 .../seedu/address/model/person/Buyer.java     | 12 +--
 src/main/resources/view/PersonListCard.fxml   |  2 +-
 .../seedu/address/model/person/BuyerTest.java |  2 +
 .../seedu/address/testutil/BuyerBuilder.java  | 91 +++++++++++++++++++
 4 files changed, 100 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/seedu/address/testutil/BuyerBuilder.java

diff --git a/src/main/java/seedu/address/model/person/Buyer.java b/src/main/java/seedu/address/model/person/Buyer.java
index 19496b5c183..385d13eee38 100644
--- a/src/main/java/seedu/address/model/person/Buyer.java
+++ b/src/main/java/seedu/address/model/person/Buyer.java
@@ -19,11 +19,11 @@ public class Buyer extends Person {
      * @param name        The name of the buyer.
      * @param phone       The phone number of the buyer.
      * @param email       The email address of the buyer.
-     * @param housingtype The type of housing the buyer wants.
+     * @param housingType The type of housing the buyer wants.
      * @param tags        The tags associated with the buyer.
      */
-    public Buyer(Name name, Phone phone, Email email, String housingtype, Set<Tag> tags) {
-        super(name, phone, email, housingtype, tags);
+    public Buyer(Name name, Phone phone, Email email, String housingType, Set<Tag> tags) {
+        super(name, phone, email, housingType, tags);
         this.house = null;
     }
 
@@ -33,12 +33,12 @@ public Buyer(Name name, Phone phone, Email email, String housingtype, Set<Tag> t
      * @param name        The name of the buyer.
      * @param phone       The phone number of the buyer.
      * @param email       The email address of the buyer.
-     * @param housingtype The type of housing the buyer wants.
+     * @param housingType The type of housing the buyer wants.
      * @param house       The house associated with the buyer.
      * @param tags        The tags associated with the buyer.
      */
-    public Buyer(Name name, Phone phone, Email email, String housingtype, House house, Set<Tag> tags) {
-        super(name, phone, email, housingtype, tags);
+    public Buyer(Name name, Phone phone, Email email, String housingType, House house, Set<Tag> tags) {
+        super(name, phone, email, housingType, tags);
         this.house = house;
     }
 }
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index 5e0baa17a55..c6107bdb78c 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -30,7 +30,7 @@
       <FlowPane fx:id="tags" />
       <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
       <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
-      <Label fx:id="housingtype" styleClass="cell_small_label" text="\$housingtype" />
+      <Label fx:id="housingType" styleClass="cell_small_label" text="\$housingType" />
       <Label fx:id="postalCode" styleClass="cell_small_label" text="\$postalCode" />
     </VBox>
   </GridPane>
diff --git a/src/test/java/seedu/address/model/person/BuyerTest.java b/src/test/java/seedu/address/model/person/BuyerTest.java
index 586ae69430d..cf233e19d9d 100644
--- a/src/test/java/seedu/address/model/person/BuyerTest.java
+++ b/src/test/java/seedu/address/model/person/BuyerTest.java
@@ -29,5 +29,7 @@ public void equals() {
 
         // different person -> returns false
         assertFalse(buyerAlice.equals(buyerBob));
+
+
     }
 }
diff --git a/src/test/java/seedu/address/testutil/BuyerBuilder.java b/src/test/java/seedu/address/testutil/BuyerBuilder.java
new file mode 100644
index 00000000000..a383d37cacf
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/BuyerBuilder.java
@@ -0,0 +1,91 @@
+package seedu.address.testutil;
+
+import seedu.address.model.house.PostalCode;
+import seedu.address.model.person.*;
+import seedu.address.model.tag.Tag;
+import seedu.address.model.util.SampleDataUtil;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A Utility class to help with building Buyer objects.
+ */
+public class BuyerBuilder {
+    public static final String DEFAULT_NAME = "James Lim";
+    public static final String DEFAULT_PHONE = "93840172";
+    public static final String DEFAULT_EMAIL = "james@gmail.com";
+    public static final String DEFAULT_HOUSING_TYPE = "HDB";
+
+    private Name name;
+    private Phone phone;
+    private Email email;
+    private String housingType;
+    private Set<Tag> tags;
+
+    /**
+     * Creates a {@code BuyerBuilder} with the default information.
+     */
+    public BuyerBuilder() {
+        name = new Name(DEFAULT_NAME);
+        phone = new Phone(DEFAULT_PHONE);
+        email = new Email(DEFAULT_EMAIL);
+        housingType = DEFAULT_HOUSING_TYPE;
+        tags = new HashSet<>();
+    }
+
+    /**
+     * Initializes the BuyerBuilder with the data of {@code personToCopy}
+     */
+    public BuyerBuilder(Person personToCopy) {      //TODO: need to figure this out if need Person or Buyer only)
+        name = personToCopy.getName();
+        phone = personToCopy.getPhone();
+        email = personToCopy.getEmail();
+        housingType = personToCopy.getHousingType();
+        tags = new HashSet<>(personToCopy.getTags());
+    }
+
+    /**
+     * Sets the {@code Name} of the {@code Person} that we are building.
+     */
+    public BuyerBuilder withName(String name) {
+        this.name = new Name(name);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Phone} of the {@code Person} that we are building.
+     */
+    public BuyerBuilder withPhone(String phone) {
+        this.phone = new Phone(phone);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Email} of the {@code Person} that we are building.
+     */
+    public BuyerBuilder withEmail(String email) {
+        this.email = new Email(email);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Address} of the {@code Person} that we are building.
+     */
+    public BuyerBuilder withHousingType(String housingType) {
+        this.housingType = housingType;
+        return this;
+    }
+
+    /**
+     * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code Person} that we are building.
+     */
+    public BuyerBuilder withTags(String ... tags) {
+        this.tags = SampleDataUtil.getTagSet(tags);
+        return this;
+    }
+
+    public Person build() {
+        return new Buyer(name, phone, email, housingType, tags);
+    }
+}

From 590e17007d06c0e5bd42a6c929ad567e465fa725 Mon Sep 17 00:00:00 2001
From: zengzihui <zeng_zihui@outlook.com>
Date: Wed, 20 Mar 2024 17:28:28 +0800
Subject: [PATCH 2/6] Remove house obj from Buyer

Removed House object in Buyer class as it is not needed in this iteration yet.
---
 .../seedu/address/model/person/Buyer.java     | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/main/java/seedu/address/model/person/Buyer.java b/src/main/java/seedu/address/model/person/Buyer.java
index 385d13eee38..b838bde4e3e 100644
--- a/src/main/java/seedu/address/model/person/Buyer.java
+++ b/src/main/java/seedu/address/model/person/Buyer.java
@@ -10,9 +10,6 @@
  */
 public class Buyer extends Person {
 
-    /** The house associated with the buyer. */
-    private final House house;
-
     /**
      * Constructs a new Buyer instance without specifying a house. Default constructor.
      *
@@ -24,21 +21,5 @@ public class Buyer extends Person {
      */
     public Buyer(Name name, Phone phone, Email email, String housingType, Set<Tag> tags) {
         super(name, phone, email, housingType, tags);
-        this.house = null;
-    }
-
-    /**
-     * Constructs a new Buyer instance with a specified house. Meant for potential future Purchase methods.
-     *
-     * @param name        The name of the buyer.
-     * @param phone       The phone number of the buyer.
-     * @param email       The email address of the buyer.
-     * @param housingType The type of housing the buyer wants.
-     * @param house       The house associated with the buyer.
-     * @param tags        The tags associated with the buyer.
-     */
-    public Buyer(Name name, Phone phone, Email email, String housingType, House house, Set<Tag> tags) {
-        super(name, phone, email, housingType, tags);
-        this.house = house;
     }
 }

From b72f67f08efc2f4caecb9c6710deab2338efeac3 Mon Sep 17 00:00:00 2001
From: zengzihui <zeng_zihui@outlook.com>
Date: Wed, 20 Mar 2024 17:52:59 +0800
Subject: [PATCH 3/6] Fix small issues in AddBuyerCommand class

Change a small part of the constant strings in this class, making the
addBuyer command looks clearer.
---
 .../address/logic/commands/AddBuyerCommand.java      | 12 ++++++------
 .../java/seedu/address/model/person/BuyerTest.java   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/seedu/address/logic/commands/AddBuyerCommand.java b/src/main/java/seedu/address/logic/commands/AddBuyerCommand.java
index f15bab7c895..6e9ccb7c76b 100644
--- a/src/main/java/seedu/address/logic/commands/AddBuyerCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddBuyerCommand.java
@@ -18,14 +18,14 @@
  */
 public class AddBuyerCommand extends Command {
 
-    public static final String COMMAND_WORD = "addbuyer";
+    public static final String COMMAND_WORD = "addBuyer";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a buyer to the address book. "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a buyer to EstateEase. "
             + "Parameters: "
             + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_HOUSINGTYPE + "HOUSINGTYPE"
+            + PREFIX_HOUSINGTYPE + "HOUSING_TYPE "
             + "[" + PREFIX_TAG + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "John Doe "
@@ -36,7 +36,7 @@ public class AddBuyerCommand extends Command {
             + PREFIX_TAG + "owesMoney";
 
     public static final String MESSAGE_SUCCESS = "New buyer added: %1$s";
-    public static final String MESSAGE_DUPLICATE_PERSON = "This buyer already exists in the address book";
+    public static final String MESSAGE_DUPLICATE_BUYER = "This buyer already exists in EstateEase";
 
     private final Person buyerToAdd;
 
@@ -46,7 +46,7 @@ public class AddBuyerCommand extends Command {
      */
     public AddBuyerCommand(Person person) {
         requireNonNull(person);
-        buyerToAdd = person;
+        this.buyerToAdd = person;
     }
     /**
      * Executes the command and returns the result message.
@@ -60,7 +60,7 @@ public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
 
         if (model.hasPerson(buyerToAdd)) {
-            throw new CommandException(MESSAGE_DUPLICATE_PERSON);
+            throw new CommandException(MESSAGE_DUPLICATE_BUYER);
         }
 
         model.addPerson(buyerToAdd);
diff --git a/src/test/java/seedu/address/model/person/BuyerTest.java b/src/test/java/seedu/address/model/person/BuyerTest.java
index cf233e19d9d..4999884f3e3 100644
--- a/src/test/java/seedu/address/model/person/BuyerTest.java
+++ b/src/test/java/seedu/address/model/person/BuyerTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 
 public class BuyerTest {
+
     @Test
     public void equals() {
 

From 0842582bc6b402bf0e3aaddf35fb002d5d8c542e Mon Sep 17 00:00:00 2001
From: zengzihui <zeng_zihui@outlook.com>
Date: Thu, 21 Mar 2024 17:27:32 +0800
Subject: [PATCH 4/6] Fix Buyer related class and add some test cases

Fix some small issues in Buyer class and add the Buyer related classes.
Ass some test cases for Buyer related classes tests.
---
 .../logic/commands/AddBuyerCommand.java       |   6 +-
 .../address/logic/commands/AddCommand.java    |   6 +-
 .../logic/commands/AddSellerCommand.java      |   6 +-
 .../logic/parser/AddBuyerCommandParser.java   |  13 +-
 .../logic/parser/AddSellerCommandParser.java  |  10 +-
 .../seedu/address/logic/parser/CliSyntax.java |   2 +-
 .../logic/parser/EditCommandParser.java       |  10 +-
 .../seedu/address/model/person/Buyer.java     |  13 +-
 .../address/storage/JsonAdaptedBuyer.java     |  46 ++++
 src/main/resources/view/PersonListCard.fxml   |   1 -
 .../seedu/address/logic/LogicManagerTest.java |   4 +-
 .../logic/commands/AddBuyerCommandTest.java   | 202 ++++++++++++++++++
 .../logic/commands/AddCommandTest.java        |   1 +
 .../logic/commands/CommandTestUtil.java       |  17 +-
 .../commands/EditPersonDescriptorTest.java    |   4 +-
 .../logic/parser/EditCommandParserTest.java   |  32 +--
 .../seedu/address/model/AddressBookTest.java  |   6 +-
 .../seedu/address/model/person/BuyerTest.java |  81 ++++++-
 .../address/model/person/PersonTest.java      |   6 +-
 .../model/person/UniquePersonListTest.java    |   6 +-
 .../seedu/address/testutil/PersonUtil.java    |  12 +-
 .../address/testutil/TypicalPersons.java      |  26 +--
 22 files changed, 417 insertions(+), 93 deletions(-)
 create mode 100644 src/main/java/seedu/address/storage/JsonAdaptedBuyer.java
 create mode 100644 src/test/java/seedu/address/logic/commands/AddBuyerCommandTest.java

diff --git a/src/main/java/seedu/address/logic/commands/AddBuyerCommand.java b/src/main/java/seedu/address/logic/commands/AddBuyerCommand.java
index 6e9ccb7c76b..770d07a1c94 100644
--- a/src/main/java/seedu/address/logic/commands/AddBuyerCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddBuyerCommand.java
@@ -2,7 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 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;
@@ -25,13 +25,13 @@ public class AddBuyerCommand extends Command {
             + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_HOUSINGTYPE + "HOUSING_TYPE "
+            + PREFIX_HOUSING_TYPE + "HOUSING_TYPE "
             + "[" + PREFIX_TAG + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
             + PREFIX_EMAIL + "johnd@example.com "
-            + PREFIX_HOUSINGTYPE + "HDB "
+            + PREFIX_HOUSING_TYPE + "HDB "
             + PREFIX_TAG + "friends "
             + PREFIX_TAG + "owesMoney";
 
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
index 573c1c21fcf..77c9cb2b642 100644
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddCommand.java
@@ -3,7 +3,7 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_BLOCK;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_LEVEL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -30,7 +30,7 @@ public class AddCommand extends Command {
             + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_HOUSINGTYPE + "HOUSINGTYPE"
+            + PREFIX_HOUSING_TYPE + "HOUSINGTYPE"
             + PREFIX_STREET + "STREET "
             + PREFIX_BLOCK + "BLOCK "
             + PREFIX_LEVEL + "LEVEL "
@@ -41,7 +41,7 @@ public class AddCommand extends Command {
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
             + PREFIX_EMAIL + "johnd@example.com "
-            + PREFIX_HOUSINGTYPE + "HDB "
+            + PREFIX_HOUSING_TYPE + "HDB "
             + PREFIX_STREET + "Clementi Ave 2 "
             + PREFIX_BLOCK + "311 "
             + PREFIX_LEVEL + "02 "
diff --git a/src/main/java/seedu/address/logic/commands/AddSellerCommand.java b/src/main/java/seedu/address/logic/commands/AddSellerCommand.java
index 36e49d8339e..b58d48433ea 100644
--- a/src/main/java/seedu/address/logic/commands/AddSellerCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddSellerCommand.java
@@ -3,7 +3,7 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_BLOCK;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_LEVEL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -30,7 +30,7 @@ public class AddSellerCommand extends Command {
             + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_HOUSINGTYPE + "HOUSINGTYPE"
+            + PREFIX_HOUSING_TYPE + "HOUSINGTYPE"
             + PREFIX_STREET + "STREET "
             + PREFIX_BLOCK + "BLOCK "
             + PREFIX_LEVEL + "LEVEL "
@@ -41,7 +41,7 @@ public class AddSellerCommand extends Command {
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
             + PREFIX_EMAIL + "johnd@example.com "
-            + PREFIX_HOUSINGTYPE + "HDB "
+            + PREFIX_HOUSING_TYPE + "HDB "
             + PREFIX_STREET + "Clementi Ave 2 "
             + PREFIX_BLOCK + "Block 311 "
             + PREFIX_LEVEL + "Level 02"
diff --git a/src/main/java/seedu/address/logic/parser/AddBuyerCommandParser.java b/src/main/java/seedu/address/logic/parser/AddBuyerCommandParser.java
index 6c9e85b07f9..b474e5fe16a 100644
--- a/src/main/java/seedu/address/logic/parser/AddBuyerCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddBuyerCommandParser.java
@@ -2,7 +2,7 @@
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 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;
@@ -30,23 +30,22 @@ public class AddBuyerCommandParser implements Parser<AddBuyerCommand> {
      */
     public AddBuyerCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSINGTYPE,
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSING_TYPE,
                         PREFIX_TAG);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSINGTYPE)
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSING_TYPE)
                 || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddBuyerCommand.MESSAGE_USAGE));
         }
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
-                PREFIX_HOUSINGTYPE);
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSING_TYPE);
         Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
-        String housingtype = ParserUtil.parseHousing(argMultimap.getValue(PREFIX_HOUSINGTYPE).get());
+        String housingType = ParserUtil.parseHousing(argMultimap.getValue(PREFIX_HOUSING_TYPE).get());
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
-        Person person = new Person(name, phone, email, housingtype, tagList);
+        Person person = new Person(name, phone, email, housingType, tagList);
 
         return new AddBuyerCommand(person);
     }
diff --git a/src/main/java/seedu/address/logic/parser/AddSellerCommandParser.java b/src/main/java/seedu/address/logic/parser/AddSellerCommandParser.java
index 816f954701f..02031890a29 100644
--- a/src/main/java/seedu/address/logic/parser/AddSellerCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddSellerCommandParser.java
@@ -3,7 +3,7 @@
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_BLOCK;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_LEVEL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -47,17 +47,17 @@ public AddSellerCommand parse(String args) throws ParseException {
         boolean hasBlock = true;
         boolean hasLevel = true;
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_HOUSINGTYPE, PREFIX_LEVEL,
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_HOUSING_TYPE, PREFIX_LEVEL,
                         PREFIX_EMAIL, PREFIX_BLOCK, PREFIX_STREET, PREFIX_UNITNUMBER, PREFIX_POSTALCODE, PREFIX_TAG);
 
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSINGTYPE,
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSING_TYPE,
                 PREFIX_POSTALCODE, PREFIX_STREET, PREFIX_UNITNUMBER)
                 || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
         }
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_HOUSINGTYPE, PREFIX_LEVEL,
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_HOUSING_TYPE, PREFIX_LEVEL,
                 PREFIX_EMAIL, PREFIX_BLOCK, PREFIX_STREET, PREFIX_UNITNUMBER, PREFIX_POSTALCODE);
         Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
@@ -65,7 +65,7 @@ public AddSellerCommand parse(String args) throws ParseException {
         UnitNumber unitNumber = ParserUtil.parseUnitNumber(argMultimap.getValue(PREFIX_UNITNUMBER).get());
         PostalCode postalCode = ParserUtil.parsePostalCode(argMultimap.getValue(PREFIX_POSTALCODE).get());
         Street street = ParserUtil.parseStreet(argMultimap.getValue(PREFIX_STREET).get());
-        String housingtype = ParserUtil.parseHousing(argMultimap.getValue(PREFIX_HOUSINGTYPE).get());
+        String housingtype = ParserUtil.parseHousing(argMultimap.getValue(PREFIX_HOUSING_TYPE).get());
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
         //NonLandeds might not have blocks, Landeds definitely do not have blocks.
diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
index d5d0b2c217b..8109c14f565 100644
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -10,7 +10,7 @@ public class CliSyntax {
     public static final Prefix PREFIX_PHONE = new Prefix("p/");
     public static final Prefix PREFIX_EMAIL = new Prefix("e/");
     public static final Prefix PREFIX_TAG = new Prefix("t/");
-    public static final Prefix PREFIX_HOUSINGTYPE = new Prefix("type/");
+    public static final Prefix PREFIX_HOUSING_TYPE = new Prefix("type/");
     public static final Prefix PREFIX_STREET = new Prefix("street/");
     public static final Prefix PREFIX_LEVEL = new Prefix("level/");
     public static final Prefix PREFIX_UNITNUMBER = new Prefix("unitNo/");
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
index 47ba105b87f..c45bb9f0ad0 100644
--- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -3,7 +3,7 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 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;
@@ -32,7 +32,7 @@ public class EditCommandParser implements Parser<EditCommand> {
     public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSINGTYPE,
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSING_TYPE,
                         PREFIX_TAG);
 
         Index index;
@@ -44,7 +44,7 @@ public EditCommand parse(String args) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
         }
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSINGTYPE);
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSING_TYPE);
 
         EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
 
@@ -57,9 +57,9 @@ public EditCommand parse(String args) throws ParseException {
         if (argMultimap.getValue(PREFIX_EMAIL).isPresent()) {
             editPersonDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
         }
-        if (argMultimap.getValue(PREFIX_HOUSINGTYPE).isPresent()) {
+        if (argMultimap.getValue(PREFIX_HOUSING_TYPE).isPresent()) {
             editPersonDescriptor.setHousingType(ParserUtil.parseHousing(argMultimap
-                    .getValue(PREFIX_HOUSINGTYPE).get()));
+                    .getValue(PREFIX_HOUSING_TYPE).get()));
         }
 
         parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPersonDescriptor::setTags);
diff --git a/src/main/java/seedu/address/model/person/Buyer.java b/src/main/java/seedu/address/model/person/Buyer.java
index b838bde4e3e..a08cb00e3c7 100644
--- a/src/main/java/seedu/address/model/person/Buyer.java
+++ b/src/main/java/seedu/address/model/person/Buyer.java
@@ -2,7 +2,7 @@
 
 import java.util.Set;
 
-import seedu.address.model.house.House;
+import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.model.tag.Tag;
 
 /**
@@ -22,4 +22,15 @@ public class Buyer extends Person {
     public Buyer(Name name, Phone phone, Email email, String housingType, Set<Tag> tags) {
         super(name, phone, email, housingType, tags);
     }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .add("name", super.getName())
+                .add("phone", super.getPhone())
+                .add("email", super.getEmail())
+                .add("housing type", super.getHousingType())
+                .add("tags", super.getTags())
+                .toString();
+    }
 }
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedBuyer.java b/src/main/java/seedu/address/storage/JsonAdaptedBuyer.java
new file mode 100644
index 00000000000..2aecba5723c
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedBuyer.java
@@ -0,0 +1,46 @@
+package seedu.address.storage;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.person.Buyer;
+import seedu.address.model.person.Person;
+
+import java.util.List;
+import java.util.HashSet;
+
+/**
+ * Jackson-friendly version of {@link Buyer}.
+ */
+public class JsonAdaptedBuyer extends JsonAdaptedPerson {
+
+
+    /**
+     * Constructs a {@code JsonAdaptedSeller}, extends from JsonAdaptedHouse.
+     */
+    @JsonCreator
+    public JsonAdaptedBuyer(@JsonProperty("name") String name,
+                             @JsonProperty("phone") String phone,
+                             @JsonProperty("email") String email,
+                             @JsonProperty("housingType") String housingType,
+                             @JsonProperty("tags") List<JsonAdaptedTag> tags) {
+        super(name, phone, email, housingType, tags);
+    }
+
+    /**
+     * Converts a given {@code JsonAdaptedBuyer} into this class for Jackson use.
+     */
+    public JsonAdaptedBuyer(Buyer source) {
+        super(source);
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted seller object into the model's {@code Buyer} object.
+     */
+    @Override
+    public Buyer toModelType() throws IllegalValueException {
+        Person person = super.toModelType();
+        return new Buyer(person.getName(), person.getPhone(), person.getEmail(),
+                person.getHousingType(), new HashSet<>(person.getTags()));
+    }
+}
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index c6107bdb78c..46cb489c34e 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -31,7 +31,6 @@
       <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
       <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
       <Label fx:id="housingType" styleClass="cell_small_label" text="\$housingType" />
-      <Label fx:id="postalCode" styleClass="cell_small_label" text="\$postalCode" />
     </VBox>
   </GridPane>
 </HBox>
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/seedu/address/logic/LogicManagerTest.java
index 0a84627fe21..7fa317cfb05 100644
--- a/src/test/java/seedu/address/logic/LogicManagerTest.java
+++ b/src/test/java/seedu/address/logic/LogicManagerTest.java
@@ -4,7 +4,7 @@
 import static seedu.address.logic.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX;
 import static seedu.address.logic.Messages.MESSAGE_UNKNOWN_COMMAND;
 import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.HOUSINGTYPE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.HOUSING_TYPE_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.testutil.Assert.assertThrows;
@@ -166,7 +166,7 @@ public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath)
 
         // Triggers the saveAddressBook method by executing an add command
         String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY
-                + EMAIL_DESC_AMY + HOUSINGTYPE_DESC_AMY;
+                + EMAIL_DESC_AMY + HOUSING_TYPE_DESC_AMY;
         Person expectedPerson = new PersonBuilder(AMY).withTags().build();
         ModelManager expectedModel = new ModelManager();
         expectedModel.addPerson(expectedPerson);
diff --git a/src/test/java/seedu/address/logic/commands/AddBuyerCommandTest.java b/src/test/java/seedu/address/logic/commands/AddBuyerCommandTest.java
new file mode 100644
index 00000000000..599bd9c87b3
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/AddBuyerCommandTest.java
@@ -0,0 +1,202 @@
+package seedu.address.logic.commands;
+
+import javafx.collections.ObservableList;
+import org.junit.jupiter.api.Test;
+import seedu.address.commons.core.GuiSettings;
+import seedu.address.logic.Messages;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.AddressBook;
+import seedu.address.model.Model;
+import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyUserPrefs;
+import seedu.address.model.person.Person;
+import seedu.address.testutil.BuyerBuilder;
+import seedu.address.testutil.PersonBuilder;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.function.Predicate;
+
+import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalPersons.ALI;
+
+public class AddBuyerCommandTest {
+
+    @Test
+    public void constructor_nullBuyer_throwsNullPointerException() {
+        assertThrows(NullPointerException.class, () -> new AddBuyerCommand(null));
+    }
+
+    @Test
+    public void execute_buyerAcceptedByModel_addSuccessful() throws Exception {
+        ModelStubAcceptingBuyerAdded modelStub = new ModelStubAcceptingBuyerAdded();
+        Person validBuyer = new BuyerBuilder().build();
+
+        CommandResult commandResult = new AddBuyerCommand(validBuyer).execute(modelStub);
+
+        assertEquals(String.format(AddBuyerCommand.MESSAGE_SUCCESS, Messages.format(validBuyer)),
+                commandResult.getFeedbackToUser());
+        assertEquals(Arrays.asList(validBuyer), modelStub.buyersAdded);
+    }
+
+    @Test
+    public void execute_duplicatePerson_throwsCommandException() {
+        Person validPerson = new BuyerBuilder().build();
+        AddBuyerCommand addBuyerCommand = new AddBuyerCommand(validPerson);
+        ModelStub modelStub = new ModelStubWithBuyer(validPerson);
+        assertThrows(CommandException.class, AddBuyerCommand.MESSAGE_DUPLICATE_BUYER, () -> addBuyerCommand.execute(modelStub));
+    }
+    @Test
+    public void equals() {
+        Person ali = new BuyerBuilder().withName("Ali").build();
+        Person bob = new BuyerBuilder().withName("Bob").build();
+        AddBuyerCommand addAliceCommand = new AddBuyerCommand(ali);
+        AddBuyerCommand addBobCommand = new AddBuyerCommand(bob);
+
+        // same object -> returns true
+        assertTrue(addAliceCommand.equals(addAliceCommand));
+
+        // same values -> returns true
+        AddBuyerCommand addAliceCommandCopy = new AddBuyerCommand(ali);
+        assertTrue(addAliceCommand.equals(addAliceCommandCopy));
+
+        // different types -> returns false
+        assertFalse(addAliceCommand.equals(1));
+
+        // null -> returns false
+        assertFalse(addAliceCommand.equals(null));
+
+        // different person -> returns false
+        assertFalse(addAliceCommand.equals(addBobCommand));
+    }
+
+    @Test
+    public void toStringMethod() {
+        AddBuyerCommand addBuyerCommand = new AddBuyerCommand(ALI);
+        String expected = AddBuyerCommand.class.getCanonicalName() + "{toAdd=" + ALI + "}";
+        assertEquals(expected, addBuyerCommand.toString());
+    }
+
+    /**
+     * A default model stub that have all of the methods failing.
+     */
+    private class ModelStub implements Model {
+        @Override
+        public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public ReadOnlyUserPrefs getUserPrefs() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public GuiSettings getGuiSettings() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setGuiSettings(GuiSettings guiSettings) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public Path getAddressBookFilePath() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setAddressBookFilePath(Path addressBookFilePath) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void addPerson(Person person) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setAddressBook(ReadOnlyAddressBook newData) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public ReadOnlyAddressBook getAddressBook() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public boolean hasPerson(Person person) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void deletePerson(Person target) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setPerson(Person target, Person editedPerson) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public ObservableList<Person> getFilteredPersonList() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void updateFilteredPersonList(Predicate<Person> predicate) {
+            throw new AssertionError("This method should not be called.");
+        }
+    }
+
+
+    /**
+     * A Model stub that contains a single person.
+     */
+    private class ModelStubWithBuyer extends ModelStub {
+        private final Person buyer;
+
+        ModelStubWithBuyer(Person person) {
+            requireNonNull(person);
+            this.buyer = person;
+        }
+
+        @Override
+        public boolean hasPerson(Person person) {
+            requireNonNull(person);
+            return this.buyer.isSamePerson(person);
+        }
+    }
+
+
+    /**
+     * A Model stub that always accept the buyer being added.
+     */
+    private class ModelStubAcceptingBuyerAdded extends ModelStub {
+        final ArrayList<Person> buyersAdded = new ArrayList<>();
+
+        @Override
+        public boolean hasPerson(Person person) {
+            requireNonNull(person);
+            return buyersAdded.stream().anyMatch(person::isSamePerson);
+        }
+
+        @Override
+        public void addPerson(Person person) {
+            requireNonNull(person);
+            buyersAdded.add(person);
+        }
+
+        @Override
+        public ReadOnlyAddressBook getAddressBook() {
+            return new AddressBook();
+        }
+    }
+}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
index 90e8253f48e..a848d6042b5 100644
--- a/src/test/java/seedu/address/logic/commands/AddCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
@@ -44,6 +44,7 @@ public void execute_personAcceptedByModel_addSuccessful() throws Exception {
         assertEquals(Arrays.asList(validPerson), modelStub.personsAdded);
     }
 
+
     @Test
     public void execute_duplicatePerson_throwsCommandException() {
         Person validPerson = new PersonBuilder().build();
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
index 020e686cdcc..1dc421ce40e 100644
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -3,7 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 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;
@@ -28,12 +28,13 @@ public class CommandTestUtil {
 
     public static final String VALID_NAME_AMY = "Amy Bee";
     public static final String VALID_NAME_BOB = "Bob Choo";
+    public static final String VALID_NAME_BEN = "Ben Ten";
     public static final String VALID_PHONE_AMY = "11111111";
     public static final String VALID_PHONE_BOB = "22222222";
     public static final String VALID_EMAIL_AMY = "amy@example.com";
     public static final String VALID_EMAIL_BOB = "bob@example.com";
-    public static final String VALID_HOUSINGTYPE_AMY = "HDB";
-    public static final String VALID_HOUSINGTYPE_BOB = "Condominium";
+    public static final String VALID_HOUSING_TYPE_AMY = "HDB";
+    public static final String VALID_HOUSING_TYPE_BOB = "Condominium";
     public static final String VALID_TAG_HUSBAND = "husband";
     public static final String VALID_TAG_FRIEND = "friend";
 
@@ -43,15 +44,15 @@ public class CommandTestUtil {
     public static final String PHONE_DESC_BOB = " " + PREFIX_PHONE + VALID_PHONE_BOB;
     public static final String EMAIL_DESC_AMY = " " + PREFIX_EMAIL + VALID_EMAIL_AMY;
     public static final String EMAIL_DESC_BOB = " " + PREFIX_EMAIL + VALID_EMAIL_BOB;
-    public static final String HOUSINGTYPE_DESC_AMY = " " + PREFIX_HOUSINGTYPE + VALID_HOUSINGTYPE_AMY;
-    public static final String HOUSINGTYPE_DESC_BOB = " " + PREFIX_HOUSINGTYPE + VALID_HOUSINGTYPE_BOB;
+    public static final String HOUSING_TYPE_DESC_AMY = " " + PREFIX_HOUSING_TYPE + VALID_HOUSING_TYPE_AMY;
+    public static final String HOUSING_TYPE_DESC_BOB = " " + PREFIX_HOUSING_TYPE + VALID_HOUSING_TYPE_BOB;
     public static final String TAG_DESC_FRIEND = " " + PREFIX_TAG + VALID_TAG_FRIEND;
     public static final String TAG_DESC_HUSBAND = " " + PREFIX_TAG + VALID_TAG_HUSBAND;
 
     public static final String INVALID_NAME_DESC = " " + PREFIX_NAME + "James&"; // '&' not allowed in names
     public static final String INVALID_PHONE_DESC = " " + PREFIX_PHONE + "911a"; // 'a' not allowed in phones
     public static final String INVALID_EMAIL_DESC = " " + PREFIX_EMAIL + "bob!yahoo"; // missing '@' symbol
-    public static final String INVALID_HOUSINGTYPE_DESC = " " + PREFIX_HOUSINGTYPE;
+    public static final String INVALID_HOUSING_TYPE_DESC = " " + PREFIX_HOUSING_TYPE;
     public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags
 
     public static final String PREAMBLE_WHITESPACE = "\t  \r  \n";
@@ -62,10 +63,10 @@ public class CommandTestUtil {
 
     static {
         DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
-                .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withHousingType(VALID_HOUSINGTYPE_AMY)
+                .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withHousingType(VALID_HOUSING_TYPE_AMY)
                 .withTags(VALID_TAG_FRIEND).build();
         DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
-                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withHousingType(VALID_HOUSINGTYPE_BOB)
+                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withHousingType(VALID_HOUSING_TYPE_BOB)
                 .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
     }
 
diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
index db5882dc90a..dc375aeb589 100644
--- a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
+++ b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
@@ -6,7 +6,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSINGTYPE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSING_TYPE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
@@ -49,7 +49,7 @@ public void equals() {
         assertFalse(DESC_AMY.equals(editedAmy));
 
         // different address -> returns false
-        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withHousingType(VALID_HOUSINGTYPE_BOB).build();
+        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withHousingType(VALID_HOUSING_TYPE_BOB).build();
         assertFalse(DESC_AMY.equals(editedAmy));
 
         // different tags -> returns false
diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
index 3f8b2e5b937..93cbc1018c7 100644
--- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
@@ -3,10 +3,10 @@
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.HOUSINGTYPE_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.HOUSINGTYPE_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.HOUSING_TYPE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.HOUSING_TYPE_DESC_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_HOUSINGTYPE_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_HOUSING_TYPE_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
@@ -16,14 +16,14 @@
 import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
 import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSINGTYPE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSING_TYPE_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
@@ -86,7 +86,7 @@ public void parse_invalidValue_failure() {
         assertParseFailure(parser, "1" + INVALID_NAME_DESC, Name.MESSAGE_CONSTRAINTS); // invalid name
         assertParseFailure(parser, "1" + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS); // invalid phone
         assertParseFailure(parser, "1" + INVALID_EMAIL_DESC, Email.MESSAGE_CONSTRAINTS); // invalid email
-        assertParseFailure(parser, "1" + INVALID_HOUSINGTYPE_DESC, House.MESSAGE_CONSTRAINTS);
+        assertParseFailure(parser, "1" + INVALID_HOUSING_TYPE_DESC, House.MESSAGE_CONSTRAINTS);
         assertParseFailure(parser, "1" + INVALID_TAG_DESC, Tag.MESSAGE_CONSTRAINTS); // invalid tag
 
         // invalid phone followed by valid email
@@ -99,7 +99,7 @@ public void parse_invalidValue_failure() {
         assertParseFailure(parser, "1" + TAG_EMPTY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
 
         // multiple invalid values, but only the first invalid value is captured
-        assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC + VALID_HOUSINGTYPE_AMY
+        assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC + VALID_HOUSING_TYPE_AMY
                         + VALID_PHONE_AMY,
                 Name.MESSAGE_CONSTRAINTS);
     }
@@ -108,10 +108,10 @@ public void parse_invalidValue_failure() {
     public void parse_allFieldsSpecified_success() {
         Index targetIndex = INDEX_SECOND_PERSON;
         String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND
-                + EMAIL_DESC_AMY + HOUSINGTYPE_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND;
+                + EMAIL_DESC_AMY + HOUSING_TYPE_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND;
 
         EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
-                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY).withHousingType(VALID_HOUSINGTYPE_AMY)
+                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY).withHousingType(VALID_HOUSING_TYPE_AMY)
                 .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
         EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
 
@@ -181,19 +181,19 @@ public void parse_multipleRepeatedFields_failure() {
         assertParseFailure(parser, userInput, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE));
 
         // mulltiple valid fields repeated
-        userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + HOUSINGTYPE_DESC_AMY + EMAIL_DESC_AMY
-                + TAG_DESC_FRIEND + PHONE_DESC_AMY + HOUSINGTYPE_DESC_AMY + EMAIL_DESC_AMY + TAG_DESC_FRIEND
-                + PHONE_DESC_BOB + HOUSINGTYPE_DESC_BOB + EMAIL_DESC_BOB + TAG_DESC_HUSBAND;
+        userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + HOUSING_TYPE_DESC_AMY + EMAIL_DESC_AMY
+                + TAG_DESC_FRIEND + PHONE_DESC_AMY + HOUSING_TYPE_DESC_AMY + EMAIL_DESC_AMY + TAG_DESC_FRIEND
+                + PHONE_DESC_BOB + HOUSING_TYPE_DESC_BOB + EMAIL_DESC_BOB + TAG_DESC_HUSBAND;
 
         assertParseFailure(parser, userInput,
-                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSINGTYPE));
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSING_TYPE));
 
         // multiple invalid values
-        userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + INVALID_HOUSINGTYPE_DESC + INVALID_EMAIL_DESC
-                + INVALID_PHONE_DESC + INVALID_HOUSINGTYPE_DESC + INVALID_EMAIL_DESC;
+        userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + INVALID_HOUSING_TYPE_DESC + INVALID_EMAIL_DESC
+                + INVALID_PHONE_DESC + INVALID_HOUSING_TYPE_DESC + INVALID_EMAIL_DESC;
 
         assertParseFailure(parser, userInput,
-                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSINGTYPE));
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL, PREFIX_HOUSING_TYPE));
     }
 
     @Test
diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
index b2eeb121287..eba74370799 100644
--- a/src/test/java/seedu/address/model/AddressBookTest.java
+++ b/src/test/java/seedu/address/model/AddressBookTest.java
@@ -3,7 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSINGTYPE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSING_TYPE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.ALICE;
@@ -46,7 +46,7 @@ public void resetData_withValidReadOnlyAddressBook_replacesData() {
     @Test
     public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
         // Two persons with the same identity fields
-        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSINGTYPE_BOB).withTags(VALID_TAG_HUSBAND)
+        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND)
                 .build();
         List<Person> newPersons = Arrays.asList(ALICE, editedAlice);
         AddressBookStub newData = new AddressBookStub(newPersons);
@@ -73,7 +73,7 @@ public void hasPerson_personInAddressBook_returnsTrue() {
     @Test
     public void hasPerson_personWithSameIdentityFieldsInAddressBook_returnsTrue() {
         addressBook.addPerson(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSINGTYPE_BOB).withTags(VALID_TAG_HUSBAND)
+        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND)
                 .build();
         assertTrue(addressBook.hasPerson(editedAlice));
     }
diff --git a/src/test/java/seedu/address/model/person/BuyerTest.java b/src/test/java/seedu/address/model/person/BuyerTest.java
index 4999884f3e3..d6356c959b9 100644
--- a/src/test/java/seedu/address/model/person/BuyerTest.java
+++ b/src/test/java/seedu/address/model/person/BuyerTest.java
@@ -1,14 +1,48 @@
 package seedu.address.model.person;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BOB;
+import static org.junit.jupiter.api.Assertions.*;
+import static seedu.address.logic.commands.CommandTestUtil.*;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalPersons.*;
 
 import org.junit.jupiter.api.Test;
+import seedu.address.testutil.BuyerBuilder;
 
 public class BuyerTest {
 
+    @Test
+    public void asObservableList_modifyList_throwsUnsupportedOperationException() {
+        Person buyer = new BuyerBuilder().build();
+        assertThrows(UnsupportedOperationException.class, () -> buyer.getTags().remove(0));
+    }
+
+    @Test
+    public void isSamePerson() {
+        // same object -> returns true
+        assertTrue(ALI.isSamePerson(ALI));
+
+        // null -> returns false
+        assertFalse(ALI.isSamePerson(null));
+
+        // same name, all other attributes different -> returns true
+        Person editedAli = new BuyerBuilder(ALI).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
+                .withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND).build();
+        assertTrue(ALI.isSamePerson(editedAli));
+
+        // different name, all other attributes same -> returns false
+        editedAli = new BuyerBuilder(ALI).withName(VALID_NAME_BEN).build();
+        assertFalse(ALI.isSamePerson(editedAli));
+
+        // name differs in case, all other attributes same -> returns false
+        Person editedBen = new BuyerBuilder(BEN).withName(VALID_NAME_BEN.toLowerCase()).build();
+        assertFalse(BEN.isSamePerson(editedBen));
+
+        // name has trailing spaces, all other attributes same -> returns false
+        String nameWithTrailingSpaces = VALID_NAME_BEN + " ";
+        editedBen = new BuyerBuilder(BEN).withName(nameWithTrailingSpaces).build();
+        assertFalse(BEN.isSamePerson(editedBen));
+    }
+
     @Test
     public void equals() {
 
@@ -19,18 +53,49 @@ public void equals() {
                 new Buyer(BOB.getName(), BOB.getPhone(), BOB.getEmail(), BOB.getHousingType(),
                         BOB.getTags());
 
+        Person buyerAliCopy = new BuyerBuilder(ALI).build();
+
         // same object -> returns true
-        assertTrue(buyerAlice.equals(buyerAlice));
+        assertTrue(ALI.equals(buyerAliCopy));
+
+        // same object -> returns true
+        assertTrue(ALI.equals(ALI));
 
         // null -> returns false
-        assertFalse(buyerAlice.equals(null));
+        assertFalse(ALI.equals(null));
 
         // different type -> returns false
-        assertFalse(buyerAlice.equals(5));
+        assertFalse(ALI.equals(5));
 
         // different person -> returns false
-        assertFalse(buyerAlice.equals(buyerBob));
+        assertFalse(ALI.equals(BOB));
+
+        // different name -> returns false
+        Person editedAli = new BuyerBuilder(ALI).withName(VALID_NAME_BOB).build();
+        assertFalse(ALI.equals(editedAli));
 
+        // different phone -> returns false
+        editedAli = new BuyerBuilder(ALI).withPhone(VALID_PHONE_BOB).build();
+        assertFalse(ALI.equals(editedAli));
 
+        // different email -> returns false
+        editedAli = new BuyerBuilder(ALI).withEmail(VALID_EMAIL_BOB).build();
+        assertFalse(ALI.equals(editedAli));
+
+        // different housingtype -> returns false
+        editedAli = new BuyerBuilder(ALI).withHousingType(VALID_HOUSING_TYPE_BOB).build();
+        assertFalse(ALI.equals(editedAli));
+
+        // different tags -> returns false
+        editedAli = new BuyerBuilder(ALI).withTags(VALID_TAG_HUSBAND).build();
+        assertFalse(ALI.equals(editedAli));
+    }
+
+    @Test
+    public void toStringMethod() {
+        String expected = Buyer.class.getCanonicalName() + "{name=" + ALI.getName() + ", phone=" + ALI.getPhone()
+                + ", email=" + ALI.getEmail() + ", housing type=" + ALI.getHousingType()
+                + ", tags=" + ALI.getTags() + "}";
+        assertEquals(expected, ALI.toString());
     }
 }
diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
index 7e8e116c6c9..71a9faab9d1 100644
--- a/src/test/java/seedu/address/model/person/PersonTest.java
+++ b/src/test/java/seedu/address/model/person/PersonTest.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSINGTYPE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSING_TYPE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
@@ -34,7 +34,7 @@ public void isSamePerson() {
 
         // same name, all other attributes different -> returns true
         Person editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
-                .withHousingType(VALID_HOUSINGTYPE_BOB).withTags(VALID_TAG_HUSBAND).build();
+                .withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSamePerson(editedAlice));
 
         // different name, all other attributes same -> returns false
@@ -82,7 +82,7 @@ public void equals() {
         assertFalse(ALICE.equals(editedAlice));
 
         // different housingtype -> returns false
-        editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSINGTYPE_BOB).build();
+        editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).build();
         assertFalse(ALICE.equals(editedAlice));
 
         // different tags -> returns false
diff --git a/src/test/java/seedu/address/model/person/UniquePersonListTest.java b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
index 0d698123e21..1e194a6335e 100644
--- a/src/test/java/seedu/address/model/person/UniquePersonListTest.java
+++ b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
@@ -3,7 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSINGTYPE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSING_TYPE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.ALICE;
@@ -42,7 +42,7 @@ public void contains_personInList_returnsTrue() {
     @Test
     public void contains_personWithSameIdentityFieldsInList_returnsTrue() {
         uniquePersonList.add(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSINGTYPE_BOB).withTags(VALID_TAG_HUSBAND)
+        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND)
                 .build();
         assertTrue(uniquePersonList.contains(editedAlice));
     }
@@ -85,7 +85,7 @@ public void setPerson_editedPersonIsSamePerson_success() {
     @Test
     public void setPerson_editedPersonHasSameIdentity_success() {
         uniquePersonList.add(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSINGTYPE_BOB).withTags(VALID_TAG_HUSBAND)
+        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND)
                 .build();
         uniquePersonList.setPerson(ALICE, editedAlice);
         UniquePersonList expectedUniquePersonList = new UniquePersonList();
diff --git a/src/test/java/seedu/address/testutil/PersonUtil.java b/src/test/java/seedu/address/testutil/PersonUtil.java
index 0cd86d1e683..882d15b0664 100644
--- a/src/test/java/seedu/address/testutil/PersonUtil.java
+++ b/src/test/java/seedu/address/testutil/PersonUtil.java
@@ -1,7 +1,7 @@
 package seedu.address.testutil;
 
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSINGTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_HOUSING_TYPE;
 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;
@@ -19,10 +19,10 @@
 public class PersonUtil {
 
     /**
-     * Returns an add command string for adding the {@code person}.
+     * Returns an add command string for adding the {@code buyer}.
      */
-    public static String getAddBuyerCommand(Person person) {
-        return AddBuyerCommand.COMMAND_WORD + " " + getPersonDetails(person);
+    public static String getAddBuyerCommand(Person buyer) {
+        return AddBuyerCommand.COMMAND_WORD + " " + getPersonDetails(buyer);
     }
 
     /**
@@ -33,7 +33,7 @@ public static String getPersonDetails(Person person) {
         sb.append(PREFIX_NAME + person.getName().fullName + " ");
         sb.append(PREFIX_PHONE + person.getPhone().value + " ");
         sb.append(PREFIX_EMAIL + person.getEmail().value + " ");
-        sb.append(PREFIX_HOUSINGTYPE + person.getHousingType() + " ");
+        sb.append(PREFIX_HOUSING_TYPE + person.getHousingType() + " ");
         person.getTags().stream().forEach(
             s -> sb.append(PREFIX_TAG + s.tagName + " ")
         );
@@ -48,7 +48,7 @@ public static String getEditPersonDescriptorDetails(EditPersonDescriptor descrip
         descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(" "));
         descriptor.getPhone().ifPresent(phone -> sb.append(PREFIX_PHONE).append(phone.value).append(" "));
         descriptor.getEmail().ifPresent(email -> sb.append(PREFIX_EMAIL).append(email.value).append(" "));
-        descriptor.getHousingType().ifPresent(housingType -> sb.append(PREFIX_HOUSINGTYPE).append(" "));
+        descriptor.getHousingType().ifPresent(housingType -> sb.append(PREFIX_HOUSING_TYPE).append(" "));
         if (descriptor.getTags().isPresent()) {
             Set<Tag> tags = descriptor.getTags().get();
             if (tags.isEmpty()) {
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
index 2e6873606d4..5924bd8aaf1 100644
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ b/src/test/java/seedu/address/testutil/TypicalPersons.java
@@ -1,23 +1,15 @@
 package seedu.address.testutil;
 
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSINGTYPE_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSINGTYPE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import seedu.address.model.AddressBook;
+import seedu.address.model.person.Buyer;
 import seedu.address.model.person.Person;
 
+import static seedu.address.logic.commands.CommandTestUtil.*;
+
 /**
  * A utility class containing a list of {@code Person} objects to be used in tests.
  */
@@ -27,6 +19,9 @@ public class TypicalPersons {
             .withHousingType("HDB").withEmail("alice@example.com")
             .withPhone("94351253").withPostalCode("789012")
             .withTags("friends").build();
+
+    public static final Person ALI = new BuyerBuilder().withName("Ali York")
+            .withPhone("82937163").withEmail("ali@gmail.com").withHousingType("HDB").withTags("friends").build();
     public static final Person BENSON = new PersonBuilder().withName("Benson Meier")
             .withHousingType("Condominium")
             .withEmail("johnd@example.com").withPhone("98765432").withPostalCode("578903")
@@ -51,10 +46,15 @@ public class TypicalPersons {
 
     // Manually added - Person's details found in {@code CommandTestUtil}
     public static final Person AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
-            .withEmail(VALID_EMAIL_AMY).withHousingType(VALID_HOUSINGTYPE_AMY)
+            .withEmail(VALID_EMAIL_AMY).withHousingType(VALID_HOUSING_TYPE_AMY)
             .withTags(VALID_TAG_FRIEND).build();
     public static final Person BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
-            .withEmail(VALID_EMAIL_BOB).withHousingType(VALID_HOUSINGTYPE_BOB)
+            .withEmail(VALID_EMAIL_BOB).withHousingType(VALID_HOUSING_TYPE_BOB)
+            .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
+            .build();
+
+    public static final Person BEN = new BuyerBuilder().withName(VALID_NAME_BEN).withPhone(VALID_PHONE_BOB)
+            .withEmail(VALID_EMAIL_BOB).withHousingType(VALID_HOUSING_TYPE_BOB)
             .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
             .build();
 

From 5e2e84a0df62b34af41f93241d6cc77d4013406e Mon Sep 17 00:00:00 2001
From: zengzihui <zeng_zihui@outlook.com>
Date: Thu, 21 Mar 2024 18:25:40 +0800
Subject: [PATCH 5/6] Fix checkstyles

Fix imports issue for checkstyles
---
 .../address/storage/JsonAdaptedBuyer.java     |  7 +++--
 .../logic/commands/AddBuyerCommandTest.java   | 30 ++++++++++---------
 .../seedu/address/model/AddressBookTest.java  |  6 ++--
 .../seedu/address/model/person/BuyerTest.java | 25 +++++++++-------
 .../model/person/UniquePersonListTest.java    |  6 ++--
 .../seedu/address/testutil/BuyerBuilder.java  | 14 +++++----
 .../address/testutil/TypicalPersons.java      | 15 ++++++++--
 7 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/src/main/java/seedu/address/storage/JsonAdaptedBuyer.java b/src/main/java/seedu/address/storage/JsonAdaptedBuyer.java
index 2aecba5723c..5e1738d4791 100644
--- a/src/main/java/seedu/address/storage/JsonAdaptedBuyer.java
+++ b/src/main/java/seedu/address/storage/JsonAdaptedBuyer.java
@@ -1,13 +1,16 @@
 package seedu.address.storage;
 
+import java.util.HashSet;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import seedu.address.commons.exceptions.IllegalValueException;
 import seedu.address.model.person.Buyer;
 import seedu.address.model.person.Person;
 
-import java.util.List;
-import java.util.HashSet;
+
 
 /**
  * Jackson-friendly version of {@link Buyer}.
diff --git a/src/test/java/seedu/address/logic/commands/AddBuyerCommandTest.java b/src/test/java/seedu/address/logic/commands/AddBuyerCommandTest.java
index 599bd9c87b3..b3653738ed7 100644
--- a/src/test/java/seedu/address/logic/commands/AddBuyerCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/AddBuyerCommandTest.java
@@ -1,7 +1,20 @@
 package seedu.address.logic.commands;
 
-import javafx.collections.ObservableList;
+import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalPersons.ALI;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.function.Predicate;
+
 import org.junit.jupiter.api.Test;
+
+import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.logic.Messages;
 import seedu.address.logic.commands.exceptions.CommandException;
@@ -11,18 +24,6 @@
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.person.Person;
 import seedu.address.testutil.BuyerBuilder;
-import seedu.address.testutil.PersonBuilder;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.function.Predicate;
-
-import static java.util.Objects.requireNonNull;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALI;
 
 public class AddBuyerCommandTest {
 
@@ -48,7 +49,8 @@ public void execute_duplicatePerson_throwsCommandException() {
         Person validPerson = new BuyerBuilder().build();
         AddBuyerCommand addBuyerCommand = new AddBuyerCommand(validPerson);
         ModelStub modelStub = new ModelStubWithBuyer(validPerson);
-        assertThrows(CommandException.class, AddBuyerCommand.MESSAGE_DUPLICATE_BUYER, () -> addBuyerCommand.execute(modelStub));
+        assertThrows(CommandException.class, AddBuyerCommand.MESSAGE_DUPLICATE_BUYER, () ->
+                addBuyerCommand.execute(modelStub));
     }
     @Test
     public void equals() {
diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
index eba74370799..591c8a73dee 100644
--- a/src/test/java/seedu/address/model/AddressBookTest.java
+++ b/src/test/java/seedu/address/model/AddressBookTest.java
@@ -46,7 +46,8 @@ public void resetData_withValidReadOnlyAddressBook_replacesData() {
     @Test
     public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
         // Two persons with the same identity fields
-        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND)
+        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB)
+                .withTags(VALID_TAG_HUSBAND)
                 .build();
         List<Person> newPersons = Arrays.asList(ALICE, editedAlice);
         AddressBookStub newData = new AddressBookStub(newPersons);
@@ -73,7 +74,8 @@ public void hasPerson_personInAddressBook_returnsTrue() {
     @Test
     public void hasPerson_personWithSameIdentityFieldsInAddressBook_returnsTrue() {
         addressBook.addPerson(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND)
+        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB)
+                .withTags(VALID_TAG_HUSBAND)
                 .build();
         assertTrue(addressBook.hasPerson(editedAlice));
     }
diff --git a/src/test/java/seedu/address/model/person/BuyerTest.java b/src/test/java/seedu/address/model/person/BuyerTest.java
index d6356c959b9..f45ea68cfd3 100644
--- a/src/test/java/seedu/address/model/person/BuyerTest.java
+++ b/src/test/java/seedu/address/model/person/BuyerTest.java
@@ -1,11 +1,21 @@
 package seedu.address.model.person;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static seedu.address.logic.commands.CommandTestUtil.*;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSING_TYPE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BEN;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static seedu.address.testutil.TypicalPersons.ALI;
+import static seedu.address.testutil.TypicalPersons.BEN;
+import static seedu.address.testutil.TypicalPersons.BOB;
 
 import org.junit.jupiter.api.Test;
+
 import seedu.address.testutil.BuyerBuilder;
 
 public class BuyerTest {
@@ -46,13 +56,6 @@ public void isSamePerson() {
     @Test
     public void equals() {
 
-        Buyer buyerAlice =
-                new Buyer(ALICE.getName(), ALICE.getPhone(), ALICE.getEmail(), ALICE.getHousingType(),
-                        ALICE.getTags());
-        Buyer buyerBob =
-                new Buyer(BOB.getName(), BOB.getPhone(), BOB.getEmail(), BOB.getHousingType(),
-                        BOB.getTags());
-
         Person buyerAliCopy = new BuyerBuilder(ALI).build();
 
         // same object -> returns true
diff --git a/src/test/java/seedu/address/model/person/UniquePersonListTest.java b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
index 1e194a6335e..ba7ddffbeeb 100644
--- a/src/test/java/seedu/address/model/person/UniquePersonListTest.java
+++ b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
@@ -42,7 +42,8 @@ public void contains_personInList_returnsTrue() {
     @Test
     public void contains_personWithSameIdentityFieldsInList_returnsTrue() {
         uniquePersonList.add(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND)
+        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB)
+                .withTags(VALID_TAG_HUSBAND)
                 .build();
         assertTrue(uniquePersonList.contains(editedAlice));
     }
@@ -85,7 +86,8 @@ public void setPerson_editedPersonIsSamePerson_success() {
     @Test
     public void setPerson_editedPersonHasSameIdentity_success() {
         uniquePersonList.add(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB).withTags(VALID_TAG_HUSBAND)
+        Person editedAlice = new PersonBuilder(ALICE).withHousingType(VALID_HOUSING_TYPE_BOB)
+                .withTags(VALID_TAG_HUSBAND)
                 .build();
         uniquePersonList.setPerson(ALICE, editedAlice);
         UniquePersonList expectedUniquePersonList = new UniquePersonList();
diff --git a/src/test/java/seedu/address/testutil/BuyerBuilder.java b/src/test/java/seedu/address/testutil/BuyerBuilder.java
index a383d37cacf..d7b6df292aa 100644
--- a/src/test/java/seedu/address/testutil/BuyerBuilder.java
+++ b/src/test/java/seedu/address/testutil/BuyerBuilder.java
@@ -1,12 +1,16 @@
 package seedu.address.testutil;
 
-import seedu.address.model.house.PostalCode;
-import seedu.address.model.person.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import seedu.address.model.person.Buyer;
+import seedu.address.model.person.Email;
+import seedu.address.model.person.Name;
+import seedu.address.model.person.Person;
+import seedu.address.model.person.Phone;
 import seedu.address.model.tag.Tag;
 import seedu.address.model.util.SampleDataUtil;
 
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * A Utility class to help with building Buyer objects.
@@ -37,7 +41,7 @@ public BuyerBuilder() {
     /**
      * Initializes the BuyerBuilder with the data of {@code personToCopy}
      */
-    public BuyerBuilder(Person personToCopy) {      //TODO: need to figure this out if need Person or Buyer only)
+    public BuyerBuilder(Person personToCopy) { //TODO: need to figure this out if need Person or Buyer only)
         name = personToCopy.getName();
         phone = personToCopy.getPhone();
         email = personToCopy.getEmail();
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
index 5924bd8aaf1..caddb5dd885 100644
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ b/src/test/java/seedu/address/testutil/TypicalPersons.java
@@ -1,15 +1,24 @@
 package seedu.address.testutil;
 
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSING_TYPE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_HOUSING_TYPE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BEN;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import seedu.address.model.AddressBook;
-import seedu.address.model.person.Buyer;
 import seedu.address.model.person.Person;
 
-import static seedu.address.logic.commands.CommandTestUtil.*;
-
 /**
  * A utility class containing a list of {@code Person} objects to be used in tests.
  */

From b0f23725898a6408da68b47d352cdbeaaa775c3e Mon Sep 17 00:00:00 2001
From: Zeng Zihui <93191650+zengzihui@users.noreply.github.com>
Date: Thu, 21 Mar 2024 20:06:06 +0800
Subject: [PATCH 6/6] Change add seller command string from addseller to
 addSeller

Change the string of addseller command to addSeller and
change the address book to EstateEase
---
 .../java/seedu/address/logic/commands/AddSellerCommand.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seedu/address/logic/commands/AddSellerCommand.java b/src/main/java/seedu/address/logic/commands/AddSellerCommand.java
index 1e5124f8f9a..0c3bb1da547 100644
--- a/src/main/java/seedu/address/logic/commands/AddSellerCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddSellerCommand.java
@@ -23,14 +23,14 @@
  */
 public class AddSellerCommand extends Command {
 
-    public static final String COMMAND_WORD = "addseller";
+    public static final String COMMAND_WORD = "addSeller";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a seller to the address book. "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a seller to EstateEase. "
             + "Parameters: "
             + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_HOUSING_TYPE + "HOUSINGTYPE "
+            + PREFIX_HOUSING_TYPE + "HOUSING_TYPE "
             + PREFIX_STREET + "STREET "
             + PREFIX_BLOCK + "BLOCK "
             + PREFIX_LEVEL + "LEVEL "