From a35d5b95fce807f9b5dd0b48068d5c3372bca3f9 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Wed, 7 Sep 2022 00:10:33 +0200
Subject: [PATCH] Refactor

---
 .../Sources/UserSearchFeature/UserSearchFeature.swift     | 2 +-
 .../UserSearchFeature/UserSearchResultFeature.swift       | 8 ++++----
 .../Sources/UserSearchFeature/UserSearchResultView.swift  | 2 +-
 .../UserSearchFeatureTests/UserSearchFeatureTests.swift   | 6 +++---
 .../UserSearchResultFeatureTests.swift                    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
index 9d16d8f5..84c78195 100644
--- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
+++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
@@ -95,7 +95,7 @@ public let userSearchReducer = Reducer<UserSearchState, UserSearchAction, UserSe
     state.failure = nil
     state.results = IdentifiedArray(uniqueElements: contacts.compactMap { contact in
       guard let id = try? contact.getId() else { return nil }
-      return UserSearchResultState(id: id, contact: contact)
+      return UserSearchResultState(id: id, xxContact: contact)
     })
     return .none
 
diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultFeature.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultFeature.swift
index a224384b..f4c0f856 100644
--- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultFeature.swift
+++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultFeature.swift
@@ -6,20 +6,20 @@ import XXClient
 public struct UserSearchResultState: Equatable, Identifiable {
   public init(
     id: Data,
-    contact: Contact,
+    xxContact: Contact,
     username: String? = nil,
     email: String? = nil,
     phone: String? = nil
   ) {
     self.id = id
-    self.contact = contact
+    self.xxContact = xxContact
     self.username = username
     self.email = email
     self.phone = phone
   }
 
   public var id: Data
-  public var contact: XXClient.Contact
+  public var xxContact: XXClient.Contact
   public var username: String?
   public var email: String?
   public var phone: String?
@@ -43,7 +43,7 @@ public let userSearchResultReducer = Reducer<UserSearchResultState, UserSearchRe
 { state, action, env in
   switch action {
   case .start:
-    let facts = (try? state.contact.getFacts()) ?? []
+    let facts = (try? state.xxContact.getFacts()) ?? []
     state.username = facts.first(where: { $0.type == 0 })?.fact
     state.email = facts.first(where: { $0.type == 1 })?.fact
     state.phone = facts.first(where: { $0.type == 2 })?.fact
diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultView.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultView.swift
index b1a6e267..129081fe 100644
--- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultView.swift
+++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultView.swift
@@ -53,7 +53,7 @@ public struct UserSearchResultView_Previews: PreviewProvider {
     UserSearchResultView(store: Store(
       initialState: UserSearchResultState(
         id: "contact-id".data(using: .utf8)!,
-        contact: .unimplemented("contact-data".data(using: .utf8)!)
+        xxContact: .unimplemented("contact-data".data(using: .utf8)!)
       ),
       reducer: .empty,
       environment: ()
diff --git a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
index a96afd95..4311b515 100644
--- a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
@@ -53,9 +53,9 @@ final class UserSearchFeatureTests: XCTestCase {
       $0.isSearching = false
       $0.failure = nil
       $0.results = [
-        .init(id: "contact-1-id".data(using: .utf8)!, contact: contact1),
-        .init(id: "contact-2-id".data(using: .utf8)!, contact: contact2),
-        .init(id: "contact-4-id".data(using: .utf8)!, contact: contact4)
+        .init(id: "contact-1-id".data(using: .utf8)!, xxContact: contact1),
+        .init(id: "contact-2-id".data(using: .utf8)!, xxContact: contact2),
+        .init(id: "contact-4-id".data(using: .utf8)!, xxContact: contact4)
       ]
     }
   }
diff --git a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchResultFeatureTests.swift b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchResultFeatureTests.swift
index b4f68452..c9efe0c7 100644
--- a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchResultFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchResultFeatureTests.swift
@@ -17,7 +17,7 @@ final class UserSearchResultFeatureTests: XCTestCase {
     let store = TestStore(
       initialState: UserSearchResultState(
         id: "contact-id".data(using: .utf8)!,
-        contact: contact
+        xxContact: contact
       ),
       reducer: userSearchResultReducer,
       environment: .unimplemented
-- 
GitLab