Merge branch 'trunk' into WOOMOB-1553-update-attendance-status-remotely

# Conflicts:
#	Modules/Tests/NetworkingTests/Remote/BookingsRemoteTests.swift
#	Modules/Tests/YosemiteTests/Mocks/MockBookingsRemote.swift
#	Modules/Tests/YosemiteTests/Stores/BookingStoreTests.swift

Author: RafaelKayumov

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,11 +6,10 @@
 ## Description
 <!-- Take the time to write a good summary. Why is it needed? What does it do? When fixing bugs try to avoid just writing “See original issue” – clarify what the problem was and how you’ve fixed it. -->
 
-## Steps to reproduce
-<!-- Step-by-step testing instructions. For new user flows, consider instead stating the goal of the workflow and see if your PR reviewer can accomplish the workflow without specific steps! -->
-
-## Testing information
-<!-- This is your opportunity to break out individual scenarios that need testing (when necessary) and/or include a checklist for the reviewer to go through. Consider documenting the following from your own completed testing: devices used, alternate workflows, edge cases, affected areas, critical flows, areas not tested, and any remaining unknowns. Provide feedback on this new section of the PR template through Sept 30, 2024 to Apps Quality; additional context here: https://woomobilep2.wordpress.com/2024/05/06/woocommerce-mobile-quality-report-march-april/#comment-12036 -->
+## Test Steps
+<!-- Describe how to test your changes. Include only what’s needed for the reviewer to validate the behavior.
+For new features, outline the main user flow or goal rather than every tap or click — the reviewer should be able to complete the flow naturally.
+If applicable, mention key devices, scenarios, or edge cases to verify. -->
 
 ## Screenshots
 <!-- Include before and after images or gifs when appropriate. -->

Modules/Sources/Networking/Model/Site.swift

@@ -333,6 +333,19 @@ public enum SiteVisibility: Int, Codable, GeneratedFakeable {
 ///
 public extension Site {
 
+    private var jetpackCanonicalURL: String {
+        guard let originalURL = URL(string: url),
+              originalURL.scheme?.lowercased() == "http"
+        else {
+            return url
+        }
+
+        var components = URLComponents(url: originalURL, resolvingAgainstBaseURL: false)
+        components?.scheme = "https"
+
+        return components?.string ?? url
+    }
+
     /// Returns the TimeZone using the gmtOffset
     ///
     var siteTimezone: TimeZone {
@@ -347,7 +360,7 @@ public extension Site {
     }
 
     func toJetpackSite() -> JetpackSite {
-        JetpackSite(siteID: siteID, siteAddress: url, applicationPasswordAvailable: applicationPasswordAvailable)
+        JetpackSite(siteID: siteID, siteAddress: jetpackCanonicalURL, applicationPasswordAvailable: applicationPasswordAvailable)
     }
 }
 

Modules/Sources/Networking/Remote/BookingsRemote.swift

@@ -25,6 +25,10 @@ public protocol BookingsRemoteProtocol {
 
     func fetchResource(resourceID: Int64,
                        siteID: Int64) async throws -> BookingResource?
+
+    func fetchResources(for siteID: Int64,
+                        pageNumber: Int,
+                        pageSize: Int) async throws -> [BookingResource]
 }
 
 /// Booking: Remote Endpoints
@@ -133,6 +137,37 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
 
         return try await enqueue(request, mapper: mapper)
     }
+
+    /// Retrieves all of the `BookingResources` available.
+    ///
+    /// - Parameters:
+    ///     - siteID: Site for which we'll fetch remote booking resources.
+    ///     - pageNumber: Number of page that should be retrieved.
+    ///     - pageSize: Number of resources to be retrieved per page.
+    ///
+    public func fetchResources(
+        for siteID: Int64,
+        pageNumber: Int = Default.pageNumber,
+        pageSize: Int = Default.pageSize
+    ) async throws -> [BookingResource] {
+        let parameters = [
+            ParameterKey.page: String(pageNumber),
+            ParameterKey.perPage: String(pageSize)
+        ]
+
+        let path = Path.resources
+        let request = JetpackRequest(
+            wooApiVersion: .wcBookings,
+            method: .get,
+            siteID: siteID,
+            path: path,
+            parameters: parameters,
+            availableAsRESTRequest: true
+        )
+        let mapper = ListMapper<BookingResource>(siteID: siteID)
+
+        return try await enqueue(request, mapper: mapper)
+    }
 }
 
 // MARK: - Constants

Modules/Sources/PointOfSale/Models/PointOfSaleSettingsController.swift

@@ -15,6 +15,7 @@ protocol PointOfSaleSettingsControllerProtocol {
     var connectedCardReader: CardPresentPaymentCardReader? { get }
     var storeViewModel: POSSettingsStoreViewModel { get }
     var localCatalogViewModel: POSSettingsLocalCatalogViewModel? { get }
+    var isLocalCatalogEligible: Bool { get }
 }
 
 @Observable final class PointOfSaleSettingsController: PointOfSaleSettingsControllerProtocol {
@@ -23,6 +24,7 @@ protocol PointOfSaleSettingsControllerProtocol {
 
     let storeViewModel: POSSettingsStoreViewModel
     let localCatalogViewModel: POSSettingsLocalCatalogViewModel?
+    let isLocalCatalogEligible: Bool
 
     init(siteID: Int64,
          settingsService: PointOfSaleSettingsServiceProtocol,
@@ -31,12 +33,15 @@ protocol PointOfSaleSettingsControllerProtocol {
          defaultSiteName: String?,
          siteSettings: [SiteSetting],
          grdbManager: GRDBManagerProtocol?,
-         catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?) {
+         catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?,
+         isLocalCatalogEligible: Bool) {
         self.storeViewModel = POSSettingsStoreViewModel(siteID: siteID,
                                                         settingsService: settingsService,
                                                         pluginsService: pluginsService,
                                                         defaultSiteName: defaultSiteName,
                                                         siteSettings: siteSettings)
+        self.isLocalCatalogEligible = isLocalCatalogEligible
+
         if let catalogSyncCoordinator, let grdbManager {
             self.localCatalogViewModel = POSSettingsLocalCatalogViewModel(
                 siteID: siteID,
@@ -80,6 +85,10 @@ final class PointOfSaleSettingsPreviewController: PointOfSaleSettingsControllerP
                                                                               siteSettings: [])
 
     var localCatalogViewModel: POSSettingsLocalCatalogViewModel?
+
+    var isLocalCatalogEligible: Bool {
+        localCatalogViewModel != nil
+    }
 }
 
 final class MockPointOfSaleSettingsService: PointOfSaleSettingsServiceProtocol {

Modules/Sources/PointOfSale/Presentation/PointOfSaleEntryPointView.swift

@@ -63,14 +63,13 @@ public struct PointOfSaleEntryPointView: View {
          siteSettings: [SiteSetting],
          grdbManager: GRDBManagerProtocol?,
          catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?,
+         isLocalCatalogEligible: Bool,
          services: POSDependencyProviding) {
         self.onPointOfSaleModeActiveStateChange = onPointOfSaleModeActiveStateChange
 
-        // Use observable controller with GRDB if available and feature flag is enabled, otherwise fall back to standard controller
-        // Note: We check feature flag here for eligibility. Once eligibility checking is
-        // refactored to be more centralized, this check can be simplified.
-        let isGRDBEnabled = services.featureFlags.isFeatureFlagEnabled(.pointOfSaleLocalCatalogi1)
-        if let grdbManager = grdbManager, catalogSyncCoordinator != nil, isGRDBEnabled {
+        // Use observable controller with GRDB if local catalog is eligible,
+        // otherwise fall back to standard controller.
+        if isLocalCatalogEligible, let grdbManager = grdbManager {
             self.itemsController = PointOfSaleObservableItemsController(
                 siteID: siteID,
                 grdbManager: grdbManager,
@@ -113,7 +112,8 @@ public struct PointOfSaleEntryPointView: View {
                                                                 defaultSiteName: defaultSiteName,
                                                                 siteSettings: siteSettings,
                                                                 grdbManager: grdbManager,
-                                                                catalogSyncCoordinator: catalogSyncCoordinator)
+                                                                catalogSyncCoordinator: catalogSyncCoordinator,
+                                                                isLocalCatalogEligible: isLocalCatalogEligible)
         self.collectOrderPaymentAnalyticsTracker = collectOrderPaymentAnalyticsTracker
         self.searchHistoryService = searchHistoryService
         self.popularPurchasableItemsController = PointOfSaleItemsController(
@@ -203,6 +203,7 @@ public struct PointOfSaleEntryPointView: View {
         siteSettings: [],
         grdbManager: nil,
         catalogSyncCoordinator: nil,
+        isLocalCatalogEligible: false,
         services: POSPreviewServices()
     )
 }

Modules/Sources/PointOfSale/Presentation/Settings/PointOfSaleSettingsView.swift

@@ -3,7 +3,6 @@ import SwiftUI
 struct PointOfSaleSettingsView: View {
     @Environment(\.dismiss) private var dismiss
     @Environment(\.posAnalytics) private var analytics
-    @Environment(\.posFeatureFlags) private var featureFlags
     @State private var selection: SidebarNavigation? = .store
 
     let settingsController: PointOfSaleSettingsControllerProtocol
@@ -55,8 +54,7 @@ extension PointOfSaleSettingsView {
                     }
                 )
 
-                // TODO: WOOMOB-1287 - integrate with local catalog feature eligibility
-                if featureFlags.isFeatureFlagEnabled(.pointOfSaleLocalCatalogi1) && settingsController.localCatalogViewModel != nil {
+                if settingsController.isLocalCatalogEligible {
                     PointOfSaleSettingsCard(
                         item: .localCatalog,
                         isSelected: selection == .localCatalog,

Modules/Sources/PointOfSale/Protocols/POSLocalCatalogEligibilityServiceProtocol.swift

@@ -0,0 +1,41 @@
+import Foundation
+
+/// Eligibility state for local catalog feature
+/// Provides diagnostic information for UI display and decision-making
+public enum POSLocalCatalogEligibilityState: Equatable {
+    /// Local catalog is eligible for use
+    case eligible
+
+    /// Local catalog is not eligible
+    case ineligible(reason: POSLocalCatalogIneligibleReason)
+}
+
+/// Reasons why local catalog is ineligible
+public enum POSLocalCatalogIneligibleReason: Equatable {
+    case posTabNotVisible
+    case featureFlagDisabled
+    case catalogSizeTooLarge(totalCount: Int, limit: Int)
+    case catalogSizeCheckFailed(underlyingError: String)
+}
+
+/// Service that provides eligibility information for local catalog feature
+///
+/// Other services can query this for eligibility state and reasons:
+/// - Sync coordinator can check if catalog is eligible
+/// - Settings UI can display eligibility status and reasons
+/// - Analytics can track why stores are ineligible
+///
+/// NOTE: This service checks catalog-related eligibility (size limits) and feature flag state.
+/// The service performs an initial eligibility check during initialization.
+public protocol POSLocalCatalogEligibilityServiceProtocol {
+    /// Current eligibility state (synchronously accessible on main thread)
+    var eligibilityState: POSLocalCatalogEligibilityState { get }
+
+    /// Update the POS tab visibility state and refresh eligibility
+    /// - Parameter isPOSTabVisible: Whether the POS tab is visible
+    func updateVisibility(isPOSTabVisible: Bool) async
+
+    /// Force refresh eligibility (bypasses cache and updates eligibilityState)
+    /// - Returns: Fresh eligibility state with reason if ineligible
+    @discardableResult func refreshEligibilityState() async -> POSLocalCatalogEligibilityState
+}

Modules/Sources/Storage/Tools/StorageType+Extensions.swift

@@ -967,6 +967,13 @@ public extension StorageType {
         return objects.isEmpty ? nil : objects
     }
 
+    /// Retrieves the store booking resources
+    func loadBookingResources(siteID: Int64, resourceIDs: [Int64]) -> [BookingResource] {
+        let predicate = NSPredicate(format: "siteID == %lld && resourceID in %@", siteID, resourceIDs)
+        let descriptor = NSSortDescriptor(keyPath: \BookingResource.resourceID, ascending: false)
+        return allObjects(ofType: BookingResource.self, matching: predicate, sortedBy: [descriptor])
+    }
+
     /// Retrieves the store booking resource
     func loadBookingResource(siteID: Int64, resourceID: Int64) -> BookingResource? {
         let predicate = \BookingResource.resourceID == resourceID && \BookingResource.siteID == siteID

Modules/Sources/Yosemite/Actions/BookingAction.swift

@@ -53,6 +53,15 @@ public enum BookingAction: Action {
                        resourceID: Int64,
                        onCompletion: (Result<BookingResource, Error>) -> Void)
 
+    /// Synchronizes booking resources matching the specified criteria.
+    ///
+    /// - Parameter onCompletion: called when sync completes, returns an error or a boolean that indicates whether there might be more resources to sync.
+    ///
+    case synchronizeResources(siteID: Int64,
+                             pageNumber: Int,
+                             pageSize: Int = BookingsRemote.Default.pageSize,
+                             onCompletion: (Result<Bool, Error>) -> Void)
+
     /// Updates a booking attendance status.
     ///
     /// - Parameter siteID: The site ID of the booking.

Modules/Sources/Yosemite/Model/Bookings/BookingProductFilter.swift

@@ -1,20 +1,19 @@
-// periphery:ignore:all - will be used for booking filters
 import Foundation
 
 /// Used to filter bookings by product
 ///
 public struct BookingProductFilter: Codable, Hashable {
     /// ID of the product
+    /// periphery:ignore - to be used later when applying filter
     ///
-    public let id: Int64
+    public let productID: Int64
 
     /// Name of the product
     ///
     public let name: String
 
-    public init(id: Int64,
-         name: String) {
-        self.id = id
+    public init(productID: Int64, name: String) {
+        self.productID = productID
         self.name = name
     }
 }