diff options
author | MS <ms@taler.net> | 2020-06-16 15:04:21 +0200 |
---|---|---|
committer | MS <ms@taler.net> | 2020-06-16 15:04:21 +0200 |
commit | 7abbdf16022f06178d4acd5c6142198a6e958c01 (patch) | |
tree | 17ec1a5c401c5dae90b72a1eebb4cf2688247284 /nexus/src/main/kotlin/tech | |
parent | a943fff1e085c96ebb26d1a796eb7815b656d2f6 (diff) | |
download | libeufin-7abbdf16022f06178d4acd5c6142198a6e958c01.tar.gz libeufin-7abbdf16022f06178d4acd5c6142198a6e958c01.tar.bz2 libeufin-7abbdf16022f06178d4acd5c6142198a6e958c01.zip |
fix FTBFS
Diffstat (limited to 'nexus/src/main/kotlin/tech')
-rw-r--r-- | nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt | 8 | ||||
-rw-r--r-- | nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt | 10 | ||||
-rw-r--r-- | nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt index 2bd40e5f..304b6ebe 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt @@ -64,7 +64,7 @@ object TalerRequestedPayments : LongIdTable() { class TalerRequestedPaymentEntity(id: EntityID<Long>) : LongEntity(id) { companion object : LongEntityClass<TalerRequestedPaymentEntity>(TalerRequestedPayments) - var preparedPayment by InitiatedPaymentEntry referencedOn TalerRequestedPayments.preparedPayment + var preparedPayment by InitiatedPaymentEntity referencedOn TalerRequestedPayments.preparedPayment var requestUId by TalerRequestedPayments.requestUId var amount by TalerRequestedPayments.amount var exchangeBaseUrl by TalerRequestedPayments.exchangeBaseUrl @@ -182,7 +182,7 @@ object InitiatedPaymentsTable : LongIdTable() { val sum = amount("sum") val currency = varchar("currency", length = 3).default("EUR") val endToEndId = long("EndToEndId") - val subject = text("subject") + val subject = text("subject") val creditorIban = text("creditorIban") val creditorBic = text("creditorBic") val creditorName = text("creditorName") @@ -192,8 +192,8 @@ object InitiatedPaymentsTable : LongIdTable() { val submitted = bool("submitted").default(false) } -class InitiatedPaymentEntry(id: EntityID<Long>) : LongEntity(id) { - companion object : LongEntityClass<InitiatedPaymentEntry>(InitiatedPaymentsTable) +class InitiatedPaymentEntity(id: EntityID<Long>) : LongEntity(id) { + companion object : LongEntityClass<InitiatedPaymentEntity>(InitiatedPaymentsTable) var preparationDate by InitiatedPaymentsTable.preparationDate var submissionDate by InitiatedPaymentsTable.submissionDate var sum by InitiatedPaymentsTable.sum diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt index 1f5473f4..6aeb526d 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt @@ -183,7 +183,7 @@ fun ingestBankMessagesIntoAccount( * Create a PAIN.001 XML document according to the input data. * Needs to be called within a transaction block. */ -fun createPain001document(paymentData: PreparedPaymentEntity): String { +fun createPain001document(paymentData: InitiatedPaymentEntity): String { /** * Every PAIN.001 document contains at least three IDs: * @@ -310,9 +310,9 @@ fun createPain001document(paymentData: PreparedPaymentEntity): String { * Retrieve prepared payment from database, raising exception * if not found. */ -fun getPreparedPayment(uuid: Long): PreparedPaymentEntity { +fun getPreparedPayment(uuid: Long): InitiatedPaymentEntity { return transaction { - PreparedPaymentEntity.findById(uuid) + InitiatedPaymentEntity.findById(uuid) } ?: throw NexusError( HttpStatusCode.NotFound, "Payment '$uuid' not found" @@ -327,9 +327,9 @@ fun getPreparedPayment(uuid: Long): PreparedPaymentEntity { * it will be the account whose money will pay the wire transfer being defined * by this pain document. */ -fun addPreparedPayment(paymentData: Pain001Data, debitorAccount: NexusBankAccountEntity): PreparedPaymentEntity { +fun addPreparedPayment(paymentData: Pain001Data, debitorAccount: NexusBankAccountEntity): InitiatedPaymentEntity { return transaction { - PreparedPaymentEntity.new { + InitiatedPaymentEntity.new { subject = paymentData.subject sum = paymentData.sum debitorIban = debitorAccount.iban diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt index f09a332c..9e78f33c 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/taler.kt @@ -409,9 +409,9 @@ suspend fun submitPreparedPaymentsViaEbics() { HttpStatusCode.InternalServerError, "Bank account '${it.bankAccount}' not found for facade '${it.id.value}'" ) - PreparedPaymentEntity.find { - PreparedPaymentsTable.debitorIban eq bankAccount.iban and - not(PreparedPaymentsTable.submitted) + InitiatedPaymentEntity.find { + InitiatedPaymentsTable.debitorIban eq bankAccount.iban and + not(InitiatedPaymentsTable.submitted) }.forEach { val pain001document = createPain001document(it) logger.debug("Preparing payment: ${pain001document}") |