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

Fixed that CoreData didn't keep accounts order

This commit is contained in:
dankito 2020-08-08 18:17:16 +02:00
parent 820e271d1f
commit 8aa38008d4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift
View File

@ -18,7 +18,7 @@ class Mapper {
func map(_ customer: PersistedCustomer) -> Customer { func map(_ customer: PersistedCustomer) -> Customer {
let mapped = Customer(bankCode: map(customer.bankCode), customerId: map(customer.customerId), password: map(customer.password), finTsServerAddress: map(customer.finTsServerAddress), bankName: map(customer.bankName), bic: map(customer.bic), customerName: map(customer.customerName), userId: map(customer.userId), iconUrl: customer.iconUrl, accounts: []) let mapped = Customer(bankCode: map(customer.bankCode), customerId: map(customer.customerId), password: map(customer.password), finTsServerAddress: map(customer.finTsServerAddress), bankName: map(customer.bankName), bic: map(customer.bic), customerName: map(customer.customerName), userId: map(customer.userId), iconUrl: customer.iconUrl, accounts: [])
mapped.accounts = map(mapped, customer.accounts as? Set<PersistedBankAccount>) mapped.accounts = map(mapped, customer.accounts?.array as? [PersistedBankAccount])
mappedBanks[mapped] = customer mappedBanks[mapped] = customer
@ -41,7 +41,7 @@ class Mapper {
mapped.userId = customer.userId mapped.userId = customer.userId
mapped.iconUrl = customer.iconUrl mapped.iconUrl = customer.iconUrl
mapped.accounts = NSSet(array: map(mapped, customer.accounts, context)) mapped.accounts = NSOrderedSet(array: map(mapped, customer.accounts, context))
mappedBanks[customer] = mapped mappedBanks[customer] = mapped
@ -52,7 +52,7 @@ class Mapper {
} }
func map(_ customer: Customer, _ accounts: Set<PersistedBankAccount>?) -> [BankAccount] { func map(_ customer: Customer, _ accounts: [PersistedBankAccount]?) -> [BankAccount] {
return accounts?.map( { map(customer, $0) } ) ?? [] return accounts?.map( { map(customer, $0) } ) ?? []
} }