Convert selected dates to UTC

Author: itsmeichigo

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

@@ -1,5 +1,4 @@
 import CoreData
-import Storage
 
 extension NSPredicate {
     public static func createBookingPredicate(siteID: Int64, filters: BookingFilters) -> NSPredicate {
@@ -23,7 +22,8 @@ extension NSPredicate {
 
         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 attendanceStatusesPredicate = filters.attendanceStatuses.isNotEmpty ?
+        NSPredicate(format: "attendanceStatusKey IN %@", filters.attendanceStatuses) : nil
 
         let subpredicates = [
             siteIDPredicate,

WooCommerce/Classes/Bookings/BookingFilters/BookingDateTimeFilterView.swift

@@ -63,10 +63,22 @@ struct BookingDateTimeFilterView: View {
             selectedToDate = newValue
         }
         .onChange(of: selectedFromDate) { _, newValue in
-            onSelection(newValue, selectedToDate)
+            guard let newValue else {
+                return onSelection(nil, selectedToDate)
+            }
+            /// Bookings backend treats dates as local time with no time zone.
+            /// Convert the date to keep the selected components but with UTC as time zone.
+            let convertedDate = convertToUTCDate(newValue)
+            onSelection(convertedDate, selectedToDate)
         }
         .onChange(of: selectedToDate) { _, newValue in
-            onSelection(selectedFromDate, newValue)
+            guard let newValue else {
+                return onSelection(selectedFromDate, nil)
+            }
+            /// Bookings backend treats dates as local time with no time zone.
+            /// Convert the date to keep the selected components but with UTC as time zone.
+            let convertedDate = convertToUTCDate(newValue)
+            onSelection(selectedFromDate, convertedDate)
         }
     }
 }
@@ -156,6 +168,19 @@ private extension BookingDateTimeFilterView {
             return fromDate...Date.distantFuture
         }
     }
+
+    /// Converts a date by extracting its components in the local timezone
+    /// and reconstructing a new date with those same components in UTC.
+    /// This effectively treats the selected date/time as if it were in UTC.
+    func convertToUTCDate(_ date: Date) -> Date {
+        let localCalendar = Calendar.current
+        let components = localCalendar.dateComponents([.year, .month, .day, .hour, .minute, .second], from: date)
+
+        var utcCalendar = Calendar(identifier: .gregorian)
+        utcCalendar.timeZone = TimeZone(identifier: "UTC")!
+
+        return utcCalendar.date(from: components) ?? date
+    }
 }
 
 private extension BookingDateTimeFilterView {

WooCommerce/Classes/Bookings/BookingList/BookingListViewModel.swift

@@ -26,7 +26,6 @@ final class BookingListViewModel: ObservableObject {
     private let type: BookingListTab
     private let stores: StoresManager
     private let storage: StorageManagerType
-    private let currentDate: Date
     private var currentOrder: SortBy = .newestToOldest
 
     private var filters: BookingFilters
@@ -66,7 +65,6 @@ final class BookingListViewModel: ObservableObject {
         self.type = type
         self.stores = stores
         self.storage = storage
-        self.currentDate = currentDate
         self.paginationTracker = PaginationTracker(pageFirstIndex: pageFirstIndex)
 
         self.filters = {