Changed Address to TradeParty in fin service

backend/app.hopps.fin/src/main/java/app/hopps/fin/InvoiceDataHandler.java

@@ -3,7 +3,7 @@
 import app.hopps.commons.Data;
 import app.hopps.commons.InvoiceData;
 import app.hopps.fin.jpa.entities.TransactionRecord;
-import app.hopps.fin.kafka.model.AddressHelper;
+import app.hopps.fin.kafka.model.TradePartyHelper;
 import jakarta.enterprise.context.ApplicationScoped;
 
 import java.time.ZoneId;
@@ -27,7 +27,7 @@ private void handleInvoice(TransactionRecord transactionRecord, InvoiceData data
 
         // Optional
         data.customerName().ifPresent(transactionRecord::setName);
-        data.billingAddress().ifPresent(address -> transactionRecord.setSender(AddressHelper.convertToJpa(address)));
+        data.billingAddress().ifPresent(address -> transactionRecord.setSender(TradePartyHelper.convertToJpa(address)));
         data.purchaseOrderNumber().ifPresent(transactionRecord::setOrderNumber);
         data.invoiceId().ifPresent(transactionRecord::setInvoiceId);
         data.dueDate()

backend/app.hopps.fin/src/main/java/app/hopps/fin/ReceiptDataHandler.java

@@ -3,7 +3,7 @@
 import app.hopps.commons.Data;
 import app.hopps.commons.ReceiptData;
 import app.hopps.fin.jpa.entities.TransactionRecord;
-import app.hopps.fin.kafka.model.AddressHelper;
+import app.hopps.fin.kafka.model.TradePartyHelper;
 import jakarta.enterprise.context.ApplicationScoped;
 
 import java.time.ZoneOffset;
@@ -23,7 +23,7 @@ private void handleReceipt(TransactionRecord transactionRecord, ReceiptData data
 
         // Optional
         data.storeName().ifPresent(transactionRecord::setName);
-        data.storeAddress().ifPresent(addrees -> transactionRecord.setSender(AddressHelper.convertToJpa(addrees)));
+        data.storeAddress().ifPresent(addrees -> transactionRecord.setSender(TradePartyHelper.convertToJpa(addrees)));
         data.transactionTime()
                 .ifPresent(
                         transactionTime -> transactionRecord

backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/entities/Address.java → backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/entities/TradeParty.java

@@ -7,20 +7,33 @@
 
 @Entity(name = "trade_party")
 @SequenceGenerator(allocationSize = 1, name = "trade_party_sequence")
-public class Address {
+public class TradeParty {
     @Id
     @GeneratedValue(generator = "trade_party_sequence")
     private long id;
+    private String name;
     private String city;
     private String country;
     private String state;
     private String street;
+    private String additionalAddress;
     private String zipCode;
+    private String taxID;
+    private String vatID;
+    private String description;
 
     public long getId() {
         return id;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getCountry() {
         return country;
     }
@@ -60,4 +73,36 @@ public String getStreet() {
     public void setStreet(String street) {
         this.street = street;
     }
+
+    public String getAdditionalAddress() {
+        return additionalAddress;
+    }
+
+    public void setAdditionalAddress(String additionalAddress) {
+        this.additionalAddress = additionalAddress;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getTaxID() {
+        return taxID;
+    }
+
+    public void setTaxID(String taxID) {
+        this.taxID = taxID;
+    }
+
+    public String getVatID() {
+        return vatID;
+    }
+
+    public void setVatID(String vatID) {
+        this.vatID = vatID;
+    }
 }

backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/entities/TransactionRecord.java

@@ -9,7 +9,7 @@
 import jakarta.persistence.SequenceGenerator;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Generated;
-import org.mustangproject.TradeParty;
+
 import java.math.BigDecimal;
 import java.time.Instant;
 
@@ -47,10 +47,10 @@ public class TransactionRecord {
     private Instant transactionTime;
 
     @OneToOne
-    private Address sender;
+    private TradeParty sender;
 
     @OneToOne
-    private Address recipient;
+    private TradeParty recipient;
 
     private String name;
 
@@ -106,17 +106,17 @@ public void setTransactionTime(Instant transactionTime) {
         this.transactionTime = transactionTime;
     }
 
-    public Address getSender() {
+    public TradeParty getSender() {
         return sender;
     }
 
-    public void setSender(Address address) {
+    public void setSender(TradeParty address) {
         this.sender = address;
     }
 
-    public Address getRecipient() {return recipient;}
+    public TradeParty getRecipient() {return recipient;}
 
-    public void setRecipient(Address address) {
+    public void setRecipient(TradeParty address) {
         this.recipient = address;
     }
 

backend/app.hopps.fin/src/main/java/app/hopps/fin/kafka/model/TradePartyHelper.java

@@ -0,0 +1,24 @@
+package app.hopps.fin.kafka.model;
+
+import app.hopps.fin.jpa.entities.TradeParty;
+
+public class TradePartyHelper {
+    private TradePartyHelper() {
+        // only call the static method
+    }
+
+    public static TradeParty convertToJpa(app.hopps.commons.Address address) {
+        TradeParty addressJpa = new TradeParty();
+        addressJpa.setName(null);
+        addressJpa.setCity(address.city());
+        addressJpa.setCountry(address.countryOrRegion());
+        addressJpa.setState(address.state());
+        addressJpa.setStreet(address.street());
+        addressJpa.setAdditionalAddress(null);
+        addressJpa.setZipCode(address.postalCode());
+        addressJpa.setTaxID(null);
+        addressJpa.setVatID(null);
+        addressJpa.setDescription(null);
+        return addressJpa;
+    }
+}