Merge branch 'trunk' into woomob-1131-woo-poshistorical-orders-orders-fetching

Author: staskus

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -95,7 +95,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .pointOfSaleOrdersi2:
             return true
         case .pointOfSaleSettingsi1:
-            return false
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .orderAddressMapSearch:
             return true
         case .pointOfSaleHistoricalOrdersi1:

Modules/Sources/Fakes/Networking.generated.swift

@@ -1776,7 +1776,8 @@ extension Networking.Site {
             canBlaze: .fake(),
             isAdmin: .fake(),
             wasEcommerceTrial: .fake(),
-            hasSSOEnabled: .fake()
+            hasSSOEnabled: .fake(),
+            applicationPasswordAvailable: .fake()
         )
     }
 }
@@ -2015,22 +2016,6 @@ extension Networking.UploadableMedia {
         )
     }
 }
-extension Networking.User {
-    /// Returns a "ready to use" type filled with fake values.
-    ///
-    public static func fake() -> Networking.User {
-        .init(
-            localID: .fake(),
-            siteID: .fake(),
-            email: .fake(),
-            username: .fake(),
-            firstName: .fake(),
-            lastName: .fake(),
-            nickname: .fake(),
-            roles: .fake()
-        )
-    }
-}
 extension Networking.WCAnalyticsCustomer {
     /// Returns a "ready to use" type filled with fake values.
     ///

Modules/Sources/Fakes/NetworkingCore.generated.swift

@@ -575,3 +575,19 @@ extension NetworkingCore.StatsGranularityV4 {
         .hourly
     }
 }
+extension NetworkingCore.User {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> NetworkingCore.User {
+        .init(
+            localID: .fake(),
+            siteID: .fake(),
+            email: .fake(),
+            username: .fake(),
+            firstName: .fake(),
+            lastName: .fake(),
+            nickname: .fake(),
+            roles: .fake()
+        )
+    }
+}

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

@@ -2754,7 +2754,8 @@ extension Networking.Site {
         canBlaze: CopiableProp<Bool> = .copy,
         isAdmin: CopiableProp<Bool> = .copy,
         wasEcommerceTrial: CopiableProp<Bool> = .copy,
-        hasSSOEnabled: CopiableProp<Bool> = .copy
+        hasSSOEnabled: CopiableProp<Bool> = .copy,
+        applicationPasswordAvailable: CopiableProp<Bool> = .copy
     ) -> Networking.Site {
         let siteID = siteID ?? self.siteID
         let name = name ?? self.name
@@ -2778,6 +2779,7 @@ extension Networking.Site {
         let isAdmin = isAdmin ?? self.isAdmin
         let wasEcommerceTrial = wasEcommerceTrial ?? self.wasEcommerceTrial
         let hasSSOEnabled = hasSSOEnabled ?? self.hasSSOEnabled
+        let applicationPasswordAvailable = applicationPasswordAvailable ?? self.applicationPasswordAvailable
 
         return Networking.Site(
             siteID: siteID,
@@ -2801,7 +2803,8 @@ extension Networking.Site {
             canBlaze: canBlaze,
             isAdmin: isAdmin,
             wasEcommerceTrial: wasEcommerceTrial,
-            hasSSOEnabled: hasSSOEnabled
+            hasSSOEnabled: hasSSOEnabled,
+            applicationPasswordAvailable: applicationPasswordAvailable
         )
     }
 }
@@ -3097,39 +3100,6 @@ extension Networking.TopEarnerStatsItem {
     }
 }
 
-extension Networking.User {
-    public func copy(
-        localID: CopiableProp<Int64> = .copy,
-        siteID: CopiableProp<Int64> = .copy,
-        email: CopiableProp<String> = .copy,
-        username: CopiableProp<String> = .copy,
-        firstName: CopiableProp<String> = .copy,
-        lastName: CopiableProp<String> = .copy,
-        nickname: CopiableProp<String> = .copy,
-        roles: CopiableProp<[String]> = .copy
-    ) -> Networking.User {
-        let localID = localID ?? self.localID
-        let siteID = siteID ?? self.siteID
-        let email = email ?? self.email
-        let username = username ?? self.username
-        let firstName = firstName ?? self.firstName
-        let lastName = lastName ?? self.lastName
-        let nickname = nickname ?? self.nickname
-        let roles = roles ?? self.roles
-
-        return Networking.User(
-            localID: localID,
-            siteID: siteID,
-            email: email,
-            username: username,
-            firstName: firstName,
-            lastName: lastName,
-            nickname: nickname,
-            roles: roles
-        )
-    }
-}
-
 extension Networking.WCAnalyticsCustomer {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,

Modules/Sources/Networking/Model/Site.swift

@@ -92,6 +92,10 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
     ///
     public let hasSSOEnabled: Bool
 
+    /// Whether application password authentication is available
+    /// periphery: ignore - to be used as part of WOOMOB-1123
+    public let applicationPasswordAvailable: Bool
+
     /// Decodable Conformance.
     ///
     public init(from decoder: Decoder) throws {
@@ -156,7 +160,8 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
                   canBlaze: canBlaze,
                   isAdmin: isAdmin,
                   wasEcommerceTrial: wasEcommerceTrial,
-                  hasSSOEnabled: hasSSOEnabled)
+                  hasSSOEnabled: hasSSOEnabled,
+                  applicationPasswordAvailable: false) // to be updated by fetching SiteAPI
     }
 
     /// Designated Initializer.
@@ -182,7 +187,8 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
                 canBlaze: Bool,
                 isAdmin: Bool,
                 wasEcommerceTrial: Bool,
-                hasSSOEnabled: Bool) {
+                hasSSOEnabled: Bool,
+                applicationPasswordAvailable: Bool) {
         self.siteID = siteID
         self.name = name
         self.description = description
@@ -205,6 +211,7 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
         self.isAdmin = isAdmin
         self.wasEcommerceTrial = wasEcommerceTrial
         self.hasSSOEnabled = hasSSOEnabled
+        self.applicationPasswordAvailable = applicationPasswordAvailable
     }
 }
 

Modules/Sources/Networking/Model/WordPressSite.swift

@@ -109,7 +109,8 @@ public extension WordPressSite {
               canBlaze: false,
               isAdmin: false,
               wasEcommerceTrial: false,
-              hasSSOEnabled: false)
+              hasSSOEnabled: false,
+              applicationPasswordAvailable: false)
     }
 
     struct Authentication: Decodable {

Modules/Sources/Networking/Remote/POSCatalogSyncRemote.swift

@@ -55,6 +55,64 @@ public class POSCatalogSyncRemote: Remote {
 
         return createPagedItems(items: variations, responseHeaders: responseHeaders, currentPageNumber: pageNumber)
     }
+
+    /// Generates a POS catalog. The catalog is generated asynchronously and a download URL is returned in the
+    /// status response endpoint associated with a job ID.
+    ///
+    /// - Parameters:
+    ///   - siteID: Site ID to generate catalog for.
+    ///   - fields: Optional array of fields to include in catalog.
+    ///   - forceGenerate: Whether to force generation of a new catalog.
+    /// - Returns: Catalog job response with job ID.
+    ///
+    // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
+    public func generateCatalog(for siteID: Int64, forceGenerate: Bool = false) async throws -> POSCatalogGenerationResponse {
+        let path = "catalog"
+        let parameters: [String: Any] = [
+            ParameterKey.fullSyncFields: POSProduct.requestFields
+        ]
+
+        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: path, parameters: parameters, availableAsRESTRequest: true)
+        let mapper = SingleItemMapper<POSCatalogGenerationResponse>(siteID: siteID)
+        return try await enqueue(request, mapper: mapper)
+    }
+
+    /// Checks the status of a catalog generation job. A download URL is returned when the job is complete.
+    ///
+    /// - Parameters:
+    ///   - siteID: Site ID for the catalog job.
+    ///   - jobID: Job ID to check status for.
+    /// - Returns: Catalog status response.
+    ///
+    // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
+    public func checkCatalogStatus(for siteID: Int64, jobID: String) async throws -> POSCatalogStatusResponse {
+        let path = "catalog/status/\(jobID)"
+
+        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: path, availableAsRESTRequest: true)
+        let mapper = SingleItemMapper<POSCatalogStatusResponse>(siteID: siteID)
+        return try await enqueue(request, mapper: mapper)
+    }
+
+    /// Downloads the generated catalog at the specified download URL.
+    /// - Parameters:
+    ///   - siteID: Site ID to download catalog for.
+    ///   - downloadURL: Download URL of the catalog file.
+    /// - Returns: List of products and variations in the POS catalog.
+    // periphery:ignore - TODO - remove this periphery ignore comment when this method is integrated with catalog sync
+    public func downloadCatalog(for siteID: Int64, downloadURL: String) async throws -> POSCatalog {
+        // TODO: WOOMOB-1173 - move download task to the background using `URLSessionConfiguration.background`
+        guard let url = URL(string: downloadURL) else {
+            throw NetworkError.invalidURL
+        }
+        let request = URLRequest(url: url)
+        let mapper = ListMapper<POSProduct>(siteID: siteID)
+        let items = try await enqueue(request, mapper: mapper)
+        let variationProductTypeKey = "variation"
+        let products = items.filter { $0.productTypeKey != variationProductTypeKey }
+        let variations = items.filter { $0.productTypeKey == variationProductTypeKey }
+            .map { $0.toVariation }
+        return POSCatalog(products: products, variations: variations)
+    }
 }
 
 // MARK: - Constants
@@ -69,5 +127,78 @@ private extension POSCatalogSyncRemote {
         static let page = "page"
         static let perPage = "per_page"
         static let fields = "_fields"
+        static let fullSyncFields = "fields"
+    }
+}
+
+// MARK: - Response Models
+
+/// Response from catalog generation request.
+// periphery:ignore - TODO - remove this periphery ignore comment when the corresponding endpoint is integrated with catalog sync
+public struct POSCatalogGenerationResponse: Decodable {
+    /// Unique identifier for tracking the catalog generation job.
+    public let jobID: String
+
+    private enum CodingKeys: String, CodingKey {
+        case jobID = "job_id"
+    }
+}
+
+/// Response from catalog status check.
+// periphery:ignore - TODO - remove this periphery ignore comment when the corresponding endpoint is integrated with catalog sync
+public struct POSCatalogStatusResponse: Decodable {
+    /// Current status of the catalog generation job.
+    public let status: POSCatalogStatus
+    /// Download URL for the completed catalog (available when status is complete).
+    public let downloadURL: String?
+    /// Progress percentage of the catalog generation (0.0 to 100.0).
+    public let progress: Double
+
+    private enum CodingKeys: String, CodingKey {
+        case status
+        case downloadURL = "download_url"
+        case progress
+    }
+}
+
+/// Catalog generation status.
+public enum POSCatalogStatus: String, Decodable {
+    case pending
+    case processing
+    case complete
+}
+
+/// POS catalog from download.
+// periphery:ignore - TODO - remove this periphery ignore comment when the corresponding endpoint is integrated with catalog sync
+public struct POSCatalog {
+    public let products: [POSProduct]
+    public let variations: [POSProductVariation]
+}
+
+private extension POSProduct {
+    var toVariation: POSProductVariation {
+        let variationAttributes = attributes.compactMap { attribute in
+            try? attribute.toProductVariationAttribute()
+        }
+
+        let firstImage = images.first
+
+        return .init(
+            siteID: siteID,
+            productID: parentID,
+            productVariationID: productID,
+            attributes: variationAttributes,
+            image: firstImage,
+            sku: sku,
+            globalUniqueID: globalUniqueID,
+            price: price,
+            regularPrice: regularPrice,
+            salePrice: salePrice,
+            onSale: onSale,
+            downloadable: downloadable,
+            manageStock: manageStock,
+            stockQuantity: stockQuantity,
+            stockStatusKey: stockStatusKey
+        )
     }
 }