libeufin

commit 939de8fbe7434c3f0bb045205eeab5dbf1720710
parent d3d3a521b9b5af7f4279d368e51c0cd8c4bf5781
Author: MS <ms@taler.net>
Date:   Tue, 16 Jun 2020 14:26:34 +0200

prefer IS020022 terminology

'prepared' payments become 'initiated' payments

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
 | 
38
+++++++++++++++++++-------------------

1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
@@ -41,7 +41,7 @@ import java.sql.Connection
  * in the PAIN-table.
  */
 object TalerRequestedPayments : LongIdTable() {
-    val preparedPayment = reference("payment", PreparedPaymentsTable)
+    val preparedPayment = reference("payment", InitiatedPaymentsTable)
     val requestUId = text("request_uid")
 
     /**
@@ -64,7 +64,7 @@ object TalerRequestedPayments : LongIdTable() {
 class TalerRequestedPaymentEntity(id: EntityID<Long>) : LongEntity(id) {
     companion object : LongEntityClass<TalerRequestedPaymentEntity>(TalerRequestedPayments)
 
-    var preparedPayment by PreparedPaymentEntity referencedOn TalerRequestedPayments.preparedPayment
+    var preparedPayment by InitiatedPaymentEntry referencedOn TalerRequestedPayments.preparedPayment
     var requestUId by TalerRequestedPayments.requestUId
     var amount by TalerRequestedPayments.amount
     var exchangeBaseUrl by TalerRequestedPayments.exchangeBaseUrl
@@ -170,7 +170,7 @@ class RawBankTransactionEntity(id: EntityID<Long>) : LongEntity(id) {
 /**
  * Represents a prepared payment.
  */
-object PreparedPaymentsTable : LongIdTable() {
+object InitiatedPaymentsTable : LongIdTable() {
     val preparationDate = long("preparationDate")
     val submissionDate = long("submissionDate").nullable()
     val sum = amount("sum")
@@ -186,21 +186,21 @@ object PreparedPaymentsTable : LongIdTable() {
     val submitted = bool("submitted").default(false)
 }
 
-class PreparedPaymentEntity(id: EntityID<Long>) : LongEntity(id) {
-    companion object : LongEntityClass<PreparedPaymentEntity>(PreparedPaymentsTable)
-    var preparationDate by PreparedPaymentsTable.preparationDate
-    var submissionDate by PreparedPaymentsTable.submissionDate
-    var sum by PreparedPaymentsTable.sum
-    var currency by PreparedPaymentsTable.currency
-    var debitorIban by PreparedPaymentsTable.debitorIban
-    var debitorBic by PreparedPaymentsTable.debitorBic
-    var debitorName by PreparedPaymentsTable.debitorName
-    var endToEndId by PreparedPaymentsTable.endToEndId
-    var subject by PreparedPaymentsTable.subject
-    var creditorIban by PreparedPaymentsTable.creditorIban
-    var creditorBic by PreparedPaymentsTable.creditorBic
-    var creditorName by PreparedPaymentsTable.creditorName
-    var submitted by PreparedPaymentsTable.submitted
+class InitiatedPaymentEntry(id: EntityID<Long>) : LongEntity(id) {
+    companion object : LongEntityClass<InitiatedPaymentEntry>(InitiatedPaymentsTable)
+    var preparationDate by InitiatedPaymentsTable.preparationDate
+    var submissionDate by InitiatedPaymentsTable.submissionDate
+    var sum by InitiatedPaymentsTable.sum
+    var currency by InitiatedPaymentsTable.currency
+    var debitorIban by InitiatedPaymentsTable.debitorIban
+    var debitorBic by InitiatedPaymentsTable.debitorBic
+    var debitorName by InitiatedPaymentsTable.debitorName
+    var endToEndId by InitiatedPaymentsTable.endToEndId
+    var subject by InitiatedPaymentsTable.subject
+    var creditorIban by InitiatedPaymentsTable.creditorIban
+    var creditorBic by InitiatedPaymentsTable.creditorBic
+    var creditorName by InitiatedPaymentsTable.creditorName
+    var submitted by InitiatedPaymentsTable.submitted
 }
 
 /**
@@ -332,7 +332,7 @@ fun dbCreateTables(dbName: String) {
         addLogger(StdOutSqlLogger)
         SchemaUtils.create(
             NexusUsersTable,
-            PreparedPaymentsTable,
+            InitiatedPaymentsTable,
             EbicsSubscribersTable,
             NexusBankAccountsTable,
             RawBankTransactionsTable,