libeufin

commit f54438f79232c106899bdb53e27f8084ef6d21bb
parent 96950a3989fa9013b91d773e1cdae3f071a76959
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Thu,  9 Apr 2020 23:36:36 +0200

propagate last change

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
 | 
3
+--
M
nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt
 | 
8
+++++---

2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -635,8 +635,7 @@ fun main() {
                 transaction {
                     val subscriber: EbicsSubscriberEntity = getSubscriberEntityFromId(id)
                     EbicsRawBankTransactionEntity.find {
-                        (EbicsRawBankTransactionsTable.nexusSubscriber eq subscriber.id.value) and
-                                (EbicsRawBankTransactionsTable.sourceType eq "C53")
+                        EbicsRawBankTransactionsTable.nexusSubscriber eq subscriber.id.value
                     }.forEach {
                         ret += "###\nDebitor: ${it.debitorIban}\nCreditor: ${it.creditorIban}\nAmount: ${it.currency}:${it.amount}\nDate: ${it.bookingDate}\n"
                     }
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt
@@ -224,7 +224,6 @@ class Taler(app: Route) {
                 val exchangeBankAccount = getBankAccountsInfoFromId(exchangeId).first()
                 val rawPayment = EbicsRawBankTransactionEntity.new {
                     sourceFileName = "test"
-                    sourceType = "C53"
                     unstructuredRemittanceInformation = addIncomingData.reserve_pub
                     transactionType = "CRDT"
                     currency = amount.currency
@@ -232,9 +231,12 @@ class Taler(app: Route) {
                     creditorIban = exchangeBankAccount.iban
                     creditorName = "Exchange's company name"
                     debitorIban = debtor.iban
-                    debitorName = if (debtor.name.isNotEmpty()) { debtor.name } else "DEBITORNAMENOTGIVEN"
-                    counterpartBic = if (debtor.bic.isNotEmpty()) { debtor.bic } else "DEBITORBICNOTGIVEN"
+                    debitorName = debtor.name
+                    counterpartBic = debtor.bic
                     bookingDate = DateTime.now().toZonedString()
+                    status = "BOOK"
+                    servicerCode = "test-0"
+                    proprietaryCode = "test-0"
                 }
                 /** This payment is "valid by default" and will be returned
                  * as soon as the exchange will ask for new payments.  */