Update predicate for booking list after filtering

Author: itsmeichigo

Modules/Sources/Yosemite/Tools/Bookings/ResultsController+FilterBookings.swift

@@ -0,0 +1,47 @@
+import CoreData
+import Storage
+
+extension NSPredicate {
+    public static func createBookingPredicate(siteID: Int64, filters: BookingFilters) -> NSPredicate {
+        let siteIDPredicate = NSPredicate(format: "siteID == %lld", siteID)
+
+        let productIDsPredicate = filters.productIDs.isNotEmpty ? NSPredicate(format: "productID IN %@", filters.productIDs) : nil
+
+        let customerIDsPredicate = filters.customerIDs.isNotEmpty ? NSPredicate(format: "customerID IN %@", filters.customerIDs) : nil
+
+        let resourceIDsPredicate = filters.resourceIDs.isNotEmpty ? NSPredicate(format: "resourceID IN %@", filters.resourceIDs) : nil
+
+        let startDateBeforePredicate = filters.startDateBefore.flatMap { dateString -> NSPredicate? in
+            guard let date = ISO8601DateFormatter().date(from: dateString) else { return nil }
+            return NSPredicate(format: "startDate < %@", date as NSDate)
+        }
+
+        let startDateAfterPredicate = filters.startDateAfter.flatMap { dateString -> NSPredicate? in
+            guard let date = ISO8601DateFormatter().date(from: dateString) else { return nil }
+            return NSPredicate(format: "startDate > %@", date as NSDate)
+        }
+
+        let bookingStatusesPredicate = filters.bookingStatuses.isNotEmpty ? NSPredicate(format: "statusKey IN %@", filters.bookingStatuses) : nil
+
+        let attendanceStatusesPredicate = filters.attendanceStatuses.isNotEmpty ? NSPredicate(format: "attendanceStatusKey IN %@", filters.attendanceStatuses) : nil
+
+        let subpredicates = [
+            siteIDPredicate,
+            productIDsPredicate,
+            customerIDsPredicate,
+            resourceIDsPredicate,
+            startDateBeforePredicate,
+            startDateAfterPredicate,
+            bookingStatusesPredicate,
+            attendanceStatusesPredicate
+        ].compactMap({ $0 })
+
+        return NSCompoundPredicate(andPredicateWithSubpredicates: subpredicates)
+    }
+}
+
+extension ResultsController where T: StorageBooking {
+    public func updatePredicate(siteID: Int64, filters: BookingFilters) {
+        self.predicate = NSPredicate.createBookingPredicate(siteID: siteID, filters: filters)
+    }
+}

WooCommerce/Classes/Bookings/BookingList/BookingListViewModel.swift

@@ -49,14 +49,7 @@ final class BookingListViewModel: ObservableObject {
 
     /// Booking ResultsController.
     private lazy var resultsController: ResultsController<StorageBooking> = {
-        var predicates = [NSPredicate(format: "siteID == %lld", siteID)]
-        if let before = type.startDateBefore(currentDate: currentDate) {
-            predicates.append(NSPredicate(format: "startDate < %@", before as NSDate))
-        }
-        if let after = type.startDateAfter(currentDate: currentDate) {
-            predicates.append(NSPredicate(format: "startDate > %@", after as NSDate))
-        }
-        let combinedPredicate = NSCompoundPredicate(type: .and, subpredicates: predicates)
+        let combinedPredicate = NSPredicate.createBookingPredicate(siteID: siteID, filters: filters)
         let sortDescriptorByDate = NSSortDescriptor(key: "startDate", ascending: false)
         let resultsController = ResultsController<StorageBooking>(storageManager: storage,
                                                                   matching: combinedPredicate,
@@ -128,6 +121,7 @@ final class BookingListViewModel: ObservableObject {
         guard type == .all else { return }
         hasFilters = filters.numberOfActiveFilters > 0
         self.filters = filters.bookingFilters
+        resultsController.updatePredicate(siteID: siteID, filters: self.filters)
         paginationTracker.resync(reason: Self.refreshCacheReason) {}
     }
 

WooCommerce/Classes/Bookings/BookingList/BookingSearchViewModel.swift

@@ -16,7 +16,6 @@ final class BookingSearchViewModel: ObservableObject {
     private let siteID: Int64
     private let type: BookingListTab
     private let stores: StoresManager
-    private let currentDate: Date
     private var searchQuerySubscription: AnyCancellable?
     private var currentOrder: BookingListViewModel.SortBy = .newestToOldest
 
@@ -40,7 +39,6 @@ final class BookingSearchViewModel: ObservableObject {
         self.siteID = siteID
         self.type = type
         self.stores = stores
-        self.currentDate = currentDate
         self.searchPaginationTracker = PaginationTracker(pageFirstIndex: pageFirstIndex)
 
         self.filters = {