House, Buyer/Seller Capabilities #62

redcolorbicycle · 2024-03-18T07:51:52Z

Currently, there are no specific classes for representing houses (landed or not) in the address book application.

To differentiate between landed and non panded properties in the address book application and to allow for specific functionalities and attributes for each.

Three new classes, House, Landed and Nonlanded, are created. Each class has its own add commands and functionalities.

Commands for adding buyers and sellers are edited to indicate the housing type preferred. Furthermore, people now have the capability to own a house.

…dual components

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

src/main/java/seedu/address/model/house/Landed.java

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

limcaaarl

Just some minor issues with the javadocs descriptions and some of the variable names.

limcaaarl · 2024-03-18T09:43:15Z

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

 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.person.Seller;
 import seedu.address.model.tag.Tag;

 /**


I think this should be documented as AddSellerCommand object instead of AddCommand object.

Edit: The tagging didn't work properly, but this is talking about the javadocs under this class.

limcaaarl · 2024-03-18T09:47:29Z

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

+     * Parses a {@code String street} into a {@code Street}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code street} is invalid.


Wrong description here.

limcaaarl · 2024-03-18T09:52:35Z

src/main/java/seedu/address/model/house/House.java

+    /**
+     * Constructs a House with a different unit number for editing purposes.
+     *
+     * @param unitNumber The new unit number of the house.
+     * @param house      The existing house object.
+     */
+    public House(UnitNumber unitNumber, House house) {
+        this.unitNumber = unitNumber;
+        this.postalCode = house.getPostalCode();
+        this.street = house.getStreet();
+    }
+
+    /**
+     * Constructs a House with a different postal code for editing purposes.
+     *
+     * @param postalCode The new postal code of the house.
+     * @param house      The existing house object.
+     */
+    public House(PostalCode postalCode, House house) {
+        this.unitNumber = house.getUnitNumber();
+        this.postalCode = house.getPostalCode();
+        this.street = house.getStreet();
+    }
+
+    /**
+     * Constructs a House with a different street for editing purposes.
+     *
+     * @param street The new street of the house.
+     * @param house  The existing house object.
+     */
+    public House(Street street, House house) {
+        this.unitNumber = house.getUnitNumber();
+        this.postalCode = house.getPostalCode();
+        this.street = street;
+    }
+
+    /**
+     * Constructs a copy of the given house for editing purposes.
+     *
+     * @param house The house to copy.
+     */
+    public House(House house) {
+        this.unitNumber = house.getUnitNumber();
+        this.postalCode = house.getPostalCode();
+        this.street = house.getStreet();
+    }


I think there's no need for overloaded constructor for editing purposes.

For AB3 iirc, edit person command just passes the original value of the field, even if it's unedited, to the very same constructor. So no matter which field you edit, it will use the same constructor.

I need someone to confirm this.

I think so too because if we based the edit based on the Person, they only have one constructor but you can edit the fields as per normal.

limcaaarl · 2024-03-18T10:04:54Z

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

+    private final Street street;
+    private final House house;
+    private final PostalCode postalCode;
+    private final UnitNumber unitNumber;


I think a seller just needs to keep track of houses.

limcaaarl · 2024-03-18T10:05:20Z

src/main/java/seedu/address/storage/JsonAdaptedPerson.java

@@ -28,23 +28,20 @@ class JsonAdaptedPerson {
    private final String name;
    private final String phone;
    private final String email;
-    private final String address;
-    private final String postalCode;
+    private final String housingtype;


perhaps housingType?

limcaaarl · 2024-03-18T10:06:30Z

src/main/java/seedu/address/ui/PersonCard.java

@@ -35,7 +35,7 @@ public class PersonCard extends UiPart<Region> {
    @FXML
    private Label phone;
    @FXML
-    private Label address;
+    private Label housingtype;


This one too housingType

limcaaarl · 2024-03-18T10:08:24Z

src/test/java/seedu/address/logic/parser/EditCommandParserTest.java

-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_ADDRESS;
+import static seedu.address.logic.commands.CommandTestUtil.*;


I think you accidentally replaced

import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; 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.INVALID_ADDRESS_DESC; import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_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; 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.PHONE_DESC_BOB; 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_ADDRESS_AMY; import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_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_ADDRESS;

with
import static seedu.address.logic.commands.CommandTestUtil.*;

limcaaarl · 2024-03-18T10:16:29Z

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

-    private final Address address;
-    private final PostalCode postalCode;
+    // critically, this refers to what type the buyer WANTS, and what type the seller HAS
+    private final String housingtype;


I think you can rename this to housingType instead of housingtype.

felixchanyy · 2024-03-18T14:30:51Z

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

@@ -137,7 +141,7 @@ public static class EditPersonDescriptor {
        private Name name;
        private Phone phone;
        private Email email;
-        private Address address;
+        private String housingtype;


housingType?

KhoonSun47 · 2024-03-19T01:27:00Z

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

-            + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
+            + PREFIX_HOUSINGTYPE + "HDB "
+            + PREFIX_STREET + "Clementi Ave 2 "
+            + PREFIX_BLOCK + "Block 311 "


I think this part has to be changed, because the prefix_block + "Block 311 " should be "311 " instead, since the block can only take in numbers and one letter. I believe that it should be the changes should also be made to level and unit number.

But this one is quite minor since it is the UI, can be changed later.

felixchanyy · 2024-03-20T04:13:16Z

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

                || !argMultimap.getPreamble().isEmpty()) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddSellerCommand.MESSAGE_USAGE));
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));


AddSellerCommand

redcolorbicycle added 8 commits March 18, 2024 03:22

implement house structure and logic, half replace address with indivi…

ea0fc0c

…dual components

implement house structure and logic, half replace address with indivi…

43d3e7c

…dual components

Merge remote-tracking branch 'origin/master' into branch-house

8a9d18c

implement house structure and logic, half replace address with indivi…

80b6862

…dual components

implement house structure and logic, half replace address with indivi…

74a314b

…dual components

implement house structure and logic, half replace address with indivi…

ffb1b3a

…dual components

implement house structure and logic, half replace address with indivi…

8501f64

…dual components

Updated checkstyle

cd8f010

redcolorbicycle requested review from limcaaarl, zengzihui, felixchanyy and KhoonSun47 March 18, 2024 07:51

felixchanyy reviewed Mar 18, 2024

View reviewed changes

src/main/java/seedu/address/logic/commands/AddBuyerCommand.java Show resolved Hide resolved

Updated checkstyle

c7e51c4

felixchanyy reviewed Mar 18, 2024

View reviewed changes

src/main/java/seedu/address/model/house/Landed.java Show resolved Hide resolved

felixchanyy reviewed Mar 18, 2024

View reviewed changes

src/main/java/seedu/address/logic/parser/AddSellerCommandParser.java Outdated Show resolved Hide resolved

redcolorbicycle added 10 commits March 18, 2024 16:41

Updated checkstyle

3afb54d

Updated checkstyle

8ed37dd

Updated checkstyle

c4fd6a8

Updated checkstyle

aa0cc0b

Updated checkstyle

68240c4

Updated checkstyle

4c57903

Updated checkstyle

a0d8087

Updated checkstyle

0f8c110

Updated checkstyle

41672ab

Updated checkstyle

a0c1e4e

limcaaarl requested changes Mar 18, 2024

View reviewed changes

All changes suggested by Carl added

3398f6d

felixchanyy reviewed Mar 18, 2024

View reviewed changes

Changes suggested by Felix added

e42d396

KhoonSun47 reviewed Mar 19, 2024

View reviewed changes

redcolorbicycle added 14 commits March 19, 2024 10:18

minor checkstyle

9d13dfd

minor checkstyle

9f2405e

delete addcommandparsertest

6149f6c

seller constructor added

220683a

seller constructor added

19659ee

checkstyle changed

475dd44

checkstyle changed

0eff018

checkstyle changed

f64b703

checkstyle changed, test cases edited

07c5db5

checkstyle changed, test cases edited

7d3b0fe

checkstyle changed, test cases edited

a4402bb

checkstyle changed, test cases edited

89fc169

checkstyle changed, test cases edited

0cd2dbd

checkstyle changed, test cases edited

92b8a4e

felixchanyy changed the base branch from master to branch-not-done-1 March 19, 2024 15:12

felixchanyy merged commit 5de956e into AY2324S2-CS2103-F09-1:branch-not-done-1 Mar 19, 2024

felixchanyy reviewed Mar 20, 2024

View reviewed changes

felixchanyy assigned redcolorbicycle Mar 21, 2024

felixchanyy added the enhancement New feature or request label Mar 21, 2024

felixchanyy added this to the v1.2 milestone Mar 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

House, Buyer/Seller Capabilities #62

House, Buyer/Seller Capabilities #62

Uh oh!

redcolorbicycle commented Mar 18, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

limcaaarl left a comment

Uh oh!

limcaaarl Mar 18, 2024 •

edited

Loading

Uh oh!

limcaaarl Mar 18, 2024

Uh oh!

limcaaarl Mar 18, 2024 •

edited

Loading

Uh oh!

KhoonSun47 Mar 19, 2024

Uh oh!

limcaaarl Mar 18, 2024

Uh oh!

limcaaarl Mar 18, 2024

Uh oh!

limcaaarl Mar 18, 2024

Uh oh!

limcaaarl Mar 18, 2024 •

edited

Loading

Uh oh!

limcaaarl Mar 18, 2024

Uh oh!

felixchanyy Mar 18, 2024

Uh oh!

KhoonSun47 Mar 19, 2024

Uh oh!

felixchanyy Mar 20, 2024

Uh oh!

Uh oh!

House, Buyer/Seller Capabilities #62

House, Buyer/Seller Capabilities #62

Uh oh!

Conversation

redcolorbicycle commented Mar 18, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

limcaaarl left a comment

Choose a reason for hiding this comment

Uh oh!

limcaaarl Mar 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

limcaaarl Mar 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

limcaaarl Mar 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

limcaaarl Mar 18, 2024 •

edited

Loading

limcaaarl Mar 18, 2024 •

edited

Loading

limcaaarl Mar 18, 2024 •

edited

Loading