Remove account country code

Author: Ecarrion

Fakes/Fakes/Networking.generated.swift

@@ -27,8 +27,7 @@ extension Networking.Account {
             displayName: .fake(),
             email: .fake(),
             username: .fake(),
-            gravatarUrl: .fake(),
-            ipCountryCode: .fake()
+            gravatarUrl: .fake()
         )
     }
 }

Networking/Networking/Model/Account.swift

@@ -25,22 +25,14 @@ public struct Account: Decodable, Equatable, GeneratedFakeable {
     ///
     public let gravatarUrl: String?
 
-    /// Users IP country Code
-    /// This setting is not stored in the Storage layer because we don't want to rely on stale value.
-    /// But there us no problem on add it later if we believe it will be useful.
-    ///
-    public let ipCountryCode: String
-
-
     /// Designated Initializer.
     ///
-    public init(userID: Int64, displayName: String, email: String, username: String, gravatarUrl: String?, ipCountryCode: String) {
+    public init(userID: Int64, displayName: String, email: String, username: String, gravatarUrl: String?) {
         self.userID = userID
         self.displayName = displayName
         self.email = email
         self.username = username
         self.gravatarUrl = gravatarUrl
-        self.ipCountryCode = ipCountryCode
     }
 }
 
@@ -55,6 +47,5 @@ private extension Account {
         case email          = "email"
         case username       = "username"
         case gravatarUrl    = "avatar_URL"
-        case ipCountryCode  = "user_ip_country_code"
     }
 }

WooCommerce/WooCommerceTests/Internal/SessionManager+Internal.swift

@@ -35,8 +35,7 @@ extension SessionManager {
                                              displayName: displayName,
                                              email: "",
                                              username: credentials.username,
-                                             gravatarUrl: nil,
-                                             ipCountryCode: "US")
+                                             gravatarUrl: nil)
         }
         return manager
     }

WooCommerce/WooCommerceTests/ViewRelated/JetpackSetup/JetpackSetupCoordinatorTests.swift

@@ -104,7 +104,7 @@ final class JetpackSetupCoordinatorTests: XCTestCase {
         let coordinator = JetpackSetupCoordinator(site: testSite, dotcomAuthScheme: expectedScheme, rootViewController: navigationController, stores: stores)
         let url = try XCTUnwrap(URL(string: "scheme://magic-login?token=test"))
 
-        let expectedAccount = Account(userID: 123, displayName: "Test", email: "[email protected]", username: "test", gravatarUrl: nil, ipCountryCode: "US")
+        let expectedAccount = Account(userID: 123, displayName: "Test", email: "[email protected]", username: "test", gravatarUrl: nil)
         stores.whenReceivingAction(ofType: JetpackConnectionAction.self) { action in
             switch action {
             case let .loadWPComAccount(_, onCompletion):
@@ -133,7 +133,7 @@ final class JetpackSetupCoordinatorTests: XCTestCase {
         let coordinator = JetpackSetupCoordinator(site: testSite, dotcomAuthScheme: expectedScheme, rootViewController: navigationController, stores: stores)
         let url = try XCTUnwrap(URL(string: "scheme://magic-login?token=test"))
 
-        let expectedAccount = Account(userID: 123, displayName: "Test", email: "[email protected]", username: "test", gravatarUrl: nil, ipCountryCode: "US")
+        let expectedAccount = Account(userID: 123, displayName: "Test", email: "[email protected]", username: "test", gravatarUrl: nil)
         stores.whenReceivingAction(ofType: JetpackConnectionAction.self) { action in
             switch action {
             case let .loadWPComAccount(_, onCompletion):
@@ -162,7 +162,7 @@ final class JetpackSetupCoordinatorTests: XCTestCase {
         let coordinator = JetpackSetupCoordinator(site: testSite, dotcomAuthScheme: expectedScheme, rootViewController: navigationController, stores: stores)
         let url = try XCTUnwrap(URL(string: "scheme://magic-login?token=test"))
 
-        let expectedAccount = Account(userID: 123, displayName: "Test", email: "[email protected]", username: "test", gravatarUrl: nil, ipCountryCode: "US")
+        let expectedAccount = Account(userID: 123, displayName: "Test", email: "[email protected]", username: "test", gravatarUrl: nil)
         stores.whenReceivingAction(ofType: JetpackConnectionAction.self) { action in
             switch action {
             case let .loadWPComAccount(_, onCompletion):

Yosemite/Yosemite/Model/Mocks/Graphs/ScreenshotsObjectGraph.swift

@@ -29,8 +29,7 @@ struct ScreenshotObjectGraph: MockObjectGraph {
         displayName: i18n.DefaultAccount.displayName,
         email: i18n.DefaultAccount.email,
         username: i18n.DefaultAccount.username,
-        gravatarUrl: nil,
-        ipCountryCode: "USA"
+        gravatarUrl: nil
     )
 
     let defaultSite = Site(

Yosemite/Yosemite/Model/Storage/Account+ReadOnlyConvertible.swift

@@ -23,7 +23,6 @@ extension Storage.Account: ReadOnlyConvertible {
                        displayName: displayName ?? "",
                        email: email ?? "",
                        username: username ?? "",
-                       gravatarUrl: gravatarUrl,
-                       ipCountryCode: "")
+                       gravatarUrl: gravatarUrl)
     }
 }

Yosemite/YosemiteTests/Stores/AccountStoreTests.swift

@@ -878,8 +878,7 @@ private extension AccountStoreTests {
                        displayName: "Sample",
                        email: "[email protected]",
                        username: "Username!",
-                       gravatarUrl: "https://automattic.com/superawesomegravatar.png",
-                       ipCountryCode: "")
+                       gravatarUrl: "https://automattic.com/superawesomegravatar.png")
     }
 
     /// Sample Account: Mark II
@@ -889,8 +888,7 @@ private extension AccountStoreTests {
                        displayName: "Yosemite",
                        email: "[email protected]",
                        username: "YOLO",
-                       gravatarUrl: "https://automattic.com/yosemite.png",
-                       ipCountryCode: "")
+                       gravatarUrl: "https://automattic.com/yosemite.png")
     }
 
     func sampleAccountSettings() -> Networking.AccountSettings {