codinux
/
BankingClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed order of BankAccount properties

This commit is contained in:
dankito 2024-09-05 22:25:30 +02:00
parent 9512db3402
commit 4c860e7b20
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/BankAccount.kt
View File

@ -7,20 +7,20 @@ import net.codinux.banking.client.model.config.NoArgConstructor
@NoArgConstructor @NoArgConstructor
open class BankAccount( open class BankAccount(
val identifier: String, val identifier: String,
val subAccountNumber: String? = null,
val iban: String? = null,
val productName: String? = null,
var accountHolderName: String, var accountHolderName: String,
val type: BankAccountType = BankAccountType.Other, val type: BankAccountType = BankAccountType.Other,
val iban: String? = null,
val subAccountNumber: String? = null,
val productName: String? = null,
val currency: String = "EUR", val currency: String = "EUR",
var accountLimit: String? = null, var accountLimit: String? = null,
// var balance: BigDecimal = BigDecimal.ZERO,
var balance: Amount = Amount.Zero, // TODO: add a BigDecimal library
val isAccountTypeSupportedByApplication: Boolean = false, val isAccountTypeSupportedByApplication: Boolean = false,
val features: Set<BankAccountFeatures> = emptySet(), val features: Set<BankAccountFeatures> = emptySet(),
// var balance: BigDecimal = BigDecimal.ZERO,
var balance: Amount = Amount.Zero, // TODO: add a BigDecimal library
val transactionsRetentionDays: Int? = null, val transactionsRetentionDays: Int? = null,
open var lastTransactionsRetrievalTime: Instant? = null, open var lastTransactionsRetrievalTime: Instant? = null,
var retrievedTransactionsFrom: LocalDate? = null, var retrievedTransactionsFrom: LocalDate? = null,

5
FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt
View File

@ -129,9 +129,10 @@ open class FinTs4kMapper {
protected open fun mapAccount(account: net.dankito.banking.client.model.BankAccount) = BankAccount( protected open fun mapAccount(account: net.dankito.banking.client.model.BankAccount) = BankAccount(
account.identifier, account.accountHolderName, mapAccountType(account.type), account.iban, account.subAccountNumber, account.identifier, account.subAccountNumber, account.iban, account.productName, account.accountHolderName,
account.productName, account.currency, account.accountLimit, mapAmount(account.balance), mapAccountType(account.type), account.currency, account.accountLimit,
account.isAccountTypeSupportedByApplication, mapFeatures(account), account.isAccountTypeSupportedByApplication, mapFeatures(account),
mapAmount(account.balance),
account.countDaysForWhichTransactionsAreKept, account.countDaysForWhichTransactionsAreKept,
account.lastTransactionsRetrievalTime, account.retrievedTransactionsFrom, account.lastTransactionsRetrievalTime, account.retrievedTransactionsFrom,
bookedTransactions = mapBookedTransactions(account).toMutableList() bookedTransactions = mapBookedTransactions(account).toMutableList()