From 8718aa66750592c3efb69294c9a1851394c86d23 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Fri, 30 Sep 2022 12:47:36 +0200
Subject: [PATCH] Restore username from facts, not from params
---
.../Sources/RestoreFeature/RestoreFeature.swift | 2 +-
.../Tests/RestoreFeatureTests/RestoreFeatureTests.swift | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Examples/xx-messenger/Sources/RestoreFeature/RestoreFeature.swift b/Examples/xx-messenger/Sources/RestoreFeature/RestoreFeature.swift
index 455f8989..4d372202 100644
--- a/Examples/xx-messenger/Sources/RestoreFeature/RestoreFeature.swift
+++ b/Examples/xx-messenger/Sources/RestoreFeature/RestoreFeature.swift
@@ -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()
diff --git a/Examples/xx-messenger/Tests/RestoreFeatureTests/RestoreFeatureTests.swift b/Examples/xx-messenger/Tests/RestoreFeatureTests/RestoreFeatureTests.swift
index 8cfdb3d6..716d7650 100644
--- a/Examples/xx-messenger/Tests/RestoreFeatureTests/RestoreFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/RestoreFeatureTests/RestoreFeatureTests.swift
@@ -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
--
GitLab