libeufin

commit 45147878c2d1dcb3a9b9e5237d7565b67db6f403
parent 2a45c348a3506259e835bd0877fad9c3c5f55c4a
Author: MS <ms@taler.net>
Date:   Fri, 20 Jan 2023 16:38:32 +0100

revert name change to match the docs

Diffstat:
M
nexus/src/test/kotlin/SandboxCircuitApiTest.kt
 | 
6
+-----
M
sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt
 | 
15
+++++++--------
M
sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt
 | 
6
+++---

3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/nexus/src/test/kotlin/SandboxCircuitApiTest.kt b/nexus/src/test/kotlin/SandboxCircuitApiTest.kt
@@ -1,15 +1,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.ktor.client.plugins.*
-import io.ktor.client.plugins.auth.*
-import io.ktor.client.plugins.auth.providers.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
-import io.ktor.util.*
 import kotlinx.coroutines.runBlocking
 import org.jetbrains.exposed.sql.transactions.transaction
-import org.junit.Ignore
 import org.junit.Test
 import tech.libeufin.sandbox.*
 import java.io.File
@@ -101,7 +97,7 @@ class SandboxCircuitApiTest {
                         creationTime = 0L
                         tanChannel = SupportedTanChannels.FILE // change type to enum?
                         account = "unused"
-                        state = CashoutOperationState.PENDING
+                        status = CashoutOperationStatus.PENDING
                     }
                 }
                 R = client.get("/demobanks/default/circuit-api/cashouts") {
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt
@@ -6,7 +6,6 @@ import io.ktor.http.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import io.netty.handler.codec.http.HttpResponseStatus
 import org.jetbrains.exposed.sql.transactions.transaction
 import tech.libeufin.sandbox.CashoutOperationsTable.uuid
 import tech.libeufin.util.*
@@ -87,7 +86,7 @@ data class CircuitAccountInfo(
 )
 
 data class CashoutOperationInfo(
-    val state: CashoutOperationState,
+    val status: CashoutOperationStatus,
     val amount_credit: String,
     val amount_debit: String,
     val subject: String,
@@ -198,13 +197,13 @@ fun circuitApi(circuitRoute: Route) {
         }
         if (maybeOperation == null)
             throw notFound("Cash-out operation $uuid not found.")
-        if (maybeOperation.state == CashoutOperationState.CONFIRMED)
+        if (maybeOperation.status == CashoutOperationStatus.CONFIRMED)
             throw SandboxError(
                 HttpStatusCode.PreconditionFailed,
                 "Cash-out operation '$uuid' was confirmed already."
             )
-        if (maybeOperation.state != CashoutOperationState.PENDING)
-            throw internalServerError("Found an unsupported cash-out operation state: ${maybeOperation.state}")
+        if (maybeOperation.status != CashoutOperationStatus.PENDING)
+            throw internalServerError("Found an unsupported cash-out operation state: ${maybeOperation.status}")
         // Operation found and pending: delete from the database.
         transaction { maybeOperation.delete() }
         call.respond(HttpStatusCode.NoContent)
@@ -227,7 +226,7 @@ fun circuitApi(circuitRoute: Route) {
         if (op == null)
             throw notFound("Cash-out operation $operationUuid not found")
         // 412 if the operation got already confirmed.
-        if (op.state == CashoutOperationState.CONFIRMED)
+        if (op.status == CashoutOperationStatus.CONFIRMED)
             throw SandboxError(
                 HttpStatusCode.PreconditionFailed,
                 "Cash-out operation $operationUuid was already confirmed."
@@ -259,7 +258,7 @@ fun circuitApi(circuitRoute: Route) {
                 subject = op.subject,
                 amount = op.amountDebit
             )
-            op.state = CashoutOperationState.CONFIRMED
+            op.status = CashoutOperationStatus.CONFIRMED
             op.confirmationTime = getUTCnow().toInstant().toEpochMilli()
         }
         call.respond(HttpStatusCode.NoContent)
@@ -281,7 +280,7 @@ fun circuitApi(circuitRoute: Route) {
             amount_credit = maybeOperation.amountCredit,
             amount_debit = maybeOperation.amountDebit,
             subject = maybeOperation.subject,
-            state = maybeOperation.state,
+            status = maybeOperation.status,
             creation_time = maybeOperation.creationTime,
             confirmation_time = maybeOperation.confirmationTime,
             tan_channel = maybeOperation.tanChannel,
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt
@@ -431,7 +431,7 @@ class BankAccountStatementEntity(id: EntityID<Int>) : IntEntity(id) {
     var balanceClbd by BankAccountStatementsTable.balanceClbd
 }
 
-enum class CashoutOperationState { CONFIRMED, PENDING }
+enum class CashoutOperationStatus { CONFIRMED, PENDING }
 object CashoutOperationsTable : LongIdTable() {
     val uuid = uuid("uuid").autoGenerate()
     /**
@@ -447,7 +447,7 @@ object CashoutOperationsTable : LongIdTable() {
     val tanChannel = enumeration("tanChannel", SupportedTanChannels::class)
     val account = text("account")
     val tan = text("tan")
-    val state = enumeration("state", CashoutOperationState::class).default(CashoutOperationState.PENDING)
+    val status = enumeration("status", CashoutOperationStatus::class).default(CashoutOperationStatus.PENDING)
 }
 
 class CashoutOperationEntity(id: EntityID<Long>) : LongEntity(id) {
@@ -461,7 +461,7 @@ class CashoutOperationEntity(id: EntityID<Long>) : LongEntity(id) {
     var tanChannel by CashoutOperationsTable.tanChannel
     var account by CashoutOperationsTable.account
     var tan by CashoutOperationsTable.tan
-    var state by CashoutOperationsTable.state
+    var status by CashoutOperationsTable.status
 }
 object TalerWithdrawalsTable : LongIdTable() {
     val wopid = uuid("wopid").autoGenerate()