commit d15577e374f2752e27bc44887b28ccda960777a8
parent a15a8e31217b96bed6b3d3cb8e4ba16030aac003
Author: MS <ms@taler.net>
Date: Tue, 31 Jan 2023 17:20:28 +0100
indentation, comments
Diffstat:
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
@@ -380,9 +380,7 @@ object FacadesTable : LongIdTable() {
val facadeName = text("facadeName")
val type = text("type")
val creator = reference("creator", NexusUsersTable)
- init {
- uniqueIndex(facadeName)
- }
+ init { uniqueIndex(facadeName) }
}
class FacadeEntity(id: EntityID<Long>) : LongEntity(id) {
@@ -402,9 +400,7 @@ object FacadeStateTable : LongIdTable() {
val bankConnection = text("bankConnection")
val currency = text("currency")
- /**
- * "statement", "report", "notification"
- **/
+ // "statement", "report", "notification"
val reserveTransferLevel = text("reserveTransferLevel")
val facade = reference("facade", FacadesTable)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/FacadeUtil.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/FacadeUtil.kt
@@ -72,7 +72,10 @@ fun ingestFacadeTransactions(
when (tx.creditDebitIndicator) {
CreditDebitIndicator.CRDT -> {
if (incomingFilterCb != null) {
- incomingFilterCb(it, details)
+ incomingFilterCb(
+ it, // payment DB object
+ details // wire transfer details
+ )
}
}
else -> Unit
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Taler.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Taler.kt
@@ -237,7 +237,10 @@ private suspend fun talerTransfer(call: ApplicationCall) {
)
}
-fun talerFilter(payment: NexusBankTransactionEntity, txDtls: TransactionDetails) {
+fun talerFilter(
+ payment: NexusBankTransactionEntity,
+ txDtls: TransactionDetails
+) {
var isInvalid = false // True when pub is invalid or duplicate.
val subject = txDtls.unstructuredRemittanceInformation
val debtorName = txDtls.debtor?.name
@@ -366,8 +369,7 @@ fun maybeTalerRefunds(bankAccount: NexusBankAccountEntity, lastSeenId: Long) {
it[NexusBankTransactionsTable.bankAccount] == bankAccount.id,
"Cannot refund a _outgoing_ payment!"
)
- // FIXME: the amount to refund should be reduced, according to the bounce fee
- // see bug #7116.
+ // FIXME #7116
addPaymentInitiation(
Pain001Data(
creditorIban = debtorAccount.iban,