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

Added error to BankingClientResponse

This commit is contained in:
dankl 2020-01-08 22:59:02 +01:00 committed by dankito
parent 9496836b76
commit 7fbd6159ac
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BankingUiCommon/src/main/java/net/dankito/banking/ui/model/responses/AddAccountResponse.kt
View File

@ -13,9 +13,10 @@ open class AddAccountResponse(
val supportsRetrievingTransactionsOfLast90DaysWithoutTan: Boolean = false, val supportsRetrievingTransactionsOfLast90DaysWithoutTan: Boolean = false,
bookedTransactionsOfLast90Days: Map<BankAccount, List<AccountTransaction>> = mapOf(), bookedTransactionsOfLast90Days: Map<BankAccount, List<AccountTransaction>> = mapOf(),
unbookedTransactionsOfLast90Days: Map<BankAccount, List<Any>> = mapOf(), unbookedTransactionsOfLast90Days: Map<BankAccount, List<Any>> = mapOf(),
balances: Map<BankAccount, BigDecimal> = mapOf() balances: Map<BankAccount, BigDecimal> = mapOf(),
error: Exception? = null
) )
: GetTransactionsResponse(isSuccessful, errorToShowToUser, bookedTransactionsOfLast90Days, unbookedTransactionsOfLast90Days, balances) { : GetTransactionsResponse(isSuccessful, errorToShowToUser, bookedTransactionsOfLast90Days, unbookedTransactionsOfLast90Days, balances, error) {
override fun toString(): String { override fun toString(): String {
return account.toString() + " " + super.toString() return account.toString() + " " + super.toString()

3
BankingUiCommon/src/main/java/net/dankito/banking/ui/model/responses/BankingClientResponse.kt
View File

@ -3,7 +3,8 @@ package net.dankito.banking.ui.model.responses
open class BankingClientResponse( open class BankingClientResponse(
val isSuccessful: Boolean, val isSuccessful: Boolean,
val errorToShowToUser: String? val errorToShowToUser: String?,
val error: Exception? = null
) { ) {

5
BankingUiCommon/src/main/java/net/dankito/banking/ui/model/responses/GetTransactionsResponse.kt
View File

@ -10,6 +10,7 @@ open class GetTransactionsResponse(
errorToShowToUser: String?, errorToShowToUser: String?,
val bookedTransactions: Map<BankAccount, List<AccountTransaction>> = mapOf(), val bookedTransactions: Map<BankAccount, List<AccountTransaction>> = mapOf(),
val unbookedTransactions: Map<BankAccount, List<Any>> = mapOf(), val unbookedTransactions: Map<BankAccount, List<Any>> = mapOf(),
val balances: Map<BankAccount, BigDecimal> = mapOf() val balances: Map<BankAccount, BigDecimal> = mapOf(),
error: Exception? = null
) )
: BankingClientResponse(isSuccessful, errorToShowToUser) : BankingClientResponse(isSuccessful, errorToShowToUser, error)

8
fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt
View File

@ -18,7 +18,7 @@ open class fints4javaModelMapper {
open fun mapResponse(response: FinTsClientResponse): BankingClientResponse { open fun mapResponse(response: FinTsClientResponse): BankingClientResponse {
return BankingClientResponse(response.isSuccessful, mapErrorToShowToUser(response)) return BankingClientResponse(response.isSuccessful, mapErrorToShowToUser(response), response.exception)
} }
open fun mapResponse(account: Account, response: net.dankito.fints.response.client.AddAccountResponse): AddAccountResponse { open fun mapResponse(account: Account, response: net.dankito.fints.response.client.AddAccountResponse): AddAccountResponse {
@ -34,7 +34,8 @@ open class fints4javaModelMapper {
account, response.supportsRetrievingTransactionsOfLast90DaysWithoutTan, account, response.supportsRetrievingTransactionsOfLast90DaysWithoutTan,
bookedTransactions, bookedTransactions,
mapOf(), // TODO: map unbooked transactions mapOf(), // TODO: map unbooked transactions
balances) balances,
response.exception)
} }
open fun mapResponse(bankAccount: BankAccount, response: net.dankito.fints.response.client.GetTransactionsResponse): GetTransactionsResponse { open fun mapResponse(bankAccount: BankAccount, response: net.dankito.fints.response.client.GetTransactionsResponse): GetTransactionsResponse {
@ -42,7 +43,8 @@ open class fints4javaModelMapper {
return GetTransactionsResponse(response.isSuccessful, mapErrorToShowToUser(response), return GetTransactionsResponse(response.isSuccessful, mapErrorToShowToUser(response),
mapOf(bankAccount to mapTransactions(bankAccount, response.bookedTransactions)), mapOf(bankAccount to mapTransactions(bankAccount, response.bookedTransactions)),
mapOf(), // TODO: map unbooked transactions mapOf(), // TODO: map unbooked transactions
response.balance?.let { mapOf(bankAccount to it) } ?: mapOf()) response.balance?.let { mapOf(bankAccount to it) } ?: mapOf(),
response.exception)
} }
open fun mapErrorToShowToUser(response: FinTsClientResponse): String? { open fun mapErrorToShowToUser(response: FinTsClientResponse): String? {