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

Implemented saveing updated account properties in db after retrieving transactions

This commit is contained in:
dankito 2024-10-04 06:36:07 +02:00
parent 20fdc8dece
commit e4a8a79ee3
5 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BankingPersistence/src/commonMain/kotlin/net/codinux/banking/persistence/BankingRepository.kt
View File

@ -1,6 +1,9 @@
package net.codinux.banking.persistence package net.codinux.banking.persistence
import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDate
import net.codinux.banking.client.model.AccountTransaction import net.codinux.banking.client.model.AccountTransaction
import net.codinux.banking.client.model.Amount
import net.codinux.banking.client.model.BankAccess import net.codinux.banking.client.model.BankAccess
import net.codinux.banking.client.model.securitiesaccount.Holding import net.codinux.banking.client.model.securitiesaccount.Holding
import net.codinux.banking.persistence.entities.AccountTransactionEntity import net.codinux.banking.persistence.entities.AccountTransactionEntity
@ -30,6 +33,8 @@ interface BankingRepository {
suspend fun updateAccount(bank: BankAccountEntity, userSetDisplayName: String?, hideAccount: Boolean, includeInAutomaticAccountsUpdate: Boolean) suspend fun updateAccount(bank: BankAccountEntity, userSetDisplayName: String?, hideAccount: Boolean, includeInAutomaticAccountsUpdate: Boolean)
suspend fun updateAccount(account: BankAccountEntity, balance: Amount?, lastAccountUpdateTime: Instant, retrievedTransactionsFrom: LocalDate?)
suspend fun deleteBank(bank: BankAccessEntity) suspend fun deleteBank(bank: BankAccessEntity)

7
BankingPersistence/src/commonMain/kotlin/net/codinux/banking/persistence/InMemoryBankingRepository.kt
View File

@ -1,6 +1,9 @@
package net.codinux.banking.persistence package net.codinux.banking.persistence
import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDate
import net.codinux.banking.client.model.AccountTransaction import net.codinux.banking.client.model.AccountTransaction
import net.codinux.banking.client.model.Amount
import net.codinux.banking.client.model.BankAccess import net.codinux.banking.client.model.BankAccess
import net.codinux.banking.client.model.securitiesaccount.Holding import net.codinux.banking.client.model.securitiesaccount.Holding
import net.codinux.banking.persistence.entities.AccountTransactionEntity import net.codinux.banking.persistence.entities.AccountTransactionEntity
@ -56,6 +59,10 @@ class InMemoryBankingRepository(
// no-op // no-op
} }
override suspend fun updateAccount(account: BankAccountEntity, balance: Amount?, lastAccountUpdateTime: Instant, retrievedTransactionsFrom: LocalDate?) {
// no-op
}
override suspend fun deleteBank(bank: BankAccessEntity) { override suspend fun deleteBank(bank: BankAccessEntity) {
this.banks.remove(bank) this.banks.remove(bank)
} }

28
BankingPersistence/src/commonMain/kotlin/net/codinux/banking/persistence/SqliteBankingRepository.kt
View File

@ -141,18 +141,32 @@ open class SqliteBankingRepository : BankingRepository {
} }
} }
override suspend fun updateAccount(bank: BankAccountEntity, userSetDisplayName: String?, hideAccount: Boolean, includeInAutomaticAccountsUpdate: Boolean) { override suspend fun updateAccount(account: BankAccountEntity, userSetDisplayName: String?, hideAccount: Boolean, includeInAutomaticAccountsUpdate: Boolean) {
bankQueries.transaction { bankQueries.transaction {
if (bank.userSetDisplayName != userSetDisplayName) { if (account.userSetDisplayName != userSetDisplayName) {
bankQueries.updateBankAccountUserSetDisplayName(userSetDisplayName, bank.id) bankQueries.updateBankAccountUserSetDisplayName(userSetDisplayName, account.id)
} }
if (bank.hideAccount != hideAccount) { if (account.hideAccount != hideAccount) {
bankQueries.updateBankAccountHideAccount(hideAccount, bank.id) bankQueries.updateBankAccountHideAccount(hideAccount, account.id)
} }
if (bank.includeInAutomaticAccountsUpdate != includeInAutomaticAccountsUpdate) { if (account.includeInAutomaticAccountsUpdate != includeInAutomaticAccountsUpdate) {
bankQueries.updateBankAccountIncludeInAutomaticAccountsUpdate(includeInAutomaticAccountsUpdate, bank.id) bankQueries.updateBankAccountIncludeInAutomaticAccountsUpdate(includeInAutomaticAccountsUpdate, account.id)
}
}
}
override suspend fun updateAccount(account: BankAccountEntity, balance: Amount?, lastAccountUpdateTime: Instant, retrievedTransactionsFrom: LocalDate?) {
bankQueries.transaction {
if (balance != null && account.balance != balance) {
bankQueries.updateBankAccountBalance(mapAmount(balance), account.id)
}
bankQueries.updateBankAccountLastAccountUpdateTime(mapInstant(lastAccountUpdateTime), account.id)
if (retrievedTransactionsFrom != null && (account.retrievedTransactionsFrom == null || account.retrievedTransactionsFrom!! > retrievedTransactionsFrom)) {
bankQueries.updateBankAccountRetrievedTransactionsFrom(mapDate(retrievedTransactionsFrom), account.id)
} }
} }
} }

16
BankingPersistence/src/commonMain/sqldelight/net/codinux/banking/persistence/Bank.sq
View File

@ -187,6 +187,22 @@ SELECT BankAccount.*
FROM BankAccount; FROM BankAccount;
updateBankAccountBalance:
UPDATE BankAccount
SET balance = ?
WHERE id = ?;
updateBankAccountLastAccountUpdateTime:
UPDATE BankAccount
SET lastAccountUpdateTime = ?
WHERE id = ?;
updateBankAccountRetrievedTransactionsFrom:
UPDATE BankAccount
SET retrievedTransactionsFrom = ?
WHERE id = ?;
updateBankAccountUserSetDisplayName: updateBankAccountUserSetDisplayName:
UPDATE BankAccount UPDATE BankAccount
SET userSetDisplayName = ? SET userSetDisplayName = ?

4
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/service/BankingService.kt
View File

@ -275,7 +275,11 @@ class BankingService(
val transactionsViewModel = updateTransactionsInUi(newTransactionsEntities) val transactionsViewModel = updateTransactionsInUi(newTransactionsEntities)
uiState.dispatchNewTransactionsRetrieved(AccountTransactionsRetrievedEvent(bank, account, transactionsViewModel, response.holdings)) uiState.dispatchNewTransactionsRetrieved(AccountTransactionsRetrievedEvent(bank, account, transactionsViewModel, response.holdings))
bankingRepository.updateAccount(account, response.balance, response.transactionsRetrievalTime, response.retrievedTransactionsFrom)
} }
notifyBanksListUpdated() // notify about updated values like account balance
} catch (e: Throwable) { } catch (e: Throwable) {
log.error(e) { "Could not save updated account transactions for bank $bank" } log.error(e) { "Could not save updated account transactions for bank $bank" }
} }