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

Fixed using already mapped TAN procedures and media instead of creating a new one each time leading to duplicates in db

This commit is contained in:
dankito 2020-09-16 15:15:25 +02:00
parent 28537668ff
commit ef70e9a697
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/RoomBankingPersistence.kt
View File

@ -2,6 +2,7 @@ package net.dankito.banking.persistence
import android.content.Context
import androidx.room.Room
import net.dankito.banking.persistence.dao.BaseDao
import net.dankito.banking.persistence.dao.saveOrUpdate
import net.dankito.banking.persistence.model.*
import net.dankito.banking.search.IRemitteeSearcher
@ -36,12 +37,22 @@ open class RoomBankingPersistence(applicationContext: Context) : IBankingPersist
// TODO: in this way removed TAN procedures won't be deleted from DB and therefore still be visible to user
val tanProcedures = bank.supportedTanProcedures.filterIsInstance<TanProcedure>()
tanProcedures.forEach { it.bankId = bank.id }
db.tanProcedureDao().saveOrUpdate(tanProcedures)
tanProcedures.forEach { tanProcedure ->
if (tanProcedure.bankId == BaseDao.ObjectNotInsertedId) {
tanProcedure.bankId = bank.id
db.tanProcedureDao().insert(tanProcedure)
}
else {
db.tanProcedureDao().update(tanProcedure)
}
}
// TODO: in this way removed TAN procedures won't be deleted from DB and therefore still be visible to user
val tanMedia = bank.tanMedia.map { map(bank, it) }
val tanMedia = bank.tanMedia.map { tanMedium ->
bank.tanMediumEntities.firstOrNull { it.id == tanMedium.technicalId } ?: map(bank, tanMedium)
}
db.tanMediumDao().saveOrUpdate(tanMedia)
bank.tanMediumEntities = tanMedia
}
}
@ -85,7 +96,8 @@ open class RoomBankingPersistence(applicationContext: Context) : IBankingPersist
bank.supportedTanProcedures = tanProcedures.filter { it.bankId == bank.id }
bank.selectedTanProcedure = bank.supportedTanProcedures.firstOrNull { it.technicalId == bank.selectedTanProcedureId }
bank.tanMedia = tanMedia.filter { it.bankId == bank.id }.map { map(it) }
bank.tanMediumEntities = tanMedia.filter { it.bankId == bank.id }
bank.tanMedia = bank.tanMediumEntities.map { map(it) }
}
return banks

3
persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/Bank.kt
View File

@ -47,6 +47,9 @@ open class Bank(
open var selectedTanProcedureId: String? = null
@Ignore
open var tanMediumEntities = listOf<net.dankito.banking.persistence.model.TanMedium>()
override fun toString(): String {
return stringRepresentation