[libeufin] branch master updated: linking offered account to imported account

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new abc3bca  linking offered account to imported account
abc3bca is described below

commit abc3bca611f7eb0e11cf5ed3875e53c31dd195a6
Author: MS <ms@taler.net>
AuthorDate: Wed Jun 24 16:57:41 2020 +0200

    linking offered account to imported account
---
 nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt                 | 4 ++--
 nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
index 3b75115..b6cd2e8 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
@@ -216,7 +216,7 @@ object OfferedBankAccountsTable : IdTable<String>() {
     val iban = text("iban")
     val bankCode = text("bankCode")
     val accountHolder = text("holderName")
-    val imported = bool("imported").default(false)
+    val imported = reference("imported", NexusBankAccountsTable).nullable()
 }
 
 class OfferedBankAccountEntity(id: EntityID<String>) : Entity<String>(id) {
@@ -225,7 +225,7 @@ class OfferedBankAccountEntity(id: EntityID<String>) : 
Entity<String>(id) {
     var iban by OfferedBankAccountsTable.iban
     var bankCode by OfferedBankAccountsTable.bankCode
     var accountHolder by OfferedBankAccountsTable.accountHolder
-    var imported by OfferedBankAccountsTable.imported
+    var imported by NexusBankAccountEntity optionalReferencedOn 
OfferedBankAccountsTable.imported
 }
 
 /**
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
index f051450..6cdef70 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
@@ -349,7 +349,6 @@ fun serverMain(dbName: String, host: String) {
                 call.respond(bankAccounts)
                 return@get
             }
-
             get("/bank-accounts/{accountid}/schedule") {
                 val resp = jacksonObjectMapper().createObjectNode()
                 val ops = jacksonObjectMapper().createObjectNode()
@@ -815,14 +814,14 @@ fun serverMain(dbName: String, host: String) {
                         val account = 
OfferedBankAccountEntity.findById(body.accountId) ?: throw NexusError(
                             HttpStatusCode.NotFound, "Could not found raw bank 
account '${body.accountId}'"
                         )
-                        NexusBankAccountEntity.new(body.localName) {
+                        val importedBankAccount = 
NexusBankAccountEntity.new(body.localName) {
                             iban = account.iban
                             bankCode = account.bankCode
                             defaultBankConnection = conn
                             highestSeenBankMessageId = 0
                             accountHolder = account.accountHolder
                         }
-                        account.imported = true
+                        account.imported = importedBankAccount
                     }
                     call.respond(object {})
                 }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.