libeufin

commit 60119d3e5945a3ec2aea70e810d3e69f2bece4dc
parent 67767c666bcd1ee6ca01df2747b55bf6e5a70485
Author: MS <ms@taler.net>
Date:   Fri, 26 Jun 2020 15:48:22 +0200

consistent renaming

Diffstat:
M
integration-tests/test-loopback-highlevel.py
 | 
4
++--
M
nexus/src/main/kotlin/tech/libeufin/nexus/server/JSON.kt
 | 
4
++--
M
nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
 | 
8
++++----

3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/integration-tests/test-loopback-highlevel.py b/integration-tests/test-loopback-highlevel.py
@@ -71,8 +71,8 @@ assertResponse(
             data=dict(
                 iban="myIBAN",
                 bic="myBIC",
-                holder="Account Holder Name",
-                account="my-bank-account"
+                ownerName="Account Holder Name",
+                nexusBankAccountId="my-bank-account"
             )
         ),
         headers=dict(Authorization=USER_AUTHORIZATION_HEADER),
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/server/JSON.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/server/JSON.kt
@@ -264,10 +264,10 @@ data class UsersResponse(
 
 /** Response (list's element) type of "GET /bank-accounts" */
 data class BankAccount(
-    var holder: String,
+    var ownerName: String,
     var iban: String,
     var bic: String,
-    var account: String
+    var nexusBankAccountId: String
 )
 
 data class OfferedBankAccount(
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
@@ -166,10 +166,10 @@ fun createLoopbackBankConnection(bankConnectionName: String, user: NexusUserEnti
         type = "loopback"
     }
     val bankAccount = jacksonObjectMapper().treeToValue(data, BankAccount::class.java)
-    NexusBankAccountEntity.new(bankAccount.account) {
+    NexusBankAccountEntity.new(bankAccount.nexusBankAccountId) {
         iban = bankAccount.iban
         bankCode = bankAccount.bic
-        accountHolder = bankAccount.holder
+        accountHolder = bankAccount.ownerName
         defaultBankConnection = bankConn
         highestSeenBankMessageId = 0
     }
@@ -332,10 +332,10 @@ fun serverMain(dbName: String, host: String) {
                     NexusBankAccountEntity.all().forEach {
                         bankAccounts.accounts.add(
                             BankAccount(
-                                holder = it.accountHolder,
+                                ownerName = it.accountHolder,
                                 iban = it.iban,
                                 bic = it.bankCode,
-                                account = it.id.value
+                                nexusBankAccountId = it.id.value
                             )
                         )
                     }