Skip to content
Snippets Groups Projects
Commit 8718aa66 authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Restore username from facts, not from params

parent 3b6d4db7
No related branches found
No related tags found
2 merge requests!112Restore contacts from backup,!102Release 1.0.0
This commit is part of merge request !112. Comments created here will be created in the context of that merge request.
......@@ -135,7 +135,7 @@ public let restoreReducer = Reducer<RestoreState, RestoreAction, RestoreEnvironm
let facts = try env.messenger.ud.tryGet().getFacts()
try env.db().saveContact(Contact(
id: try env.messenger.e2e.tryGet().getContact().getId(),
username: result.restoredParams.username,
username: facts.get(.username)?.value,
email: facts.get(.email)?.value,
phone: facts.get(.phone)?.value,
createdAt: env.now()
......
......@@ -80,11 +80,12 @@ final class RestoreFeatureTests: XCTestCase {
let backupData = "backup-data".data(using: .utf8)!
let backupPassphrase = "backup-passphrase"
let restoredFacts = [
Fact(type: .email, value: "restored-email"),
Fact(type: .phone, value: "restored-phone"),
Fact(type: .username, value: "restored-fact-username"),
Fact(type: .email, value: "restored-fact-email"),
Fact(type: .phone, value: "restored-fact-phone"),
]
let restoreResult = MessengerRestoreBackup.Result(
restoredParams: BackupParams(username: "restored-username"),
restoredParams: BackupParams(username: "restored-param-username"),
restoredContacts: [
"contact-1-id".data(using: .utf8)!,
"contact-2-id".data(using: .utf8)!,
......@@ -162,7 +163,7 @@ final class RestoreFeatureTests: XCTestCase {
XCTAssertNoDifference(didSaveContact, [
Contact(
id: contactId,
username: restoreResult.restoredParams.username,
username: restoredFacts.get(.username)?.value,
email: restoredFacts.get(.email)?.value,
phone: restoredFacts.get(.phone)?.value,
createdAt: now
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment