Merge pull request nus-cs2103-AY2021S1#61 from yyutong/add-expense.Expense

Add expense.expense

Author: yuanxing-z

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

@@ -1,3 +1,4 @@
+
 package seedu.address.logic.parser;
 
 import static java.util.Objects.requireNonNull;

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

@@ -37,6 +37,12 @@ public static boolean isValidDescription(String test) {
         return test.matches(VALIDATION_REGEX);
     }
 
+    public boolean isEmpty() {
+        return value == null
+                ? true
+                : false;
+    }
+
     @Override
     public String toString() {
         return value;

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

@@ -0,0 +1,111 @@
+package seedu.address.model.person;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Objects;
+
+public class Expense {
+
+    // Identity fields
+    private final Amount amount;
+    private final Date date;
+    private final Category category;
+    private final Description description;
+
+    /**
+     * Every field must be present and not null.
+     */
+    public Expense(Amount amount, Date date, Category category, Description description) {
+        requireAllNonNull(amount, date, category);
+        this.amount = amount;
+        this.date = date;
+        this.category = category;
+        this.description = description;
+    }
+
+    public Amount getAmount() {
+        return this.amount;
+    }
+
+    public Date getDate() {
+        return this.date;
+    }
+
+    public Category getCategory() {
+        return this.category;
+    }
+
+    public Description getDescription() {
+        return this.description;
+    }
+
+
+    /**
+     * Returns true if both persons of the same name have at least one other identity field that is the same.
+     * This defines a weaker notion of equality between two persons.
+     */
+    public boolean isSameExpense(Expense otherExpense) {
+        if (otherExpense == this) {
+            return true;
+        }
+
+        return otherExpense != null
+                && otherExpense.getAmount().equals(this.getAmount())
+                && otherExpense.getDate().equals(this.getDate())
+                && otherExpense.getCategory().equals(this.getCategory())
+                && otherExpense.getDescription().equals(this.getDescription());
+    }
+
+    /**
+     * Returns true if both persons have the same identity and data fields.
+     * This defines a stronger notion of equality between two persons.
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        if (!(other instanceof Expense)) {
+            return false;
+        }
+
+        Expense otherExpense = (Expense) other;
+        return otherExpense.getAmount().equals(getAmount())
+                && otherExpense.getDate().equals(getDate())
+                && otherExpense.getCategory().equals(getCategory())
+                && otherExpense.getDescription().equals(getDescription());
+    }
+
+    @Override
+    public int hashCode() {
+        // use this method for custom fields hashing instead of implementing your own
+        return Objects.hash(amount, date, category, description);
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+
+        if (description.isEmpty()) {
+            builder.append(" Amount: ")
+                    .append(this.getAmount())
+                    .append(" Date: ")
+                    .append(this.getDate())
+                    .append(" Category: ")
+                    .append(this.getCategory());
+            return builder.toString();
+        } else {
+            builder.append(" Amount: ")
+                    .append(this.getAmount())
+                    .append(" Date: ")
+                    .append(this.getDate())
+                    .append(" Category: ")
+                    .append(this.getCategory())
+                    .append(" Description: ")
+                    .append(this.getDescription());
+            return builder.toString();
+        }
+    }
+
+}

src/test/java/seedu/address/model/person/ExpenseTest.java

@@ -0,0 +1,6 @@
+package seedu.address.model.person;
+
+
+public class ExpenseTest {
+
+}

src/test/java/seedu/address/testutil/ExpenseBuilder.java

@@ -0,0 +1,79 @@
+package seedu.address.testutil;
+
+import seedu.address.model.person.Amount;
+import seedu.address.model.person.Category;
+import seedu.address.model.person.Date;
+import seedu.address.model.person.Description;
+import seedu.address.model.person.Expense;
+
+/**
+ * A utility class to help with building Person objects.
+ */
+public class ExpenseBuilder {
+
+    public static final Double DEFAULT_AMOUNT = 10.0;
+    public static final String DEFAULT_DATE = "2020-10-07";
+    public static final String DEFAULT_CATEGORY = "FOOD";
+    public static final String DEFAULT_DESCRIPTION = "123, Jurong West Ave 6, #08-111";
+    private Amount amount;
+    private Date date;
+    private Category category;
+    private Description description;
+
+    /**
+     * Creates a {@code PersonBuilder} with the default details.
+     */
+    public ExpenseBuilder() {
+        amount = new Amount(DEFAULT_AMOUNT);
+        date = new Date(DEFAULT_DATE);
+        category = new Category(DEFAULT_CATEGORY);
+        description = new Description(DEFAULT_DESCRIPTION);
+    }
+
+    /**
+     * Initializes the PersonBuilder with the data of {@code personToCopy}.
+     */
+    public ExpenseBuilder(Expense expenseToCopy) {
+        amount = expenseToCopy.getAmount();
+        date = expenseToCopy.getDate();
+        category = expenseToCopy.getCategory();
+        description = expenseToCopy.getDescription();
+    }
+
+    /**
+     * Sets the {@code Name} of the {@code Person} that we are building.
+     */
+    public ExpenseBuilder withAmount(Double amount) {
+        this.amount = new Amount(amount);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Address} of the {@code Person} that we are building.
+     */
+    public ExpenseBuilder withDate(String date) {
+        return this;
+    }
+
+    /**
+     * Sets the {@code Phone} of the {@code Person} that we are building.
+     */
+    public ExpenseBuilder withCategory(String category) {
+        this.category = new Category(category);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Email} of the {@code Person} that we are building.
+     */
+    public ExpenseBuilder withDescription(String description) {
+        this.description = new Description(description);
+        return this;
+    }
+
+    public Expense build() {
+        return new Expense(amount, date, category, description);
+    }
+
+}
+

src/test/java/seedu/address/testutil/TypicalExpense.java

@@ -0,0 +1,4 @@
+package seedu.address.testutil;
+
+public class TypicalExpense {
+}