Merge branch 'feat/batch-fetching-in-order-details-take-2' into feat/batch-fetching-in-order-details

Author: pmusolino

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsViewModel.swift

@@ -262,6 +262,32 @@ extension OrderDetailsViewModel {
             self.syncSubscriptions { _ in
                 group.leave()
             }
+
+            // Shipping labels need to be synced after the order but before we complete
+            // the order sync group to ensure the UI shows the latest data
+            group.enter()
+            Task { @MainActor [weak self] in
+                defer {
+                    group.leave()
+                }
+                // Check Woo Shipping support first, to ensure correct flows are enabled for shipping labels.
+                self?.dataSource.isEligibleForWooShipping = ((await self?.isWooShippingSupported()) != nil)
+
+                // Check creation eligibility
+                let isEligible = await self?.checkShippingLabelCreationEligibility()
+                self?.dataSource.isEligibleForShippingLabelCreation = isEligible ?? false
+
+                // Sync shipping labels and update order with the result if available
+                if let shippingLabels = await self?.syncShippingLabels() {
+                    // Update the order with the newly synced shipping labels
+                    if let updatedOrder = self?.order.copy(shippingLabels: shippingLabels) {
+                        self?.update(order: updatedOrder)
+                    }
+                }
+
+                // Reload UI after shipping labels are synced
+                onReloadSections?()
+            }
         }
 
         group.enter()
@@ -282,22 +308,6 @@ extension OrderDetailsViewModel {
             onReloadSections?()
         }
 
-        group.enter()
-        Task { @MainActor in
-            defer {
-                onReloadSections?()
-                group.leave()
-            }
-            // Check Woo Shipping support first, to ensure correct flows are enabled for shipping labels.
-            dataSource.isEligibleForWooShipping = await isWooShippingSupported()
-
-            // Then sync shipping labels and check creation eligibility concurrently.
-            async let syncShippingLabels: () = syncShippingLabels()
-            async let isEligibleForShippingLabelCreation = checkShippingLabelCreationEligibility()
-            _ = await syncShippingLabels
-            dataSource.isEligibleForShippingLabelCreation = await isEligibleForShippingLabelCreation
-        }
-
         group.enter()
         syncSavedReceipts {_ in
             group.leave()
@@ -681,24 +691,24 @@ extension OrderDetailsViewModel {
     }
 
     @MainActor
-    func syncShippingLabels() async {
+    func syncShippingLabels() async -> [ShippingLabel]? {
         guard await localRequirementsForShippingLabelsAreFulfilled() else {
-            return
+            return nil
         }
         return await withCheckedContinuation { continuation in
             stores.dispatch(ShippingLabelAction.synchronizeShippingLabels(siteID: order.siteID, orderID: order.orderID) { result in
                 switch result {
-                    case .success:
+                    case .success(let shippingLabels):
                         ServiceLocator.analytics.track(event: .shippingLabelsAPIRequest(result: .success))
-                        continuation.resume(returning: ())
+                        continuation.resume(returning: shippingLabels)
                     case .failure(let error):
                         ServiceLocator.analytics.track(event: .shippingLabelsAPIRequest(result: .failed(error: error)))
                         if error as? DotcomError == .noRestRoute {
                             DDLogError("⚠️ Endpoint for synchronizing shipping labels is unreachable. WC Shipping plugin may be missing.")
                         } else {
                             DDLogError("⛔️ Error synchronizing shipping labels: \(error)")
                         }
-                        continuation.resume(returning: ())
+                        continuation.resume(returning: nil)
                 }
             })
         }

Yosemite/Yosemite/Actions/ShippingLabelAction.swift

@@ -3,7 +3,7 @@ import Networking
 public enum ShippingLabelAction: Action {
     /// Syncs shipping labels for a given order.
     ///
-    case synchronizeShippingLabels(siteID: Int64, orderID: Int64, completion: (Result<Void, Error>) -> Void)
+    case synchronizeShippingLabels(siteID: Int64, orderID: Int64, completion: (Result<[ShippingLabel], Error>) -> Void)
 
     /// Generates a shipping label document for printing.
     ///

Yosemite/Yosemite/Model/Mocks/ActionHandlers/MockShippingLabelActionHandler.swift

@@ -11,7 +11,47 @@ struct MockShippingLabelActionHandler: MockActionHandler {
         switch action {
             /// Not implemented
             case .synchronizeShippingLabels(_, _, let completion):
-                success(completion)
+                let mockShippingLabel = ShippingLabel(
+                    siteID: 0,
+                    orderID: 0,
+                    shippingLabelID: 0,
+                    carrierID: "",
+                    dateCreated: Date(),
+                    packageName: "",
+                    rate: 0.0,
+                    currency: "",
+                    trackingNumber: "",
+                    serviceName: "",
+                    refundableAmount: 0.0,
+                    status: .unknown,
+                    refund: nil,
+                    originAddress: ShippingLabelAddress(
+                        company: "",
+                        name: "",
+                        phone: "",
+                        country: "",
+                        state: "",
+                        address1: "",
+                        address2: "",
+                        city: "",
+                        postcode: ""
+                    ),
+                    destinationAddress: ShippingLabelAddress(
+                        company: "",
+                        name: "",
+                        phone: "",
+                        country: "",
+                        state: "",
+                        address1: "",
+                        address2: "",
+                        city: "",
+                        postcode: ""
+                    ),
+                    productIDs: [],
+                    productNames: [],
+                    commercialInvoiceURL: nil
+                )
+                completion(.success([mockShippingLabel]))
             case .checkCreationEligibility(_, _, let onCompletion):
                 onCompletion(false)
             default: unimplementedAction(action: action)

Yosemite/Yosemite/Stores/ShippingLabelStore.swift

@@ -87,7 +87,7 @@ public final class ShippingLabelStore: Store {
 }
 
 private extension ShippingLabelStore {
-    func synchronizeShippingLabels(siteID: Int64, orderID: Int64, completion: @escaping (Result<Void, Error>) -> Void) {
+    func synchronizeShippingLabels(siteID: Int64, orderID: Int64, completion: @escaping (Result<[ShippingLabel], Error>) -> Void) {
         remote.loadShippingLabels(siteID: siteID, orderID: orderID) { [weak self] result in
             guard let self = self else { return }
 
@@ -99,7 +99,7 @@ private extension ShippingLabelStore {
                                                                  orderID: orderID,
                                                                  shippingLabels: response.shippingLabels,
                                                                  settings: response.settings) {
-                    completion(.success(()))
+                    completion(.success(response.shippingLabels))
                 }
             }
         }