[libeufin] branch master updated: temporarily ignoring permisssions values

[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 88ed1d4  temporarily ignoring permisssions values
88ed1d4 is described below

commit 88ed1d47d716ef1f03e9f30f4bd8f86323aa8461
Author: MS <ms@taler.net>
AuthorDate: Thu May 28 17:49:53 2020 +0200

    temporarily ignoring permisssions values
---
 nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt   | 10 +---------
 nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt |  2 +-
 nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt | 10 ++++++----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
index 91ae611..0d45cd9 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
@@ -276,10 +276,6 @@ object FacadesTable : IdTable<String>() {
     val name = text("name")
     val type = text("type")
     val creator = reference("creator", NexusUsersTable)
-    val bankAccountsRead = text("bankAccountsRead")
-    val bankAccountsWrite = text("bankAccountsWrite")
-    val bankConnectionsRead = text("bankConnectionsRead")
-    val bankConnectionsWrite = text("bankConnectionsWrite")
     val config = reference("config", TalerFacadeConfigsTable) // see #6266
 }
 
@@ -288,11 +284,7 @@ class FacadeEntity(id: EntityID<String>) : 
Entity<String>(id) {
     var name by FacadesTable.name
     var type by FacadesTable.type
     var creator by NexusUserEntity referencedOn FacadesTable.creator
-    var bankAccountsRead by FacadesTable.bankAccountsRead
-    var bankAccountsWrite by FacadesTable.bankAccountsWrite
-    var bankConnectionsRead by FacadesTable.bankConnectionsRead
-    var bankConnectionsWrite by FacadesTable.bankConnectionsWrite
-    var config by FacadesTable.config
+    var config by TalerFacadeConfigEntity referencedOn FacadesTable.config
 }
 
 object TalerFacadeConfigsTable : IntIdTable() {
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt
index 7572165..8c7f399 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/JSON.kt
@@ -267,7 +267,7 @@ data class FacadeInfo(
 data class TalerWireGatewayFacadeConfig(
     val bankAccount: String,
     val bankConnection: String,
-    val reserveTransferLevel: MutableList<String> = mutableListOf(),
+    val reserveTransferLevel: String,
     val intervalIncremental: String
 )
 
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index 89d0fbf..b28e751 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -952,10 +952,12 @@ fun serverMain(dbName: String) {
                     FacadeEntity.new(body.name) {
                         type = body.type
                         creator = user
-                        bankAccountsRead = 
body.bankAccountsRead.joinToString("|")
-                        bankAccountsWrite = 
body.bankAccountsWrite.joinToString("|")
-                        bankConnectionsRead = 
body.bankConnectionsRead.joinToString("|")
-                        bankConnectionsWrite = 
body.bankConnectionsWrite.joinToString("|")
+                        config = TalerFacadeConfigEntity.new {
+                            bankAccount = body.config.bankAccount
+                            bankConnection = body.config.bankConnection
+                            intervalIncrement = body.config.intervalIncremental
+                            reserveTransferLevel = 
body.config.reserveTransferLevel
+                        }
                     }
                 }
                 call.respondText("Facade created")

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