[+] Add EntryFactory to create entry and fix some problems.

CSC207-2022F-UofT · Nov 6, 2022 · 3594fc3 · 3594fc3
1 parent 6c9a6e8
commit 3594fc3
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 2 deletions.
diff --git a/src/main/java/billgates/Main.java b/src/main/java/billgates/Main.java
@@ -0,0 +1,22 @@
+package billgates;
+
+import billgates.entities.Entry;
+import billgates.entities.EntryFactory;
+
+import java.time.ZonedDateTime;
+
+public class Main {
+
+    public static void main(String[] args) {
+        Entry entry = new EntryFactory(1)
+                .setDate(ZonedDateTime.now())
+                .setValue(123)
+                .setCurrency("CAD")
+                .setDescription("RAY")
+                .setFrom("Scott's credit card")
+                .setTo("T&T supermarket")
+                .createEntry();
+        System.out.println(entry);
+    }
+
+}
diff --git a/src/main/java/billgates/entities/AbstractEntry.java b/src/main/java/billgates/entities/AbstractEntry.java
@@ -1,6 +1,7 @@
 package billgates.entities;
 
 import java.time.ZonedDateTime;
+import java.util.Arrays;
 import java.util.Objects;
 
 public abstract class AbstractEntry {
@@ -14,7 +15,7 @@ public abstract class AbstractEntry {
     private Attribute<String> to;
     private Attribute<String> location;
 
-    public AbstractEntry(Attribute<Integer> id, Attribute<ZonedDateTime> date, Attribute<Double> value,
+    protected AbstractEntry(Attribute<Integer> id, Attribute<ZonedDateTime> date, Attribute<Double> value,
                          Attribute<String> currency, Attribute<String> description,
                          Attribute<String> from, Attribute<String> to, Attribute<String> location) {
         this.id = id;
@@ -27,6 +28,13 @@ public AbstractEntry(Attribute<Integer> id, Attribute<ZonedDateTime> date, Attri
         this.location = location;
     }
 
+    @Override
+    public String toString() {
+        return Arrays.toString(new String[]{
+                this.id.toString(), this.date.toString(), this.value.toString(), this.currency.toString(),
+                this.description.toString(), this.from.toString(), this.to.toString(), this.location.toString()});
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;

diff --git a/src/main/java/billgates/entities/Attribute.java b/src/main/java/billgates/entities/Attribute.java
@@ -12,6 +12,11 @@ public Attribute(T attribute, String name) {
         this.name = name;
     }
 
+    @Override
+    public String toString() {
+        return this.attribute.toString();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/src/main/java/billgates/entities/Entry.java b/src/main/java/billgates/entities/Entry.java
@@ -4,7 +4,7 @@
 
 public class Entry extends AbstractEntry {
 
-    public Entry(Attribute<Integer> id, Attribute<ZonedDateTime> date, Attribute<Double> value,
+    protected Entry(Attribute<Integer> id, Attribute<ZonedDateTime> date, Attribute<Double> value,
                  Attribute<String> currency, Attribute<String> description,
                  Attribute<String> from, Attribute<String> to, Attribute<String> location) {
         super(id, date, value, currency, description, from, to, location);

diff --git a/src/main/java/billgates/entities/EntryFactory.java b/src/main/java/billgates/entities/EntryFactory.java
@@ -0,0 +1,71 @@
+package billgates.entities;
+
+import java.time.ZonedDateTime;
+
+public class EntryFactory {
+
+    private int id = -1;
+    private ZonedDateTime date = ZonedDateTime.now();
+    private double value = 0.0;
+    private String currency = "";
+    private String description = "";
+    private String from = "";
+    private String to = "";
+    private String location = "";
+
+    // TODO splitter
+
+    // TODO for splitter, payee
+
+    public EntryFactory(int id) {
+        this.id = id;
+    }
+
+    public Entry createEntry() {
+        return new Entry(
+                new Attribute<>(this.id, "id"),
+                new Attribute<>(this.date, "date"),
+                new Attribute<>(this.value, "value"),
+                new Attribute<>(this.currency, "currency"),
+                new Attribute<>(this.description, "description"),
+                new Attribute<>(this.from, "from"),
+                new Attribute<>(this.to, "to"),
+                new Attribute<>(this.location, "location")
+                );
+    }
+
+    public EntryFactory setDate(ZonedDateTime date) {
+        this.date = date;
+        return this;
+    }
+
+    public EntryFactory setValue(double value) {
+        this.value = value;
+        return this;
+    }
+
+    public EntryFactory setCurrency(String currency) {
+        this.currency = currency;
+        return this;
+    }
+
+    public EntryFactory setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    public EntryFactory setFrom(String from) {
+        this.from = from;
+        return this;
+    }
+
+    public EntryFactory setTo(String to) {
+        this.to = to;
+        return this;
+    }
+
+    public EntryFactory setLocation(String location) {
+        this.location = location;
+        return this;
+    }
+}