make clearOrder() async

Author: iamgabrielma

WooCommerce/Classes/POS/Controllers/PointOfSaleOrderController.swift

@@ -35,7 +35,7 @@ protocol PointOfSaleOrderControllerProtocol {
     @discardableResult
     func syncOrder(for cart: Cart, retryHandler: @escaping () async -> Void) async -> Result<SyncOrderState, Error>
     func sendReceipt(recipientEmail: String) async throws
-    func clearOrder()
+    func clearOrder() async
     func collectCashPayment(changeDueAmount: String?) async throws
 }
 
@@ -143,16 +143,20 @@ protocol PointOfSaleOrderControllerProtocol {
         }
     }
 
-    func clearOrder() {
-        clearAutoDraftIfNeeded(for: order)
+    func clearOrder() async {
+        await clearAutoDraftIfNeeded(for: order)
         order = nil
         orderState = .idle
     }
 
-    private func clearAutoDraftIfNeeded(for order: Order?) {
-        if let order, order.status == .autoDraft {
-            DispatchQueue.main.async { [weak self] in
-                let action = OrderAction.deleteOrder(siteID: order.siteID, order: order, deletePermanently: true) { _ in }
+    private func clearAutoDraftIfNeeded(for order: Order?) async {
+        guard let order, order.status == .autoDraft else { return }
+
+        await withCheckedContinuation { continuation in
+            Task { @MainActor [weak self] in
+                let action = OrderAction.deleteOrder(siteID: order.siteID, order: order, deletePermanently: true) { _ in
+                    continuation.resume()
+                }
                 self?.stores.dispatch(action)
             }
         }

WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift

@@ -173,7 +173,9 @@ extension PointOfSaleAggregateModel {
 
     func startNewCart() {
         removeAllItemsFromCart()
-        orderController.clearOrder()
+        Task {
+            await orderController.clearOrder()
+        }
         setStateForEditing()
         viewStateCoordinator.reset()
     }
@@ -621,7 +623,9 @@ extension PointOfSaleAggregateModel {
 
         // Before exiting Point of Sale, we warn the merchant about losing their in-progress order.
         // We need to clear it down as any accidental retention can cause issues especially when reconnecting card readers.
-        orderController.clearOrder()
+        Task {
+            await orderController.clearOrder()
+        }
 
         // Ideally, we could rely on the POS being deallocated to cancel all these. Since we have memory leak issues,
         // cancelling them explicitly helps reduce the risk of user-visible bugs while we work on the memory leaks.

WooCommerce/Classes/POS/Utils/PointOfSalePreviewOrderController.swift

@@ -18,7 +18,7 @@ class PointOfSalePreviewOrderController: PointOfSaleOrderControllerProtocol {
 
     func sendReceipt(recipientEmail: String) async throws { }
 
-    func clearOrder() { }
+    func clearOrder() async { }
 
     func collectCashPayment(changeDueAmount: String?) async throws {}
 }

WooCommerce/WooCommerceTests/POS/Controllers/PointOfSaleOrderControllerTests.swift

@@ -589,7 +589,7 @@ struct PointOfSaleOrderControllerTests {
         }
 
         // When
-        sut.clearOrder()
+        await sut.clearOrder()
 
         // Then
         #expect(deleteActionWasDispatched == false)
@@ -620,8 +620,7 @@ struct PointOfSaleOrderControllerTests {
         }
 
         // When
-        sut.clearOrder()
-        try await Task.sleep(nanoseconds: 100_000_000)
+        await sut.clearOrder()
 
         // Then
         #expect(deleteActionWasDispatched == true)
@@ -651,7 +650,7 @@ struct PointOfSaleOrderControllerTests {
         }
 
         // When
-        sut.clearOrder()
+        await sut.clearOrder()
 
         // Then
         #expect(deleteActionWasDispatched == false)

WooCommerce/WooCommerceTests/POS/Mocks/MockPointOfSaleOrderController.swift

@@ -37,7 +37,7 @@ final class MockPointOfSaleOrderController: PointOfSaleOrderControllerProtocol {
     }
 
     var clearOrderWasCalled: Bool = false
-    func clearOrder() {
+    func clearOrder() async {
         clearOrderWasCalled = true
     }