libeufin

commit 79b2a0e6792e19d694886e83a2e4a546de7282d7
parent 7794a6b2c1e7bcd79a242605337cd36004983456
Author: MS <ms@taler.net>
Date:   Tue, 12 Jan 2021 18:41:10 +0100

Testing previous change.

Diffstat:
M
integration-tests/tests.py
 | 
2
+-
M
nexus/src/main/kotlin/tech/libeufin/nexus/bankaccount/BankAccount.kt
 | 
7
++-----
M
sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
 | 
4
++--

3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/integration-tests/tests.py b/integration-tests/tests.py
@@ -124,7 +124,7 @@ def teardown_function():
     dropSandboxTables(DB)
     dropNexusTables(DB)
 
-def test_env():
+def test_env(make_crdt_payment):
     print("Nexus and Sandbox are up and running!\n")
     print(f"Nexus URL: {NEXUS_URL}")
     print(f"Sandbox URL: {SANDBOX_URL}")
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/bankaccount/BankAccount.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/bankaccount/BankAccount.kt
@@ -223,6 +223,7 @@ fun ingestBankMessagesIntoAccount(bankConnectionId: String, bankAccountId: Strin
             (NexusBankMessagesTable.bankConnection eq conn.id) and
                     (NexusBankMessagesTable.id greater acct.highestSeenBankMessageId)
         }.orderBy(Pair(NexusBankMessagesTable.id, SortOrder.ASC)).forEach {
+            logger.debug("Unseen Camt, account: ${bankAccountId}, connection: ${conn.id}, msgId: ${it.messageId}")
             totalNew++
             val doc = XMLUtil.parseStringIntoDom(it.message.bytes.toString(Charsets.UTF_8))
             if (!processCamtMessage(bankAccountId, doc, it.code)) {
@@ -279,11 +280,7 @@ fun addPaymentInitiation(paymentData: Pain001Data, debitorAccount: NexusBankAcco
     }
 }
 
-suspend fun fetchBankAccountTransactions(
-    client: HttpClient,
-    fetchSpec: FetchSpecJson,
-    accountId: String
-): Int {
+suspend fun fetchBankAccountTransactions(client: HttpClient, fetchSpec: FetchSpecJson, accountId: String): Int {
     val res = transaction {
         val acct = NexusBankAccountEntity.findById(accountId)
         if (acct == null) {
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
@@ -218,11 +218,11 @@ fun buildCamtString(type: Int, subscriberIban: String, history: List<RawPayment>
     val zonedDateTime = now.toZonedString()
     return constructXml(indent = true) {
         root("Document") {
-            attribute("xmlns", "urn:iso:std:iso:20022:tech:xsd:camt.053.001.02")
+            attribute("xmlns", "urn:iso:std:iso:20022:tech:xsd:camt.0${type}.001.02")
             attribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance")
             attribute(
                 "xsi:schemaLocation",
-                "urn:iso:std:iso:20022:tech:xsd:camt.053.001.02 camt.053.001.02.xsd"
+                "urn:iso:std:iso:20022:tech:xsd:camt.0${type}.001.02 camt.0${type}.001.02.xsd"
             )
             element("BkToCstmrStmt") {
                 element("GrpHdr") {