Testing the EBICS time-framed history request.

2 files changed, 7 insertions, 4 deletions

diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
index bfd521cc..0dc7b742 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
@@ -518,6 +518,7 @@ private suspend fun getWithdrawal(call: ApplicationCall) {
 
 private suspend fun confirmWithdrawal(call: ApplicationCall) {
     val withdrawalId = call.expectUriComponent("withdrawal_id")
+    logger.debug("Maybe confirming withdrawal: $withdrawalId")
     transaction {
         val wo = getWithdrawalOperation(withdrawalId)
         if (wo.aborted) throw SandboxError(
@@ -541,6 +542,7 @@ private suspend fun confirmWithdrawal(call: ApplicationCall) {
                 "Cannot withdraw without an exchange."
             )
         )
+        logger.debug("Withdrawal ${wo.wopid} confirmed? ${wo.confirmationDone}")
         if (!wo.confirmationDone) {
             wireTransfer(
                 debitAccount = wo.walletBankAccount,
@@ -1557,15 +1559,18 @@ val sandboxApp: Application.() -> Unit = {
                     var ret: List<XLibeufinBankTransaction> = transaction {
                         extractTxHistory(historyParams)
                     }
+                    logger.debug("Is payment data empty? ${ret.isEmpty()}")
                     // Data was found already, UNLISTEN and respond.
                     if (listenHandle != null && ret.isNotEmpty()) {
+                        logger.debug("No need to wait DB events, payment data found.")
                         listenHandle.postgresUnlisten()
                         call.respond(object {val transactions = ret})
                         return@get
                     }
                     // No data was found, sleep until the timeout or getting woken up.
                     // Third condition only silences the compiler.
-                    if (listenHandle != null && ret.isEmpty() && longPollMs != null) {
+                    if (listenHandle != null && longPollMs != null) {
+                        logger.debug("Waiting DB event for new payment data.")
                         val notificationArrived = listenHandle.waitOnIODispatchers(longPollMs)
                         // Only if the awaited event fired, query again the DB.
                         if (notificationArrived)
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt
index dc361a52..9a449f84 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt
@@ -228,11 +228,9 @@ fun wireTransfer(
         }
 
         // Adjusting the balances (acceptable debit conditions checked before).
-        debitAccount.refresh()
-        creditAccount.refresh()
         // Debit:
         val newDebitBalance = (BigDecimal(debitAccount.balance) - amountAsNumber).roundToTwoDigits()
-        debitAccount.balance = newDebitBalance.toPlainString() // FIXME: that's ignored!
+        debitAccount.balance = newDebitBalance.toPlainString()
         // Credit:
         val newCreditBalance = (BigDecimal(creditAccount.balance) + amountAsNumber).roundToTwoDigits()
         creditAccount.balance = newCreditBalance.toPlainString()