Make reviewable

Author: adborbas

Modules/Sources/Yosemite/Actions/BookingAction.swift

@@ -5,7 +5,7 @@ import Networking
 /// BookingAction: Defines all of the Actions supported by the BookingStore.
 ///
 public enum BookingAction: Action {
-
+    
     /// Synchronizes the Bookings matching the specified criteria.
     ///
     /// - Parameter onCompletion: called when sync completes, returns an error or a boolean that indicates whether there might be more bookings to sync.
@@ -103,4 +103,12 @@ public enum BookingAction: Action {
                            bookingID: Int64,
                            note: String,
                            onCompletion: (Error?) -> Void)
+
+
+    /// Clears the booking cache.
+    ///
+    /// - Parameter siteID: The site ID of the booking.
+    /// - Parameter onCompletion: Called when clear completes.
+    case clearBookingsCache(siteID: Int64,
+                            onCompletion: () -> Void)
 }

Modules/Sources/Yosemite/Stores/BookingStore.swift

@@ -89,6 +89,8 @@ public class BookingStore: Store {
                 note: note,
                 onCompletion: onCompletion
             )
+        case .clearBookingsCache(siteID: let siteID, onCompletion: let onCompletion):
+            clearBookingsCache(siteID: siteID, onCompletion: onCompletion)
         }
     }
 }
@@ -205,12 +207,12 @@ private extension BookingStore {
     /// Returns results immediately without saving to storage.
     ///
     func searchBookings(siteID: Int64,
-                       searchQuery: String,
-                       pageNumber: Int,
-                       pageSize: Int,
-                       filters: BookingFilters?,
-                       order: BookingsRemote.Order,
-                       onCompletion: @escaping (Result<[Booking], Error>) -> Void) {
+                        searchQuery: String,
+                        pageNumber: Int,
+                        pageSize: Int,
+                        filters: BookingFilters?,
+                        order: BookingsRemote.Order,
+                        onCompletion: @escaping (Result<[Booking], Error>) -> Void) {
         Task { @MainActor in
             do {
                 let bookings = try await remote.loadAllBookings(for: siteID,
@@ -271,9 +273,9 @@ private extension BookingStore {
     /// Synchronizes booking resources for the specified site.
     ///
     func synchronizeResources(siteID: Int64,
-                             pageNumber: Int,
-                             pageSize: Int,
-                             onCompletion: @escaping (Result<Bool, Error>) -> Void) {
+                              pageNumber: Int,
+                              pageSize: Int,
+                              onCompletion: @escaping (Result<Bool, Error>) -> Void) {
         Task { @MainActor in
             do {
                 let resources = try await remote.fetchResources(
@@ -461,6 +463,12 @@ private extension BookingStore {
             }
         }
     }
+
+    func clearBookingsCache(siteID: Int64, onCompletion: @escaping () -> Void) {
+        storageManager.performAndSave({ storage in
+            storage.deleteBookings(siteID: siteID)
+        }, completion: onCompletion, on: .main)
+    }
 }
 
 

WooCommerce/Classes/Bookings/BookingList/BookingListContainerViewModel.swift

@@ -7,6 +7,11 @@ final class BookingListContainerViewModel: ObservableObject {
     private let siteID: Int64
     private let stores: StoresManager
 
+    private lazy var allTabViewModels: [BookingListViewModel] = [
+        todayListViewModel,
+        upcomingListViewModel,
+        allListViewModel
+    ]
     private let todayListViewModel: BookingListViewModel
     private let upcomingListViewModel: BookingListViewModel
     private let allListViewModel: BookingListViewModel
@@ -89,11 +94,25 @@ final class BookingListContainerViewModel: ObservableObject {
         restorePersistedFilters()
     }
 
-    func pullToRefresh() async {
-        async let today = todayListViewModel.onRefreshAction()
-        async let upcoming = upcomingListViewModel.onRefreshAction(reason: "pull-to-refresh")
-        async let all = allListViewModel.onRefreshAction(reason: "pull-to-refresh")
-        _ = await (today, upcoming, all)
+    @MainActor
+    func pullToRefresh(on tab: BookingListTab) async {
+        await withCheckedContinuation { continuation in
+            let action = BookingAction.clearBookingsCache(siteID: siteID) {
+                continuation.resume()
+            }
+            stores.dispatch(action)
+        }
+
+        // Launch all tab refreshes in parallel and wait for all to complete
+        await withTaskGroup(of: Void.self) { group in
+            for viewModel in allTabViewModels {
+                group.addTask { @MainActor in
+                    await viewModel.onRefreshSelfAction(
+                        reason: BookingListViewModel.siblingRefreshReason
+                    )
+                }
+            }
+        }
     }
 
     func listViewModel(for tab: BookingListTab) -> BookingListViewModel {

WooCommerce/Classes/Bookings/BookingList/BookingListView.swift

@@ -43,14 +43,14 @@ private extension BookingListView {
             switch viewModel.syncState {
             case .empty:
                 emptyStateView(isSearching: false) {
-                    await viewModel.onRefreshAllAction()
+                    await viewModel.onRefreshAction()
                 }
             case .syncingFirstPage:
                 loadingView
             case .results:
                 bookingList(with: viewModel.bookings,
                             onNextPage: { viewModel.onLoadNextPageAction() },
-                            onRefresh: { await viewModel.onRefreshAllAction() })
+                            onRefresh: { await viewModel.onRefreshAction() })
             }
         }
         .overlay(alignment: .bottom) {

WooCommerce/Classes/Bookings/BookingList/BookingListViewModel.swift

@@ -34,6 +34,7 @@ final class BookingListViewModel: ObservableObject {
 
     private static let refreshCacheReason = "refresh-cache"
     private static let reorderReason = "reorder"
+    static let siblingRefreshReason = "sibling-refresh"
 
     /// Keeps track of the current state of the syncing
     @Published private(set) var syncState: SyncState = .empty
@@ -98,13 +99,13 @@ final class BookingListViewModel: ObservableObject {
         paginationTracker.ensureNextPageIsSynced()
     }
 
-    func onRefreshAllAction() async {
-        await parent?.pullToRefresh()
+    /// Called when the user pulls down the list to refresh.
+    func onRefreshAction() async {
+        await parent?.pullToRefresh(on: type)
     }
 
-    /// Called when the user pulls down the list to refresh.
     @MainActor
-    func onRefreshAction2(reason: String? = nil) async {
+    func onRefreshSelfAction(reason: String? = nil) async {
         await withCheckedContinuation { continuation in
             paginationTracker.resync(reason: reason ?? Self.refreshCacheReason) {
                 continuation.resume(returning: ())