libeufin

commit ec21de305a661af99987f9b296f9cbabebc5b746
parent c29d7da3ef40f689310cc860aac142f81c87a093
Author: MS <ms@taler.net>
Date:   Wed,  1 Nov 2023 16:28:53 +0100

debug

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt
 | 
9
+++++----
M
nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics3.kt
 | 
5
+++++
M
nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt
 | 
1
+

3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt
@@ -68,8 +68,7 @@ private suspend fun submitInitiatedPayment(
         debitAccount = cfg.myIbanAccount,
         wireTransferSubject = initiatedPayment.wireTransferSubject
     )
-    submitPayment(xml, cfg, clientPrivateKeysFile, bankPublicKeysFile, httpClient)
-    return true
+    return submitPayment(xml, cfg, clientPrivateKeysFile, bankPublicKeysFile, httpClient)
 }
 
 /**
@@ -142,6 +141,7 @@ private fun submitBatch(
 ) {
     runBlocking {
         db.initiatedPaymentsUnsubmittedGet(cfg.currency).forEach {
+            logger.debug("Submitting payment initiation with row ID: ${it.key}")
             val submitted = submitInitiatedPayment(
                 httpClient,
                 cfg,
@@ -159,7 +159,8 @@ private fun submitBatch(
                 if (!flagged) {
                     logger.warn("Initiated payment with row ID ${it.key} could not be flagged as submitted")
                 }
-            }
+            } else
+                logger.warn("Initiated payment with row ID ${it.key} could not be submitted")
         }
     }
 }
@@ -183,7 +184,7 @@ class EbicsSubmit : CliktCommand("Submits any initiated payment found in the dat
     override fun run() {
         val cfg: EbicsSetupConfig = doOrFail { extractEbicsConfig(configFile) }
         val frequency: Int = doOrFail {
-            val configValue = cfg.config.requireString("nexus-ebics-submit", "frequency")
+            val configValue = cfg.config.requireString("nexus-submit", "frequency")
             return@doOrFail checkFrequency(configValue)
         }
         val dbCfg = cfg.config.extractDbConfigOrFail()
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics3.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics3.kt
@@ -113,6 +113,7 @@ suspend fun submitPayment(
     bankkeys: BankPublicKeysFile,
     httpClient: HttpClient
 ): Boolean {
+    logger.debug("Submitting pain.001: $pain001xml")
     val orderService: Ebics3Request.OrderDetails.Service = Ebics3Request.OrderDetails.Service().apply {
         serviceName = "MCT"
         scope = "CH"
@@ -133,5 +134,9 @@ suspend fun submitPayment(
         logger.error("Could not send the pain.001 document to the bank.")
         return false
     }
+    logger.debug("Payment submitted, report text is: ${maybeUploaded.reportText}," +
+            " EBICS technical code is: ${maybeUploaded.technicalReturnCode}," +
+            " bank technical return code is: ${maybeUploaded.bankReturnCode}"
+    )
     return true
 }
 \ No newline at end of file
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt
@@ -94,6 +94,7 @@ fun decryptAndDecompressPayload(
  *         EBICS handler, or null otherwise.
  */
 suspend fun HttpClient.postToBank(bankUrl: String, msg: String): String? {
+    logger.debug("POSTing EBICS to: $bankUrl")
     val resp: HttpResponse = try {
         this.post(urlString = bankUrl) {
             expectSuccess = false // avoids exceptions on non-2xx statuses.