Merge branch 'trunk' into woomob-1095-woo-poslocal-catalog-bg-app-refresh-task-dispatching

Author: staskus

Modules/Sources/Networking/Mapper/BookingMapper.swift

@@ -0,0 +1,28 @@
+import Foundation
+
+/// Mapper: Booking
+///
+struct BookingMapper: Mapper {
+    let siteID: Int64
+
+    func map(response: Data) throws -> Booking {
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.dateTimeFormatter)
+        decoder.userInfo = [
+            .siteID: siteID
+        ]
+        if hasDataEnvelope(in: response) {
+            return try decoder.decode(BookingEnvelope.self, from: response).booking
+        } else {
+            return try decoder.decode(Booking.self, from: response)
+        }
+    }
+}
+
+private struct BookingEnvelope: Decodable {
+    let booking: Booking
+
+    private enum CodingKeys: String, CodingKey {
+        case booking = "data"
+    }
+}

Modules/Sources/Networking/Remote/BookingsRemote.swift

@@ -10,7 +10,12 @@ public protocol BookingsRemoteProtocol {
                          pageNumber: Int,
                          pageSize: Int,
                          startDateBefore: String?,
-                         startDateAfter: String?) async throws -> [Booking]
+                         startDateAfter: String?,
+                         searchQuery: String?,
+                         order: BookingsRemote.Order) async throws -> [Booking]
+
+    func loadBooking(bookingID: Int64,
+                     siteID: Int64) async throws -> Booking?
 }
 
 /// Booking: Remote Endpoints
@@ -27,15 +32,20 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
     ///     - pageSize: Number of bookings to be retrieved per page.
     ///     - startDateBefore: Filter bookings with start date before this timestamp.
     ///     - startDateAfter: Filter bookings with start date after this timestamp.
+    ///     - searchQuery: Search query to filter bookings.
+    ///     - order: Sort order for bookings (ascending or descending).
     ///
     public func loadAllBookings(for siteID: Int64,
                                 pageNumber: Int = Default.pageNumber,
                                 pageSize: Int = Default.pageSize,
                                 startDateBefore: String? = nil,
-                                startDateAfter: String? = nil) async throws -> [Booking] {
+                                startDateAfter: String? = nil,
+                                searchQuery: String? = nil,
+                                order: Order) async throws -> [Booking] {
         var parameters = [
             ParameterKey.page: String(pageNumber),
-            ParameterKey.perPage: String(pageSize)
+            ParameterKey.perPage: String(pageSize),
+            ParameterKey.order: order.rawValue
         ]
 
         if let startDateBefore = startDateBefore {
@@ -46,12 +56,34 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
             parameters[ParameterKey.startDateAfter] = startDateAfter
         }
 
+        if let searchQuery = searchQuery, !searchQuery.isEmpty {
+            parameters[ParameterKey.search] = searchQuery
+        }
+
         let path = Path.bookings
         let request = JetpackRequest(wooApiVersion: .wcBookings, method: .get, siteID: siteID, path: path, parameters: parameters, availableAsRESTRequest: true)
         let mapper = ListMapper<Booking>(siteID: siteID)
 
         return try await enqueue(request, mapper: mapper)
     }
+
+    public func loadBooking(
+        bookingID: Int64,
+        siteID: Int64
+    ) async throws -> Booking? {
+        let path = "\(Path.bookings)/\(bookingID)"
+        let request = JetpackRequest(
+            wooApiVersion: .wcBookings,
+            method: .get,
+            siteID: siteID,
+            path: path,
+            availableAsRESTRequest: true
+        )
+
+        let mapper = BookingMapper(siteID: siteID)
+
+        return try await enqueue(request, mapper: mapper)
+    }
 }
 
 // MARK: - Constants
@@ -62,6 +94,11 @@ public extension BookingsRemote {
         public static let pageNumber: Int = Remote.Default.firstPageNumber
     }
 
+    enum Order: String {
+        case ascending = "asc"
+        case descending = "desc"
+    }
+
     private enum Path {
         static let bookings = "bookings"
     }
@@ -71,5 +108,7 @@ public extension BookingsRemote {
         static let perPage: String         = "per_page"
         static let startDateBefore: String = "start_date_before"
         static let startDateAfter: String  = "start_date_after"
+        static let search: String          = "search"
+        static let order: String           = "order"
     }
 }

Modules/Sources/NetworkingCore/Remote/OrdersRemote.swift

@@ -1,8 +1,15 @@
 import Foundation
 
+public protocol OrdersRemoteProtocol {
+    func loadOrders(
+        for siteID: Int64,
+        orderIDs: [Int64]
+    ) async throws -> [Order]
+}
+
 /// Order: Remote Endpoints
 ///
-public class OrdersRemote: Remote {
+public class OrdersRemote: Remote, OrdersRemoteProtocol {
     /// The source of the order creation.
     public enum OrderCreationSource {
         case storeManagement
@@ -111,6 +118,41 @@ public class OrdersRemote: Remote {
         enqueue(request, mapper: mapper, completion: completion)
     }
 
+    /// Retrieves specific `Order`s.
+    ///
+    /// - Parameters:
+    ///     - siteID: Site for which we'll fetch remote orders.
+    ///     - orderIDs: The IDs of the orders to fetch.
+    /// - Returns: Array of orders.
+    /// - Throws: Network or parsing errors.
+    ///
+    public func loadOrders(
+        for siteID: Int64,
+        orderIDs: [Int64]
+    ) async throws -> [Order] {
+        guard !orderIDs.isEmpty else {
+            return []
+        }
+
+        let parameters: [String: Any] = [
+            ParameterKeys.include: Set(orderIDs).map(String.init).joined(separator: ","),
+            ParameterKeys.fields: ParameterValues.fieldValues
+        ]
+
+        let path = Constants.ordersPath
+        let request = JetpackRequest(
+            wooApiVersion: .mark3,
+            method: .get,
+            siteID: siteID,
+            path: path,
+            parameters: parameters,
+            availableAsRESTRequest: true
+        )
+        let mapper = OrderListMapper(siteID: siteID)
+
+        return try await enqueue(request, mapper: mapper)
+    }
+
     /// Retrieves the notes for a specific `Order`
     ///
     /// - Parameters:
@@ -534,6 +576,7 @@ public extension OrdersRemote {
         static let addedByUser: String      = "added_by_user"
         static let customerNote: String     = "customer_note"
         static let keyword: String          = "search"
+        static let include: String          = "include"
         static let note: String             = "note"
         static let page: String             = "page"
         static let perPage: String          = "per_page"

Modules/Sources/Storage/Model/Booking/Booking+CoreDataProperties.swift

@@ -21,5 +21,5 @@ extension Booking {
     @NSManaged public var statusKey: String?
     @NSManaged public var localTimezone: String?
     @NSManaged public var currency: String?
-
+    @NSManaged public var orderInfo: BookingOrderInfo?
 }

Modules/Sources/Storage/Model/Booking/BookingCustomerInfo+CoreDataClass.swift

@@ -0,0 +1,7 @@
+import Foundation
+import CoreData
+
+@objc(BookingCustomerInfo)
+public class BookingCustomerInfo: NSManagedObject {
+
+}

Modules/Sources/Storage/Model/Booking/BookingCustomerInfo+CoreDataProperties.swift

@@ -0,0 +1,18 @@
+import Foundation
+import CoreData
+
+extension BookingCustomerInfo {
+    @NSManaged public var billingAddress1: String?
+    @NSManaged public var billingAddress2: String?
+    @NSManaged public var billingCity: String?
+    @NSManaged public var billingCompany: String?
+    @NSManaged public var billingCountry: String?
+    @NSManaged public var billingEmail: String?
+    @NSManaged public var billingFirstName: String?
+    @NSManaged public var billingLastName: String?
+    @NSManaged public var billingPhone: String?
+    @NSManaged public var billingPostcode: String?
+    @NSManaged public var billingState: String?
+    @NSManaged public var orderInfo: BookingOrderInfo?
+
+}

Modules/Sources/Storage/Model/Booking/BookingOrderInfo+CoreDataClass.swift

@@ -0,0 +1,7 @@
+import Foundation
+import CoreData
+
+@objc(BookingOrderInfo)
+public class BookingOrderInfo: NSManagedObject {
+
+}

Modules/Sources/Storage/Model/Booking/BookingOrderInfo+CoreDataProperties.swift

@@ -0,0 +1,11 @@
+import Foundation
+import CoreData
+
+extension BookingOrderInfo {
+    @NSManaged public var statusKey: String?
+    @NSManaged public var paymentInfo: BookingPaymentInfo?
+    @NSManaged public var customerInfo: BookingCustomerInfo?
+    @NSManaged public var productInfo: BookingProductInfo?
+    @NSManaged public var booking: Booking?
+
+}

Modules/Sources/Storage/Model/Booking/BookingPaymentInfo+CoreDataClass.swift

@@ -0,0 +1,7 @@
+import Foundation
+import CoreData
+
+@objc(BookingPaymentInfo)
+public class BookingPaymentInfo: NSManagedObject {
+
+}

Modules/Sources/Storage/Model/Booking/BookingPaymentInfo+CoreDataProperties.swift

@@ -0,0 +1,12 @@
+import Foundation
+import CoreData
+
+extension BookingPaymentInfo {
+    @NSManaged public var paymentMethodID: String?
+    @NSManaged public var paymentMethodTitle: String?
+    @NSManaged public var subtotal: String?
+    @NSManaged public var subtotalTax: String?
+    @NSManaged public var total: String?
+    @NSManaged public var totalTax: String?
+    @NSManaged public var orderInfo: BookingOrderInfo?
+}