Merge pull request #276 from amihaiemil/273

#273 updated to core 69
self-xdsd · Mar 13, 2021 · 0acad03 · 0acad03
2 parents 7d42b1a + bbfab46
commit 0acad03
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <name>Self XDSD Storage Module</name>
     <description>Storage Module for Self XDSD</description>
     <properties>
-        <self.core.version>0.0.68</self.core.version>
+        <self.core.version>0.0.69</self.core.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <build>

diff --git a/src/main/java/com/selfxdsd/storage/SelfInvoices.java b/src/main/java/com/selfxdsd/storage/SelfInvoices.java
@@ -323,7 +323,7 @@ private Invoice buildInvoice(final Record record, final Contract contract) {
         final Payment latest;
         if(record.getValue(SLF_PAYMENTS_XDSD.STATUS) != null) {
             latest = new StoredPayment(
-                null,
+                record.getValue(SLF_INVOICES_XDSD.INVOICEID),
                 record.getValue(SLF_PAYMENTS_XDSD.TRANSACTIONID),
                 record.getValue(SLF_PAYMENTS_XDSD.PAYMENT_TIMESTAMP),
                 BigDecimal.valueOf(

diff --git a/src/main/java/com/selfxdsd/storage/SelfPayments.java b/src/main/java/com/selfxdsd/storage/SelfPayments.java
@@ -98,7 +98,7 @@ public Payment register(
             );
         } else {
             return new StoredPayment(
-                invoice,
+                invoice.invoiceId(),
                 transactionId,
                 timestamp,
                 value,
@@ -120,7 +120,7 @@ public Payments ofInvoice(final Invoice invoice) {
                 .stream()
                 .map(
                     rec -> new StoredPayment(
-                        invoice,
+                        invoice.invoiceId(),
                         rec.getValue(SLF_PAYMENTS_XDSD.TRANSACTIONID),
                         rec.getValue(SLF_PAYMENTS_XDSD.PAYMENT_TIMESTAMP),
                         BigDecimal.valueOf(