Rename to WooShippingAccountSettings (#14500)

woocommerce · Nov 22, 2024 · 275aedd · 275aedd
2 parents 0f6ad4b + 5ff59fa
commit 275aedd
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/Fakes/Fakes/Networking.generated.swift b/Fakes/Fakes/Networking.generated.swift
@@ -2751,10 +2751,10 @@ extension Networking.WooPaymentsPayoutsSchedule {
         )
     }
 }
-extension Networking.WooShippingAccountSettingsResponse {
+extension Networking.WooShippingAccountSettings {
     /// Returns a "ready to use" type filled with fake values.
     ///
-    public static func fake() -> Networking.WooShippingAccountSettingsResponse {
+    public static func fake() -> Networking.WooShippingAccountSettings {
         .init(
             storeOptions: .fake(),
             accountSettings: .fake()

diff --git a/Networking/Networking.xcodeproj/project.pbxproj b/Networking/Networking.xcodeproj/project.pbxproj
@@ -955,7 +955,7 @@
 		DA69CC972CEDDA1200CB7CEE /* wooshipping-get-account-settings-success.json in Resources */ = {isa = PBXBuildFile; fileRef = DA69CC962CEDDA1200CB7CEE /* wooshipping-get-account-settings-success.json */; };
 		DAA259AB2CEC86370035F028 /* WooShippingSavedPredefinedPackage.swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAA259AA2CEC86360035F028 /* WooShippingSavedPredefinedPackage.swift.swift */; };
 		DAA259AD2CEC86BE0035F028 /* wooshipping-get-packages-success.json in Resources */ = {isa = PBXBuildFile; fileRef = DAA259AC2CEC86BE0035F028 /* wooshipping-get-packages-success.json */; };
-		DAA259AF2CECF4AF0035F028 /* WooShippingAccountSettingsResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAA259AE2CECF4A70035F028 /* WooShippingAccountSettingsResponse.swift */; };
+		DAA259AF2CECF4AF0035F028 /* WooShippingAccountSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAA259AE2CECF4A70035F028 /* WooShippingAccountSettings.swift */; };
 		DAA259B12CECF5720035F028 /* WooShippingAccountSettingsMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAA259B02CECF56B0035F028 /* WooShippingAccountSettingsMapper.swift */; };
 		DAF367A22CE75B9E00D1B327 /* WooShippingPackagesMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAF367A12CE75B9D00D1B327 /* WooShippingPackagesMapper.swift */; };
 		DAF367A42CE75C1B00D1B327 /* WooShippingPredefinedPackage.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAF367A32CE75C1900D1B327 /* WooShippingPredefinedPackage.swift */; };
@@ -2137,7 +2137,7 @@
 		DA69CC962CEDDA1200CB7CEE /* wooshipping-get-account-settings-success.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "wooshipping-get-account-settings-success.json"; sourceTree = "<group>"; };
 		DAA259AA2CEC86360035F028 /* WooShippingSavedPredefinedPackage.swift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingSavedPredefinedPackage.swift.swift; sourceTree = "<group>"; };
 		DAA259AC2CEC86BE0035F028 /* wooshipping-get-packages-success.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "wooshipping-get-packages-success.json"; sourceTree = "<group>"; };
-		DAA259AE2CECF4A70035F028 /* WooShippingAccountSettingsResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingAccountSettingsResponse.swift; sourceTree = "<group>"; };
+		DAA259AE2CECF4A70035F028 /* WooShippingAccountSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingAccountSettings.swift; sourceTree = "<group>"; };
 		DAA259B02CECF56B0035F028 /* WooShippingAccountSettingsMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingAccountSettingsMapper.swift; sourceTree = "<group>"; };
 		DAF367A12CE75B9D00D1B327 /* WooShippingPackagesMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingPackagesMapper.swift; sourceTree = "<group>"; };
 		DAF367A32CE75C1900D1B327 /* WooShippingPredefinedPackage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingPredefinedPackage.swift; sourceTree = "<group>"; };
@@ -2520,7 +2520,7 @@
 				CC07865E267799EE00BA9AC1 /* ShippingLabelPurchase.swift */,
 				02C2549F25636F6900A04423 /* ShippingLabelRefund.swift */,
 				02C254A3256371B200A04423 /* ShippingLabelSettings.swift */,
-				DAA259AE2CECF4A70035F028 /* WooShippingAccountSettingsResponse.swift */,
+				DAA259AE2CECF4A70035F028 /* WooShippingAccountSettings.swift */,
 				451A97C72609FDE50059D135 /* Packages */,
 			);
 			path = ShippingLabel;
@@ -5027,7 +5027,7 @@
 				45150A9A268340D2006922EA /* Country.swift in Sources */,
 				DE74F29A27E08F5A0002FE59 /* SiteSettingMapper.swift in Sources */,
 				CC33754E29C884000006A538 /* ProductCompositeComponent.swift in Sources */,
-				DAA259AF2CECF4AF0035F028 /* WooShippingAccountSettingsResponse.swift in Sources */,
+				DAA259AF2CECF4AF0035F028 /* WooShippingAccountSettings.swift in Sources */,
 				450106852399A7CB00E24722 /* TaxClass.swift in Sources */,
 				DE2004572BF5C22600660A72 /* ProductStockListMapper.swift in Sources */,
 				68BFF8FA2B67679700B15FF2 /* ReceiptRemote.swift in Sources */,

diff --git a/Networking/Networking/Mapper/WooShippingAccountSettingsMapper.swift b/Networking/Networking/Mapper/WooShippingAccountSettingsMapper.swift
@@ -8,9 +8,9 @@ struct WooShippingAccountSettingsMapper: Mapper {
     ///
     let siteID: Int64
 
-    /// (Attempts) to convert a dictionary into WooShippingAccountSettingsResponse.
+    /// (Attempts) to convert a dictionary into WooShippingAccountSettings.
     ///
-    func map(response: Data) throws -> WooShippingAccountSettingsResponse {
+    func map(response: Data) throws -> WooShippingAccountSettings {
         let decoder = JSONDecoder()
         decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.yearMonthDayDateFormatter)
         decoder.userInfo = [
@@ -20,7 +20,7 @@ struct WooShippingAccountSettingsMapper: Mapper {
         if hasDataEnvelope(in: response) {
             return try decoder.decode(WooShippingAccountSettingsMapperEnvelope.self, from: response).data
         } else {
-            return try decoder.decode(WooShippingAccountSettingsResponse.self, from: response)
+            return try decoder.decode(WooShippingAccountSettings.self, from: response)
         }
     }
 }
@@ -30,7 +30,7 @@ struct WooShippingAccountSettingsMapper: Mapper {
 /// This entity allows us to parse all the things with JSONDecoder.
 ///
 private struct WooShippingAccountSettingsMapperEnvelope: Decodable {
-    let data: WooShippingAccountSettingsResponse
+    let data: WooShippingAccountSettings
 
     private enum CodingKeys: String, CodingKey {
         case data

diff --git a/Networking/Networking/Model/Copiable/Models+Copiable.generated.swift b/Networking/Networking/Model/Copiable/Models+Copiable.generated.swift
@@ -4042,15 +4042,15 @@ extension Networking.WooPaymentsPayoutsSchedule {
     }
 }
 
-extension Networking.WooShippingAccountSettingsResponse {
+extension Networking.WooShippingAccountSettings {
     public func copy(
         storeOptions: CopiableProp<ShippingLabelStoreOptions> = .copy,
         accountSettings: CopiableProp<ShippingLabelAccountSettings> = .copy
-    ) -> Networking.WooShippingAccountSettingsResponse {
+    ) -> Networking.WooShippingAccountSettings {
         let storeOptions = storeOptions ?? self.storeOptions
         let accountSettings = accountSettings ?? self.accountSettings
 
-        return Networking.WooShippingAccountSettingsResponse(
+        return Networking.WooShippingAccountSettings(
             storeOptions: storeOptions,
             accountSettings: accountSettings
         )

diff --git a/.../WooShippingAccountSettingsResponse.swift → ...ingLabel/WooShippingAccountSettings.swift b/.../WooShippingAccountSettingsResponse.swift → ...ingLabel/WooShippingAccountSettings.swift
@@ -3,7 +3,7 @@ import Codegen
 
 /// Represents Account Settings for Shipping Labels.
 ///
-public struct WooShippingAccountSettingsResponse: Equatable, GeneratedFakeable, GeneratedCopiable {
+public struct WooShippingAccountSettings: Equatable, GeneratedFakeable, GeneratedCopiable {
     public let storeOptions: ShippingLabelStoreOptions
     public let accountSettings: ShippingLabelAccountSettings
 
@@ -13,7 +13,7 @@ public struct WooShippingAccountSettingsResponse: Equatable, GeneratedFakeable,
     }
 }
 
-extension WooShippingAccountSettingsResponse: Decodable {
+extension WooShippingAccountSettings: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 

diff --git a/Networking/Networking/Remote/WooShippingRemote.swift b/Networking/Networking/Remote/WooShippingRemote.swift
@@ -14,7 +14,7 @@ public protocol WooShippingRemoteProtocol {
     func loadPackages(siteID: Int64,
                       completion: @escaping (Result<WooShippingPackagesResponse, Error>) -> Void)
     func loadAccountSettings(siteID: Int64,
-                             completion: @escaping (Result<WooShippingAccountSettingsResponse, Error>) -> Void)
+                             completion: @escaping (Result<WooShippingAccountSettings, Error>) -> Void)
     func purchaseShippingLabel(siteID: Int64,
                                orderID: Int64,
                                originAddress: ShippingLabelAddress,
@@ -131,7 +131,7 @@ public final class WooShippingRemote: Remote, WooShippingRemoteProtocol {
     ///   - siteID: Remote ID of the site.
     ///   - completion: Closure to be executed upon completion.
     public func loadAccountSettings(siteID: Int64,
-                                    completion: @escaping (Result<WooShippingAccountSettingsResponse, Error>) -> Void) {
+                                    completion: @escaping (Result<WooShippingAccountSettings, Error>) -> Void) {
         do {
             let path = Path.accountSettings
             let request = JetpackRequest(wooApiVersion: .wooShipping,

diff --git a/Networking/NetworkingTests/Remote/WooShippingRemoteTests.swift b/Networking/NetworkingTests/Remote/WooShippingRemoteTests.swift
@@ -169,7 +169,7 @@ final class WooShippingRemoteTests: XCTestCase {
         network.simulateResponse(requestUrlSuffix: "account/settings", filename: "wooshipping-get-account-settings-success")
 
         // When
-        let result: Result<WooShippingAccountSettingsResponse, Error> = waitFor { promise in
+        let result: Result<WooShippingAccountSettings, Error> = waitFor { promise in
             remote.loadAccountSettings(siteID: self.sampleSiteID) { result in
                 promise(result)
             }
@@ -207,7 +207,7 @@ final class WooShippingRemoteTests: XCTestCase {
         network.simulateResponse(requestUrlSuffix: "account/settings", filename: "generic_error")
 
         // When
-        let result: Result<WooShippingAccountSettingsResponse, Error> = waitFor { promise in
+        let result: Result<WooShippingAccountSettings, Error> = waitFor { promise in
             remote.loadAccountSettings(siteID: self.sampleSiteID) { result in
                 promise(result)
             }

diff --git a/Yosemite/Yosemite/Actions/WooShippingAction.swift b/Yosemite/Yosemite/Actions/WooShippingAction.swift
@@ -25,5 +25,5 @@ public enum WooShippingAction: Action {
     /// Fetch list of packages.
     ///
     case loadAccountSettings(siteID: Int64,
-                             completion: (Result<WooShippingAccountSettingsResponse, Error>) -> Void)
+                             completion: (Result<WooShippingAccountSettings, Error>) -> Void)
 }
diff --git a/Yosemite/Yosemite/Stores/WooShippingStore.swift b/Yosemite/Yosemite/Stores/WooShippingStore.swift
@@ -82,7 +82,7 @@ private extension WooShippingStore {
     }
 
     func loadAccountSettings(siteID: Int64,
-                             completion: @escaping (Result<WooShippingAccountSettingsResponse, Error>) -> Void) {
+                             completion: @escaping (Result<WooShippingAccountSettings, Error>) -> Void) {
         remote.loadAccountSettings(siteID: siteID, completion: completion)
     }
 }
diff --git a/Yosemite/YosemiteTests/Mocks/Networking/Remote/MockWooShippingRemote.swift b/Yosemite/YosemiteTests/Mocks/Networking/Remote/MockWooShippingRemote.swift
@@ -22,7 +22,7 @@ final class MockWooShippingRemote {
     private var loadPackagesResults = [ResultKey: Result<WooShippingPackagesResponse, Error>]()
 
     /// The results to return based on the given arguments in `loadAccountSettings`
-    private var loadAccountSettingsResults = [ResultKey: Result<WooShippingAccountSettingsResponse, Error>]()
+    private var loadAccountSettingsResults = [ResultKey: Result<WooShippingAccountSettings, Error>]()
 
     /// Set the value passed to the `completion` block if `createPackage` is called.
     func whenCreatePackage(siteID: Int64,
@@ -47,7 +47,7 @@ final class MockWooShippingRemote {
 
     /// Set the value passed to the `completion` block if `loadAccountSettings` is called.
     func whenLoadAccountSettings(siteID: Int64,
-                                 thenReturn result: Result<WooShippingAccountSettingsResponse, Error>) {
+                                 thenReturn result: Result<WooShippingAccountSettings, Error>) {
         let key = ResultKey(siteID: siteID)
         loadAccountSettingsResults[key] = result
     }
@@ -111,7 +111,7 @@ extension MockWooShippingRemote: WooShippingRemoteProtocol {
     }
 
     func loadAccountSettings(siteID: Int64,
-                             completion: @escaping (Result<WooShippingAccountSettingsResponse, Error>) -> Void) {
+                             completion: @escaping (Result<WooShippingAccountSettings, Error>) -> Void) {
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }