libeufin

commit 1d4a535ef39046dc4ee814966eff145778adc81b
parent eaee0dca7b554c5919414bf7457c7ece75fc65c3
Author: Antoine A <>
Date:   Fri, 24 Jan 2025 13:33:56 +0100

nexus: add batch id when listing initiated transaction

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/cli/Testing.kt
 | 
4
++--
M
nexus/src/main/kotlin/tech/libeufin/nexus/db/ListDAO.kt
 | 
3
+++

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/cli/Testing.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/cli/Testing.kt
@@ -1,6 +1,6 @@
 /*
  * This file is part of LibEuFin.
- * Copyright (C) 2024 Taler Systems S.A.
+ * Copyright (C) 2024-2025 Taler Systems S.A.
 
  * LibEuFin is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -269,7 +269,7 @@ class ListCmd: CliktCommand("list") {
                         txs.map {
                             listOf(
                                 "${it.date} ${it.amount}",
-                                it.id,
+                                "${it.batch ?: "<batch>"}.${it.id}",
                                 "${it.submissionTime} ${it.submissionCounter}",
                                 fmtPayto(it.creditor),
                                 "${it.status} ${it.msg ?: ""}".trim(),
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/db/ListDAO.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/db/ListDAO.kt
@@ -110,6 +110,7 @@ class ListDAO(private val db: Database) {
             ,submission_counter
             ,credit_payto
             ,end_to_end_id
+            ,message_id
             ,initiated_outgoing_transactions.status
             ,initiated_outgoing_transactions.status_msg
         FROM initiated_outgoing_transactions
@@ -124,6 +125,7 @@ class ListDAO(private val db: Database) {
                 subject = it.getString("subject"),
                 creditor = it.getString("credit_payto"),
                 id = it.getString("end_to_end_id"),
+                batch = it.getString("message_id"),
                 status = it.getString("status"),
                 msg = it.getString("status_msg"),
                 submissionTime = it.getLong("submission_date").asInstant(),
@@ -162,6 +164,7 @@ data class InitiatedTxMetadata(
     val subject: String,
     val creditor: String,
     val id: String,
+    val batch: String?,
     val status: String,
     val msg: String?,
     val submissionTime: Instant,