Fix naming inconsistency.

"admin" is both the aministrator username
and the bank's main account label.  The latter
was "bank".

4 files changed, 50 insertions, 34 deletions

diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt
index b8ead240..b0271e85 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt
@@ -378,14 +378,8 @@ object BankAccountsTable : IntIdTable() {
     val label = text("label").uniqueIndex("accountLabelIndex")
     /**
      * This field is the username of the customer that owns the
-     * bank account.  Some actors do not have a customer registered,
-     * but they can still specify their "username" - merely a label
-     * that identifies their operations - to this field.
-     *
-     * Two examples of such actors are: "admin" and "bank".  Note:
-     * "admin" cannot act as the bank, because it participates in
-     * tests and therefore should not have its balance affected by
-     * awarding sign-up bonuses.
+     * bank account.  Admin is the only exception: that can specify
+     * this field as "admin" although no customer backs it.
      */
     val owner = text("owner")
     val isPublic = bool("isPublic").default(false)
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Helpers.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Helpers.kt
index 3458270a..ffaab312 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Helpers.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Helpers.kt
@@ -26,8 +26,6 @@ import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.transactions.transaction
 import tech.libeufin.util.*
-import java.awt.Label
-import java.math.BigDecimal
 import java.security.interfaces.RSAPublicKey
 import java.util.*
 import java.util.zip.DeflaterInputStream
@@ -166,19 +164,23 @@ fun getCustomer(username: String): DemobankCustomerEntity {
 }
 
 /**
- * Get person name from a customer's username.
+ * Get person name from a customer's username, or throw
+ * exception if not found.
  */
-fun getPersonNameFromCustomer(ownerUsername: String): String {
-    return when (ownerUsername) {
-        "admin" -> "admin" // Could be changed to Admin, or some different value.
-        "bank" -> "The Bank"
+fun getPersonNameFromCustomer(customerUsername: String): String {
+    return when (customerUsername) {
+        "admin" -> "Admin"
         else -> transaction {
             val ownerCustomer = DemobankCustomerEntity.find(
-                DemobankCustomersTable.username eq ownerUsername
-            ).firstOrNull() ?: throw SandboxError(
-                HttpStatusCode.InternalServerError,
-                "'$ownerUsername' not a customer."
-            )
+                DemobankCustomersTable.username eq customerUsername
+            ).firstOrNull() ?: run {
+                logger.error("Customer '${customerUsername}' not found, couldn't get their name.")
+                throw SandboxError(
+                    HttpStatusCode.InternalServerError,
+                    "'$customerUsername' not a customer."
+                )
+
+            }
             ownerCustomer.name ?: "Never given."
         }
     }
@@ -227,17 +229,26 @@ fun getBankAccountFromIban(iban: String): BankAccountEntity {
     )
 }
 
+fun getBankAccountFromLabel(label: String, demobank: String = "default"): BankAccountEntity {
+    val maybeDemobank = getDemobank(demobank)
+    if (maybeDemobank == null) {
+        logger.error("Demobank '$demobank' not found")
+        throw SandboxError(
+            HttpStatusCode.NotFound,
+            "Demobank '$demobank' not found"
+        )
+    }
+    return getBankAccountFromLabel(label, maybeDemobank)
+}
 fun getBankAccountFromLabel(label: String,
                             demobank: DemobankConfigEntity
 ): BankAccountEntity {
-    var labelCheck = label;
-    /**
-     * Admin is the only exception to the "username == bank account label" rule.
-     * Consider calling the default demobank's bank account directly "admin"?
-     */
-    if (label == "admin") labelCheck = "bank"
     return transaction {
-        BankAccountEntity.find(BankAccountsTable.label eq labelCheck and (BankAccountsTable.demoBank eq demobank.id)).firstOrNull() ?: throw SandboxError(
+        BankAccountEntity.find(
+            BankAccountsTable.label eq label and (
+                    BankAccountsTable.demoBank eq demobank.id
+                    )
+        ).firstOrNull() ?: throw SandboxError(
             HttpStatusCode.NotFound,
             "Did not find a bank account for label $label"
         )
@@ -255,7 +266,7 @@ fun getBankAccountFromSubscriber(subscriber: EbicsSubscriberEntity): BankAccount
 
 fun BankAccountEntity.bonus(amount: String) {
     wireTransfer(
-        "bank",
+        "admin",
         this.label,
         this.demoBank.name,
         "Sign-up bonus",
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
index 7887d989..447aa0b5 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
@@ -151,7 +151,9 @@ class Config : CliktCommand(
         execThrowableOrTerminate {
             dbCreateTables(dbConnString)
             transaction {
-                val maybeDemobank = BankAccountEntity.find(BankAccountsTable.label eq "bank").firstOrNull()
+                val maybeDemobank = BankAccountEntity.find(
+                    BankAccountsTable.label eq "admin"
+                ).firstOrNull()
                 if (showOption) {
                     if (maybeDemobank != null) {
                         val ret = ObjectMapper()
@@ -184,8 +186,8 @@ class Config : CliktCommand(
                     }
                     BankAccountEntity.new {
                         iban = getIban()
-                        label = "bank"
-                        owner = "bank" // Not backed by an actual customer object.
+                        label = "admin"
+                        owner = "admin" // Not backed by an actual customer object.
                         // For now, the model assumes always one demobank
                         this.demoBank = demoBank
                     }
@@ -682,7 +684,7 @@ val sandboxApp: Application.() -> Unit = {
         }
 
         // Book one incoming payment for the requesting account.
-        // The debtor is not required to have an account at this Sandbox.
+        // The debtor is not required to have a customer account at this Sandbox.
         post("/admin/bank-accounts/{label}/simulate-incoming-transaction") {
             call.request.basicAuth(onlyAdmin = true)
             val body = call.receiveJson<IncomingPaymentInfo>()
@@ -1396,7 +1398,10 @@ val sandboxApp: Application.() -> Unit = {
                         val paytoUri = buildIbanPaytoUri(
                             iban = bankAccount.iban,
                             bic = bankAccount.bic,
-                            receiverName = getPersonNameFromCustomer(username ?: "Not given.")
+                            // username 'null' should only happen when auth is disabled.
+                            receiverName = getPersonNameFromCustomer(
+                                username ?: "Not given."
+                            )
                         )
                         val iban = bankAccount.iban
                     })
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt
index 74b2b75c..1705292c 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt
@@ -60,6 +60,12 @@ fun getBalance(accountLabel: String, withPending: Boolean = false): BigDecimal {
     return getBalance(account, withPending)
 }
 
+/**
+ * 'debitAccount' and 'creditAccount' are customer usernames
+ * and ALSO labels of the bank accounts owned by them.  They are
+ * used to both resort a bank account and the legal name owning
+ * the bank accounts.
+ */
 fun wireTransfer(
     debitAccount: String,
     creditAccount: String,
@@ -108,7 +114,7 @@ fun wireTransfer(
         throw badRequest("Won't wire transfer with currency: ${checkAmount.currency}")
     // Check funds are sufficient.
     val pendingBalance = getBalance(debitAccount, withPending = true)
-    val maxDebt = if (debitAccount.label == "bank") {
+    val maxDebt = if (debitAccount.label == "admin") {
         demobank.bankDebtLimit
     } else demobank.usersDebtLimit
     if ((pendingBalance - checkAmount.amount).abs() > BigDecimal.valueOf(maxDebt.toLong())) {