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

Implemented storing when account transactions have been retrieved for last time and retrieving next transactions from this date on

This commit is contained in:
dankito 2020-05-20 20:40:29 +02:00
parent 419e97d138
commit 96454a742d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccount.kt
View File

@ -16,6 +16,7 @@ open class BankAccount @JvmOverloads constructor(
var balance: BigDecimal = BigDecimal.ZERO, var balance: BigDecimal = BigDecimal.ZERO,
var currency: String = "EUR", var currency: String = "EUR",
var type: BankAccountType = BankAccountType.Girokonto, var type: BankAccountType = BankAccountType.Girokonto,
var lastRetrievedTransactionsTimestamp: Date? = null,
var supportsRetrievingAccountTransactions: Boolean = false, var supportsRetrievingAccountTransactions: Boolean = false,
var supportsRetrievingBalance: Boolean = false, var supportsRetrievingBalance: Boolean = false,
var supportsTransferringMoney: Boolean = false, var supportsTransferringMoney: Boolean = false,

17
ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/presenter/BankingPresenter.kt
View File

@ -26,7 +26,6 @@ import java.io.File
import java.io.FileOutputStream import java.io.FileOutputStream
import java.math.BigDecimal import java.math.BigDecimal
import java.net.URL import java.net.URL
import java.net.URLEncoder
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
@ -145,6 +144,8 @@ open class BankingPresenter(
val newClient = bankingClientCreator.createClient(bankInfo, customerId, pin, databaseFolder, threadPool, this.callback) val newClient = bankingClientCreator.createClient(bankInfo, customerId, pin, databaseFolder, threadPool, this.callback)
val startDate = Date()
newClient.addAccountAsync { response -> newClient.addAccountAsync { response ->
val account = response.account val account = response.account
@ -159,7 +160,7 @@ open class BankingPresenter(
if (response.supportsRetrievingTransactionsOfLast90DaysWithoutTan) { if (response.supportsRetrievingTransactionsOfLast90DaysWithoutTan) {
response.bookedTransactions.keys.forEach { bankAccount -> response.bookedTransactions.keys.forEach { bankAccount ->
retrievedAccountTransactions(bankAccount, response) retrievedAccountTransactions(bankAccount, startDate, response)
} }
} }
@ -265,9 +266,11 @@ open class BankingPresenter(
callback: (GetTransactionsResponse) -> Unit) { callback: (GetTransactionsResponse) -> Unit) {
getClientForAccount(bankAccount.account)?.let { client -> getClientForAccount(bankAccount.account)?.let { client ->
val startDate = Date()
client.getTransactionsAsync(bankAccount, net.dankito.banking.ui.model.parameters.GetTransactionsParameter(true, fromDate)) { response -> client.getTransactionsAsync(bankAccount, net.dankito.banking.ui.model.parameters.GetTransactionsParameter(true, fromDate)) { response ->
retrievedAccountTransactions(bankAccount, response) retrievedAccountTransactions(bankAccount, startDate, response)
callback(response) callback(response)
} }
@ -278,9 +281,7 @@ open class BankingPresenter(
clientsForAccounts.keys.forEach { account -> clientsForAccounts.keys.forEach { account ->
account.bankAccounts.forEach { bankAccount -> account.bankAccounts.forEach { bankAccount ->
if (bankAccount.supportsRetrievingAccountTransactions) { if (bankAccount.supportsRetrievingAccountTransactions) {
val today = Date() // TODO: still don't know where this bug is coming from that bank returns a transaction dated at end of year val fromDate = bankAccount.lastRetrievedTransactionsTimestamp?.let { Date(it.time - OneDayMillis) } // one day before last received transactions
val lastRetrievedTransactionDate = bankAccount.bookedTransactions.firstOrNull { it.bookingDate <= today }?.bookingDate
val fromDate = lastRetrievedTransactionDate?.let { Date(it.time - OneDayMillis) } // one day before last received transaction
fetchAccountTransactionsAsync(bankAccount, fromDate, callback) fetchAccountTransactionsAsync(bankAccount, fromDate, callback)
} }
@ -288,8 +289,10 @@ open class BankingPresenter(
} }
} }
protected open fun retrievedAccountTransactions(bankAccount: BankAccount, response: GetTransactionsResponse) { protected open fun retrievedAccountTransactions(bankAccount: BankAccount, startDate: Date, response: GetTransactionsResponse) {
if (response.isSuccessful) { if (response.isSuccessful) {
bankAccount.lastRetrievedTransactionsTimestamp = startDate
updateAccountTransactionsAndBalances(bankAccount, response) updateAccountTransactionsAndBalances(bankAccount, response)
} }