Move WooShippingLoadPackagesError to WooShippingStore

woocommerce · Dec 20, 2024 · 0ae53a6 · 0ae53a6
1 parent af5e2eb
commit 0ae53a6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/...ipping Labels/WooShipping Package and Rate Selection/WooShippingAddPackageViewModel.swift b/...ipping Labels/WooShipping Package and Rate Selection/WooShippingAddPackageViewModel.swift
@@ -128,12 +128,7 @@ final class WooShippingAddPackageViewModel: ObservableObject {
 
         let result: Result<WooShippingPackagesResponse, WooShippingLoadPackagesError> = await withCheckedContinuation { continuation in
             let loadPackagesAction = WooShippingAction.loadPackages(siteID: siteID) { result in
-                switch result {
-                case .success(let packagesResult):
-                    continuation.resume(returning: .success(packagesResult))
-                case .failure(let error):
-                    continuation.resume(returning: .failure(WooShippingLoadPackagesError.loadingFailed(error: error)))
-                }
+                continuation.resume(returning: result)
             }
             stores.dispatch(loadPackagesAction)
         }
@@ -339,8 +334,3 @@ extension WooShippingCarrierPredefinedOptions {
         return carrierPackages
     }
 }
-
-public enum WooShippingLoadPackagesError: Error {
-    case loadingInProgress
-    case loadingFailed(error: Error)
-}
diff --git a/Yosemite/Yosemite/Actions/WooShippingAction.swift b/Yosemite/Yosemite/Actions/WooShippingAction.swift
@@ -26,7 +26,7 @@ public enum WooShippingAction: Action {
     /// Fetch list of packages.
     ///
     case loadPackages(siteID: Int64,
-                      completion: (Result<WooShippingPackagesResponse, Error>) -> Void)
+                      completion: (Result<WooShippingPackagesResponse, WooShippingLoadPackagesError>) -> Void)
 
     /// Fetch list of packages.
     ///

diff --git a/Yosemite/Yosemite/Stores/WooShippingStore.swift b/Yosemite/Yosemite/Stores/WooShippingStore.swift
@@ -116,15 +116,15 @@ private extension WooShippingStore {
     }
 
     func loadPackages(siteID: Int64,
-                      completion: @escaping (Result<WooShippingPackagesResponse, Error>) -> Void) {
+                      completion: @escaping (Result<WooShippingPackagesResponse, WooShippingLoadPackagesError>) -> Void) {
         remote.loadPackages(siteID: siteID) { [weak self] result in
             switch result {
             case .success(let packages):
                 self?.upsertPackagesResponseInBackground(readOnlyPackages: packages, siteID: siteID) {
                     completion(.success(packages))
                 }
             case .failure(let error):
-                completion(.failure(error))
+                completion(.failure(WooShippingLoadPackagesError.loadingFailed(error: error)))
             }
         }
     }
@@ -470,3 +470,8 @@ public enum WooShippingLabelPurchaseError: Error {
     /// No labels are returned by initial purchase request
     case purchaseMissingLabels
 }
+
+public enum WooShippingLoadPackagesError: Error {
+    case loadingInProgress
+    case loadingFailed(error: Error)
+}