libeufin

commit d642a0c618ba8e3c82413b224e931fcc81a2adc1
parent b06d03ffa1409f0043fe29c26fdbd9548a19d69b
Author: MS <ms@taler.net>
Date:   Wed,  8 Jul 2020 12:24:57 +0200

more details in response

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/server/JSON.kt
 | 
2
+-
M
nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
 | 
19
++++++++++++++++++-

2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/server/JSON.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/server/JSON.kt
@@ -400,5 +400,5 @@ data class AccountEntryItemJson(
 )
 
 data class InitiatedPayments(
-    val initiatedPayments: MutableList<String> = mutableListOf()
+    val initiatedPayments: MutableList<PaymentStatus> = mutableListOf()
 )
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
@@ -483,7 +483,24 @@ fun serverMain(dbName: String, host: String) {
                     val bankAccount = requireBankAccount(call, "accountid")
                     PaymentInitiationEntity.find {
                         PaymentInitiationsTable.bankAccount eq bankAccount.id.value
-                    }.forEach { ret.initiatedPayments.add(it.id.toString()) }
+                    }.forEach {
+                        val sd = it.submissionDate
+                        ret.initiatedPayments.add(
+                            PaymentStatus(
+                                paymentInitiationId = it.id.value.toString(),
+                                submitted = it.submitted,
+                                creditorIban = it.creditorIban,
+                                creditorName = it.creditorName,
+                                creditorBic = it.creditorBic,
+                                amount = "${it.currency}:${it.sum}",
+                                subject = it.subject,
+                                submissionDate = if (sd != null) {
+                                    importDateFromMillis(sd).toDashedDate()
+                                } else null,
+                                preparationDate = importDateFromMillis(it.preparationDate).toDashedDate()
+                            )
+                        )
+                    }
                 }
                 call.respond(ret)
                 return@get