Merge branch 'trunk' into adborbas/woomob-1611

Author: adborbas

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -100,8 +100,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pointOfSaleSurveys:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .pointOfSaleSettingsCardReaderFlow:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pointOfSaleCatalogAPI:
             return false
         default:

Modules/Sources/Experiments/FeatureFlag.swift

@@ -208,10 +208,6 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleSurveys
 
-    /// Enables card reader connection flow within POS settings
-    ///
-    case pointOfSaleSettingsCardReaderFlow
-
     /// Enables using the catalog API endpoint for Point of Sale catalog full sync
     ///
     case pointOfSaleCatalogAPI

Modules/Sources/Fakes/Networking.generated.swift

@@ -812,7 +812,8 @@ extension Networking.POSProduct {
             attributes: .fake(),
             manageStock: .fake(),
             stockQuantity: .fake(),
-            stockStatusKey: .fake()
+            stockStatusKey: .fake(),
+            variationIDs: .fake()
         )
     }
 }

Modules/Sources/Fakes/Yosemite.generated.swift

@@ -76,6 +76,15 @@ extension Yosemite.ProductReviewFromNoteParcel {
         )
     }
 }
+extension Yosemite.StoredBookingFilters {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Yosemite.StoredBookingFilters {
+        .init(
+            filters: .fake()
+        )
+    }
+}
 extension Yosemite.SystemInformation {
     /// Returns a "ready to use" type filled with fake values.
     ///

Modules/Sources/Networking/Model/Bookings/Booking.swift

@@ -216,7 +216,7 @@ enum BookingDecodingError: Error {
 //
 
 /// Represents a Booking Status.
-public enum BookingStatus: String, CaseIterable {
+public enum BookingStatus: String, CaseIterable, Codable {
     case complete
     case paid
     case unpaid
@@ -226,7 +226,7 @@ public enum BookingStatus: String, CaseIterable {
     case unknown
 }
 
-public enum BookingAttendanceStatus: String, CaseIterable {
+public enum BookingAttendanceStatus: String, CaseIterable, Codable {
     case booked
     case checkedIn = "checked-in"
     case cancelled

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

@@ -436,8 +436,8 @@ extension Networking.Booking {
         allDay: CopiableProp<Bool> = .copy,
         cost: CopiableProp<String> = .copy,
         customerID: CopiableProp<Int64> = .copy,
-        dateCreated: CopiableProp<Date> = .copy,
-        dateModified: CopiableProp<Date> = .copy,
+        dateCreated: NullableCopiableProp<Date> = .copy,
+        dateModified: NullableCopiableProp<Date> = .copy,
         endDate: CopiableProp<Date> = .copy,
         googleCalendarEventID: NullableCopiableProp<String> = .copy,
         orderID: CopiableProp<Int64> = .copy,
@@ -1367,7 +1367,8 @@ extension Networking.POSProduct {
         attributes: CopiableProp<[ProductAttribute]> = .copy,
         manageStock: CopiableProp<Bool> = .copy,
         stockQuantity: NullableCopiableProp<Decimal> = .copy,
-        stockStatusKey: CopiableProp<String> = .copy
+        stockStatusKey: CopiableProp<String> = .copy,
+        variationIDs: CopiableProp<[Int64]> = .copy
     ) -> Networking.POSProduct {
         let siteID = siteID ?? self.siteID
         let productID = productID ?? self.productID
@@ -1385,6 +1386,7 @@ extension Networking.POSProduct {
         let manageStock = manageStock ?? self.manageStock
         let stockQuantity = stockQuantity ?? self.stockQuantity
         let stockStatusKey = stockStatusKey ?? self.stockStatusKey
+        let variationIDs = variationIDs ?? self.variationIDs
 
         return Networking.POSProduct(
             siteID: siteID,
@@ -1402,7 +1404,8 @@ extension Networking.POSProduct {
             attributes: attributes,
             manageStock: manageStock,
             stockQuantity: stockQuantity,
-            stockStatusKey: stockStatusKey
+            stockStatusKey: stockStatusKey,
+            variationIDs: variationIDs
         )
     }
 }

Modules/Sources/Networking/Model/POSProduct.swift

@@ -43,6 +43,8 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
     public let stockQuantity: Decimal?
     public let stockStatusKey: String
 
+    public let variationIDs: [Int64]
+
     public init(siteID: Int64,
                 productID: Int64,
                 name: String,
@@ -58,7 +60,8 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
                 attributes: [ProductAttribute],
                 manageStock: Bool,
                 stockQuantity: Decimal?,
-                stockStatusKey: String) {
+                stockStatusKey: String,
+                variationIDs: [Int64]) {
         self.siteID = siteID
         self.productID = productID
         self.name = name
@@ -81,6 +84,8 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
         self.manageStock = manageStock
         self.stockQuantity = stockQuantity
         self.stockStatusKey = stockStatusKey
+
+        self.variationIDs = variationIDs
     }
 
     public init(from decoder: any Decoder) throws {
@@ -124,6 +129,8 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
         let stockQuantity = container.failsafeDecodeIfPresent(decimalForKey: .stockQuantity)
         let stockStatusKey = try container.decode(String.self, forKey: .stockStatusKey)
 
+        let variationIDs = try container.decodeIfPresent([Int64].self, forKey: .variationIDs) ?? []
+
         self.init(siteID: siteID,
                   productID: productID,
                   name: name,
@@ -139,7 +146,8 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
                   attributes: attributes,
                   manageStock: manageStock,
                   stockQuantity: stockQuantity,
-                  stockStatusKey: stockStatusKey)
+                  stockStatusKey: stockStatusKey,
+                  variationIDs: variationIDs)
     }
 
     static let requestFields: [String] = {
@@ -172,5 +180,6 @@ private extension POSProduct {
         case manageStock = "manage_stock"
         case stockQuantity = "stock_quantity"
         case stockStatusKey = "stock_status"
+        case variationIDs = "variations"
     }
 }

Modules/Sources/Networking/Model/Site.swift

@@ -117,7 +117,7 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
         let siteID = try siteContainer.decode(Int64.self, forKey: .siteID)
         let name = try siteContainer.decode(String.self, forKey: .name)
         let description = try siteContainer.decode(String.self, forKey: .description)
-        let url = try siteContainer.decode(String.self, forKey: .url)
+        let url = Self.safeURL(try siteContainer.decode(String.self, forKey: .url))
         let capabilitiesContainer = try siteContainer.nestedContainer(keyedBy: CapabilitiesKeys.self, forKey: .capabilities)
         let isSiteOwner = try capabilitiesContainer.decode(Bool.self, forKey: .isSiteOwner)
         let isAdmin = try capabilitiesContainer.decode(Bool.self, forKey: .isAdmin)
@@ -130,8 +130,8 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
         let jetpackConnectionActivePlugins = try optionsContainer.decodeIfPresent([String].self, forKey: .jetpackConnectionActivePlugins) ?? []
         let timezone = try optionsContainer.decode(String.self, forKey: .timezone)
         let gmtOffset = try optionsContainer.decode(Double.self, forKey: .gmtOffset)
-        let adminURL = try optionsContainer.decode(String.self, forKey: .adminURL)
-        let loginURL = try optionsContainer.decode(String.self, forKey: .loginURL)
+        let adminURL = Self.safeURL(try optionsContainer.decode(String.self, forKey: .adminURL))
+        let loginURL = Self.safeURL(try optionsContainer.decode(String.self, forKey: .loginURL))
         let frameNonce = try optionsContainer.decode(String.self, forKey: .frameNonce)
         let canBlaze = optionsContainer.failsafeDecodeIfPresent(booleanForKey: .canBlaze) ?? false
         let visibility = optionsContainer.failsafeDecodeIfPresent(SiteVisibility.self, forKey: .visibility) ?? .privateSite
@@ -333,7 +333,8 @@ public enum SiteVisibility: Int, Codable, GeneratedFakeable {
 ///
 public extension Site {
 
-    private var jetpackCanonicalURL: String {
+    /// Force URL to use HTTPS if possible to avoid App Transport Security errors
+    private static func safeURL(_ url: String) -> String {
         guard let originalURL = URL(string: url),
               originalURL.scheme?.lowercased() == "http"
         else {
@@ -360,7 +361,7 @@ public extension Site {
     }
 
     func toJetpackSite() -> JetpackSite {
-        JetpackSite(siteID: siteID, siteAddress: jetpackCanonicalURL, applicationPasswordAvailable: applicationPasswordAvailable)
+        JetpackSite(siteID: siteID, siteAddress: url, applicationPasswordAvailable: applicationPasswordAvailable)
     }
 }
 

Modules/Sources/Networking/Remote/POSCatalogSyncRemote.swift

@@ -30,34 +30,39 @@ public protocol POSCatalogSyncRemoteProtocol {
     /// - Parameters:
     ///   - siteID: Site ID to generate catalog for.
     ///   - forceGeneration: Whether to always generate a catalog.
+    ///   - allowCellular: Should cellular data be used if required.
     /// - Returns: Catalog job response with job ID.
     ///
     // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
-    func requestCatalogGeneration(for siteID: Int64, forceGeneration: Bool) async throws -> POSCatalogRequestResponse
+    func requestCatalogGeneration(for siteID: Int64, forceGeneration: Bool, allowCellular: Bool) async throws -> POSCatalogRequestResponse
 
     /// Downloads the generated catalog at the specified download URL.
     /// - Parameters:
     ///   - siteID: Site ID to download catalog for.
     ///   - downloadURL: Download URL of the catalog file.
+    ///   - allowCellular: Should cellular data be used if required.
     /// - Returns: List of products and variations in the POS catalog.
-    // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
-    func downloadCatalog(for siteID: Int64, downloadURL: String) async throws -> POSCatalogResponse
+    func downloadCatalog(for siteID: Int64,
+                         downloadURL: String,
+                         allowCellular: Bool) async throws -> POSCatalogResponse
 
     /// Loads POS products for full sync.
     ///
     /// - Parameters:
     ///   - siteID: Site ID to load products from.
     ///   - pageNumber: Page number for pagination.
+    ///   - allowCellular: Should cellular data be used if required.
     /// - Returns: Paginated list of POS products.
-    func loadProducts(siteID: Int64, pageNumber: Int) async throws -> PagedItems<POSProduct>
+    func loadProducts(siteID: Int64, pageNumber: Int, allowCellular: Bool) async throws -> PagedItems<POSProduct>
 
     /// Loads POS product variations for full sync.
     ///
     /// - Parameters:
     ///   - siteID: Site ID to load variations from.
     ///   - pageNumber: Page number for pagination.
+    ///   - allowCellular: Should cellular data be used if required.
     /// - Returns: Paginated list of POS product variations.
-    func loadProductVariations(siteID: Int64, pageNumber: Int) async throws -> PagedItems<POSProductVariation>
+    func loadProductVariations(siteID: Int64, pageNumber: Int, allowCellular: Bool) async throws -> PagedItems<POSProductVariation>
 
     /// Gets the total count of products for the specified site.
     ///
@@ -87,7 +92,6 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
     ///   - pageNumber: Page number for pagination.
     /// - Returns: Paginated list of POS products.
     ///
-    // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
     public func loadProducts(modifiedAfter: Date, siteID: Int64, pageNumber: Int)
     async throws -> PagedItems<POSProduct> {
         let path = Path.products
@@ -120,7 +124,6 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
     ///   - pageNumber: Page number for pagination.
     /// - Returns: Paginated list of POS product variations.
     ///
-    // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
     public func loadProductVariations(modifiedAfter: Date, siteID: Int64, pageNumber: Int) async throws -> PagedItems<POSProductVariation> {
         let path = Path.variations
         let parameters = [
@@ -131,7 +134,7 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
         ]
 
         let request = JetpackRequest(
-            wooApiVersion: .wcAnalytics,
+            wooApiVersion: .mark3,
             method: .get,
             siteID: siteID,
             path: path,
@@ -151,10 +154,11 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
     ///
     /// - Parameters:
     ///   - siteID: Site ID to generate catalog for.
+    ///   - forceGeneration: Whether to always generate a catalog.
+    ///   - allowCellular: Should cellular data be used if required.
     /// - 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 requestCatalogGeneration(for siteID: Int64, forceGeneration: Bool) async throws -> POSCatalogRequestResponse {
+    public func requestCatalogGeneration(for siteID: Int64, forceGeneration: Bool, allowCellular: Bool) async throws -> POSCatalogRequestResponse {
         let path = "products/catalog"
         let parameters: [String: Any] = [
             ParameterKey.fullSyncFields: POSProduct.requestFields,
@@ -166,7 +170,8 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
             siteID: siteID,
             path: path,
             parameters: parameters,
-            availableAsRESTRequest: true
+            availableAsRESTRequest: true,
+            allowsCellularAccess: allowCellular
         )
         let mapper = SingleItemMapper<POSCatalogRequestResponse>(siteID: siteID)
         return try await enqueue(request, mapper: mapper)
@@ -176,14 +181,17 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
     /// - Parameters:
     ///   - siteID: Site ID to download catalog for.
     ///   - downloadURL: Download URL of the catalog file.
+    ///   - allowCellular: Should cellular data be used if required.
     /// - Returns: List of products and variations in the POS catalog.
-    // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
-    public func downloadCatalog(for siteID: Int64, downloadURL: String) async throws -> POSCatalogResponse {
+    public func downloadCatalog(for siteID: Int64,
+                                downloadURL: String,
+                                allowCellular: Bool) async throws -> POSCatalogResponse {
         // 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)
+        var request = URLRequest(url: url)
+        request.allowsCellularAccess = allowCellular
         let mapper = ListMapper<POSProduct>(siteID: siteID)
         let items = try await enqueue(request, mapper: mapper)
         let variationProductTypeKey = "variation"
@@ -198,10 +206,10 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
     /// - Parameters:
     ///   - siteID: Site ID to load products from.
     ///   - pageNumber: Page number for pagination.
+    ///   - allowCellular: Should cellular data be used if required.
     /// - Returns: Paginated list of POS products.
     ///
-    // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
-    public func loadProducts(siteID: Int64, pageNumber: Int) async throws -> PagedItems<POSProduct> {
+    public func loadProducts(siteID: Int64, pageNumber: Int, allowCellular: Bool) async throws -> PagedItems<POSProduct> {
         let path = Path.products
         let parameters = [
             ParameterKey.page: String(pageNumber),
@@ -215,7 +223,8 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
             siteID: siteID,
             path: path,
             parameters: parameters,
-            availableAsRESTRequest: true
+            availableAsRESTRequest: true,
+            allowsCellularAccess: allowCellular
         )
         let mapper = ListMapper<POSProduct>(siteID: siteID)
         let (products, responseHeaders) = try await enqueueWithResponseHeaders(request, mapper: mapper)
@@ -228,10 +237,10 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
     /// - Parameters:
     ///   - siteID: Site ID to load variations from.
     ///   - pageNumber: Page number for pagination.
+    ///   - allowCellular: Should cellular data be used if required.
     /// - Returns: Paginated list of POS product variations.
     ///
-    // periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
-    public func loadProductVariations(siteID: Int64, pageNumber: Int) async throws -> PagedItems<POSProductVariation> {
+    public func loadProductVariations(siteID: Int64, pageNumber: Int, allowCellular: Bool) async throws -> PagedItems<POSProductVariation> {
         let path = Path.variations
         let parameters = [
             ParameterKey.page: String(pageNumber),
@@ -240,12 +249,13 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
         ]
 
         let request = JetpackRequest(
-            wooApiVersion: .wcAnalytics,
+            wooApiVersion: .mark3,
             method: .get,
             siteID: siteID,
             path: path,
             parameters: parameters,
-            availableAsRESTRequest: true
+            availableAsRESTRequest: true,
+            allowsCellularAccess: allowCellular
         )
         let mapper = ListMapper<POSProductVariation>(siteID: siteID)
         let (variations, responseHeaders) = try await enqueueWithResponseHeaders(request, mapper: mapper)
@@ -293,7 +303,7 @@ public class POSCatalogSyncRemote: Remote, POSCatalogSyncRemoteProtocol {
         ]
 
         let request = JetpackRequest(
-            wooApiVersion: .wcAnalytics,
+            wooApiVersion: .mark3,
             method: .get,
             siteID: siteID,
             path: path,
@@ -331,7 +341,6 @@ private extension POSCatalogSyncRemote {
 // MARK: - Response Models
 
 /// Response from catalog generation request.
-// periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
 public struct POSCatalogRequestResponse: Decodable {
     /// Current status of the catalog generation job.
     public let status: POSCatalogStatus
@@ -353,7 +362,6 @@ public enum POSCatalogStatus: String, Decodable {
 }
 
 /// POS catalog from download.
-// periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
 public struct POSCatalogResponse {
     public let products: [POSProduct]
     public let variations: [POSProductVariation]