Merge branch 'woomob-1112-woo-poslocal-catalog-local-search-strategy' into woomob-1112-woo-poslocal-catalog-factory-integration

Author: joshheald

Modules/.swiftpm/xcode/xcshareddata/xcschemes/Networking.xcscheme

@@ -33,6 +33,9 @@
             reference = "container:Tests/NetworkingTests/NetworkingTests.xctestplan"
             default = "YES">
          </TestPlanReference>
+         <TestPlanReference
+            reference = "container:Tests/NetworkingTests/RequestAuthenticatorPressureTests.xctestplan">
+         </TestPlanReference>
       </TestPlans>
    </TestAction>
    <LaunchAction

Modules/Sources/Fakes/Networking.generated.swift

@@ -814,6 +814,7 @@ extension Networking.POSProduct {
             manageStock: .fake(),
             stockQuantity: .fake(),
             stockStatusKey: .fake(),
+            statusKey: .fake(),
             variationIDs: .fake()
         )
     }

Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -1371,6 +1371,7 @@ extension Networking.POSProduct {
         manageStock: CopiableProp<Bool> = .copy,
         stockQuantity: NullableCopiableProp<Decimal> = .copy,
         stockStatusKey: CopiableProp<String> = .copy,
+        statusKey: CopiableProp<String> = .copy,
         variationIDs: CopiableProp<[Int64]> = .copy
     ) -> Networking.POSProduct {
         let siteID = siteID ?? self.siteID
@@ -1389,6 +1390,7 @@ extension Networking.POSProduct {
         let manageStock = manageStock ?? self.manageStock
         let stockQuantity = stockQuantity ?? self.stockQuantity
         let stockStatusKey = stockStatusKey ?? self.stockStatusKey
+        let statusKey = statusKey ?? self.statusKey
         let variationIDs = variationIDs ?? self.variationIDs
 
         return Networking.POSProduct(
@@ -1408,6 +1410,7 @@ extension Networking.POSProduct {
             manageStock: manageStock,
             stockQuantity: stockQuantity,
             stockStatusKey: stockStatusKey,
+            statusKey: statusKey,
             variationIDs: variationIDs
         )
     }

Modules/Sources/Networking/Model/POSProduct.swift

@@ -43,6 +43,12 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
     public let stockQuantity: Decimal?
     public let stockStatusKey: String
 
+    public let statusKey: String
+
+    public var productStatus: ProductStatus {
+        return ProductStatus(rawValue: statusKey)
+    }
+
     public let variationIDs: [Int64]
 
     public init(siteID: Int64,
@@ -61,6 +67,7 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
                 manageStock: Bool,
                 stockQuantity: Decimal?,
                 stockStatusKey: String,
+                statusKey: String,
                 variationIDs: [Int64]) {
         self.siteID = siteID
         self.productID = productID
@@ -85,6 +92,8 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
         self.stockQuantity = stockQuantity
         self.stockStatusKey = stockStatusKey
 
+        self.statusKey = statusKey
+
         self.variationIDs = variationIDs
     }
 
@@ -129,6 +138,8 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
         let stockQuantity = container.failsafeDecodeIfPresent(decimalForKey: .stockQuantity)
         let stockStatusKey = try container.decode(String.self, forKey: .stockStatusKey)
 
+        let statusKey = try container.decode(String.self, forKey: .statusKey)
+
         let variationIDs = try container.decodeIfPresent([Int64].self, forKey: .variationIDs) ?? []
 
         self.init(siteID: siteID,
@@ -147,6 +158,7 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
                   manageStock: manageStock,
                   stockQuantity: stockQuantity,
                   stockStatusKey: stockStatusKey,
+                  statusKey: statusKey,
                   variationIDs: variationIDs)
     }
 
@@ -180,6 +192,7 @@ private extension POSProduct {
         case manageStock = "manage_stock"
         case stockQuantity = "stock_quantity"
         case stockStatusKey = "stock_status"
+        case statusKey = "status"
         case variationIDs = "variations"
     }
 }

Modules/Sources/Networking/Model/Product/ProductStatus.swift

@@ -10,6 +10,7 @@ public enum ProductStatus: Codable, Hashable, GeneratedFakeable {
     case privateStatus  // `private` is a reserved keyword
     case autoDraft
     case importing      // used for placeholder products from a product import or template
+    case trash
     case custom(String) // in case there are extensions modifying product statuses
 }
 
@@ -34,6 +35,8 @@ extension ProductStatus: RawRepresentable {
             self = .autoDraft
         case Keys.importing:
             self = .importing
+        case Keys.trash:
+            self = .trash
         default:
             self = .custom(rawValue)
         }
@@ -49,6 +52,7 @@ extension ProductStatus: RawRepresentable {
         case .privateStatus:        return Keys.privateStatus
         case .autoDraft:            return Keys.autoDraft
         case .importing:            return Keys.importing
+        case .trash:                return Keys.trash
         case .custom(let payload):  return payload
         }
     }
@@ -69,6 +73,8 @@ extension ProductStatus: RawRepresentable {
             return "Auto Draft" // We don't need to localize this now.
         case .importing:
             return "Importing" // We don't need to localize this now.
+        case .trash:
+            return "Trash" // We don't need to localize this now.
         case .custom(let payload):
             return payload // unable to localize at runtime.
         }
@@ -85,4 +91,5 @@ private enum Keys {
     static let privateStatus = "private"
     static let autoDraft     = "auto-draft"
     static let importing     = "importing"
+    static let trash         = "trash"
 }

Modules/Sources/Networking/Model/Product/ProductType.swift

@@ -105,5 +105,5 @@ private enum Keys {
     static let variableSubscription = "variable-subscription"
     static let bundle               = "bundle"
     static let composite            = "composite"
-    static let booking              = "booking"
+    static let booking              = "bookable-service"
 }

Modules/Sources/Networking/Remote/BookingsRemote.swift

@@ -20,7 +20,8 @@ public protocol BookingsRemoteProtocol {
         from siteID: Int64,
         bookingID: Int64,
         attendanceStatus: BookingAttendanceStatus?,
-        bookingStatus: BookingStatus?
+        bookingStatus: BookingStatus?,
+        note: String?
     ) async throws -> Booking?
 
     func fetchResource(resourceID: Int64,
@@ -158,7 +159,8 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
         from siteID: Int64,
         bookingID: Int64,
         attendanceStatus: BookingAttendanceStatus?,
-        bookingStatus: BookingStatus?
+        bookingStatus: BookingStatus?,
+        note: String?
     ) async throws -> Booking? {
         let path = "\(Path.bookings)/\(bookingID)"
         var parameters: [String: String] = [:]
@@ -171,6 +173,10 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
             parameters[ParameterKey.status] = bookingStatus.rawValue
         }
 
+        if let note {
+            parameters[ParameterKey.note] = note
+        }
+
         let request = JetpackRequest(
             wooApiVersion: .wcBookings,
             method: .put,
@@ -265,5 +271,6 @@ public extension BookingsRemote {
         static let attendanceStatus        = "attendance_status"
         static let paymentStatus           = "booking_status" // to be updated later when payment filtering is supported
         static let status: String          = "status"
+        static let note: String            = "note"
     }
 }

Modules/Sources/Networking/Remote/POSCatalogSyncRemote.swift

@@ -9,10 +9,11 @@ public protocol POSCatalogSyncRemoteProtocol {
     ///   - modifiedAfter: Only products modified after this date will be returned.
     ///   - siteID: Site ID to load products from.
     ///   - pageNumber: Page number for pagination.
+    ///   - includeStatus: Optional status to include (e.g., "trash" to fetch trashed products).
     /// - Returns: Paginated list of POS products.
     // TODO - remove the periphery ignore comment when the incremental sync is integrated with POS.
     // periphery:ignore
-    func loadProducts(modifiedAfter: Date, siteID: Int64, pageNumber: Int) async throws -> PagedItems<POSProduct>
+    func loadProducts(modifiedAfter: Date, siteID: Int64, pageNumber: Int, includeStatus: String?) async throws -> PagedItems<POSProduct>
 
     /// Loads POS product variations modified after the specified date for incremental sync.
     ///
@@ -109,18 +110,23 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
     ///   - modifiedAfter: Only products modified after this date will be returned.
     ///   - siteID: Site ID to load products from.
     ///   - pageNumber: Page number for pagination.
+    ///   - includeStatus: Optional status to include (e.g., "trash" to fetch trashed products).
     /// - Returns: Paginated list of POS products.
     ///
-    public func loadProducts(modifiedAfter: Date, siteID: Int64, pageNumber: Int)
+    public func loadProducts(modifiedAfter: Date, siteID: Int64, pageNumber: Int, includeStatus: String? = nil)
     async throws -> PagedItems<POSProduct> {
         let path = Path.products
-        let parameters = [
+        var parameters: [String: String] = [
             ParameterKey.modifiedAfter: dateFormatter.string(from: modifiedAfter),
             ParameterKey.page: String(pageNumber),
             ParameterKey.perPage: String(Constants.defaultPageSize),
             ParameterKey.fields: POSProduct.requestFields.joined(separator: ",")
         ]
 
+        if let includeStatus = includeStatus {
+            parameters[ParameterKey.includeStatus] = includeStatus
+        }
+
         let request = JetpackRequest(
             wooApiVersion: .mark3,
             method: .get,
@@ -399,6 +405,7 @@ private extension POSCatalogSyncRemote {
         static let fields = "_fields"
         static let fullSyncFields = "fields"
         static let forceGenerate = "force_generate"
+        static let includeStatus = "include_status"
     }
 
     enum Path {