[Local catalog] Add explicit local catalog flag to factory

- Add isLocalCatalogEnabled parameter to factory init
- Replace implicit GRDB presence check with explicit flag check
- Remove side-effecty localSearchStrategy helper method
- Add stub implementation for trackSearchLocalResultsFetchComplete
- Pass isLocalCatalogEligible flag when creating factories in POSTabCoordinator
- Convert lazy factory properties to factory methods with eligibility parameter
- Makes intent clear and improves testability

The factory now explicitly checks the isLocalCatalogEnabled flag
rather than relying on the presence of GRDBManager to determine
which search strategy to use. This makes the behavior more
predictable and testable.

The POSTabCoordinator now dynamically creates factories with the
current eligibility state each time POS is presented, ensuring
the correct search strategy is used based on real-time eligibility.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: joshheald

Modules/Sources/PointOfSale/Analytics/POSItemFetchAnalytics.swift

@@ -43,4 +43,13 @@ struct POSItemFetchAnalytics: POSItemFetchAnalyticsTracking {
             )
         )
     }
+
+    /// Tracks when a local search results fetch completes
+    /// - Parameters:
+    ///   - milliseconds: The time taken to fetch results in milliseconds
+    ///   - totalItems: The total number of items found in the search
+    func trackSearchLocalResultsFetchComplete(millisecondsSinceRequestSent: Int, totalItems: Int) {
+        // TODO: Implement analytics event for local search results
+        // This will be implemented in the final PR
+    }
 }

Modules/Sources/Yosemite/PointOfSale/Items/PointOfSaleItemFetchStrategyFactory.swift

@@ -18,19 +18,22 @@ public final class PointOfSaleItemFetchStrategyFactory: PointOfSaleItemFetchStra
     private let productsRemote: ProductsRemote
     private let variationsRemote: ProductVariationsRemote
     private let grdbManager: GRDBManagerProtocol?
+    private let isLocalCatalogEnabled: Bool
 
     public init(siteID: Int64,
                 credentials: Credentials?,
                 selectedSite: AnyPublisher<JetpackSite?, Never>? = nil,
                 appPasswordSupportState: AnyPublisher<Bool, Never>? = nil,
-                grdbManager: GRDBManagerProtocol? = nil) {
+                grdbManager: GRDBManagerProtocol? = nil,
+                isLocalCatalogEnabled: Bool = false) {
         self.siteID = siteID
         let network = AlamofireNetwork(credentials: credentials,
                                        selectedSite: selectedSite,
                                        appPasswordSupportState: appPasswordSupportState)
         self.productsRemote = ProductsRemote(network: network)
         self.variationsRemote = ProductVariationsRemote(network: network)
         self.grdbManager = grdbManager
+        self.isLocalCatalogEnabled = isLocalCatalogEnabled
     }
 
     public func defaultStrategy(analytics: POSItemFetchAnalyticsTracking) -> PointOfSalePurchasableItemFetchStrategy {
@@ -41,9 +44,13 @@ public final class PointOfSaleItemFetchStrategyFactory: PointOfSaleItemFetchStra
     }
     public func searchStrategy(searchTerm: String,
                                analytics: POSItemFetchAnalyticsTracking) -> PointOfSalePurchasableItemFetchStrategy {
-        // Use local search if GRDB manager is available, otherwise fall back to remote search
-        if let localStrategy = localSearchStrategy(searchTerm: searchTerm, analytics: analytics) {
-            return localStrategy
+        // Use local search if explicitly enabled and GRDB manager is available
+        if isLocalCatalogEnabled, let grdbManager = grdbManager {
+            return PointOfSaleLocalSearchPurchasableItemFetchStrategy(siteID: siteID,
+                                                                      searchTerm: searchTerm,
+                                                                      grdbManager: grdbManager,
+                                                                      variationsRemote: variationsRemote,
+                                                                      analytics: analytics)
         }
         return PointOfSaleSearchPurchasableItemFetchStrategy(siteID: siteID,
                                                             searchTerm: searchTerm,
@@ -58,26 +65,6 @@ public final class PointOfSaleItemFetchStrategyFactory: PointOfSaleItemFetchStra
                                                        productsRemote: productsRemote,
                                                        variationsRemote: variationsRemote)
     }
-
-    /// Creates a local search strategy using the GRDB catalog
-    /// - Parameters:
-    ///   - searchTerm: The search term to query
-    ///   - analytics: Analytics tracker
-    ///   - pageSize: Number of items per page (default: 25)
-    /// - Returns: A local search strategy if GRDB manager is available, otherwise nil
-    public func localSearchStrategy(searchTerm: String,
-                                    analytics: POSItemFetchAnalyticsTracking,
-                                    pageSize: Int = 25) -> PointOfSalePurchasableItemFetchStrategy? {
-        guard let grdbManager else {
-            return nil
-        }
-        return PointOfSaleLocalSearchPurchasableItemFetchStrategy(siteID: siteID,
-                                                                  searchTerm: searchTerm,
-                                                                  grdbManager: grdbManager,
-                                                                  variationsRemote: variationsRemote,
-                                                                  analytics: analytics,
-                                                                  pageSize: pageSize)
-    }
 }
 
 public final class PointOfSaleFixedItemFetchStrategyFactory: PointOfSaleItemFetchStrategyFactoryProtocol {

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -47,17 +47,21 @@ final class POSTabCoordinator {
     /// Local catalog eligibility service - created asynchronously during init
     private(set) var localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol?
 
-    private lazy var posItemFetchStrategyFactory: PointOfSaleItemFetchStrategyFactory = {
+    /// Creates item fetch strategy factory with current local catalog eligibility
+    private func createItemFetchStrategyFactory(isLocalCatalogEnabled: Bool) -> PointOfSaleItemFetchStrategyFactory {
         PointOfSaleItemFetchStrategyFactory(siteID: siteID,
                                             credentials: credentials,
                                             selectedSite: defaultSitePublisher,
                                             appPasswordSupportState: isAppPasswordSupported,
-                                            grdbManager: ServiceLocator.grdbManager)
-    }()
+                                            grdbManager: ServiceLocator.grdbManager,
+                                            isLocalCatalogEnabled: isLocalCatalogEnabled)
+    }
 
-    private lazy var posPopularItemFetchStrategyFactory: PointOfSaleFixedItemFetchStrategyFactory = {
-        PointOfSaleFixedItemFetchStrategyFactory(fixedStrategy: posItemFetchStrategyFactory.popularStrategy())
-    }()
+    /// Creates popular item fetch strategy factory with current local catalog eligibility
+    private func createPopularItemFetchStrategyFactory(isLocalCatalogEnabled: Bool) -> PointOfSaleFixedItemFetchStrategyFactory {
+        let itemFactory = createItemFetchStrategyFactory(isLocalCatalogEnabled: isLocalCatalogEnabled)
+        return PointOfSaleFixedItemFetchStrategyFactory(fixedStrategy: itemFactory.popularStrategy())
+    }
 
     private lazy var posCouponFetchStrategyFactory: PointOfSaleCouponFetchStrategyFactory = {
         PointOfSaleCouponFetchStrategyFactory(siteID: siteID,
@@ -230,8 +234,8 @@ private extension POSTabCoordinator {
                                                   appPasswordSupportState: isAppPasswordSupported) {
                 let posView = PointOfSaleEntryPointView(
                     siteID: siteID,
-                    itemFetchStrategyFactory: posItemFetchStrategyFactory,
-                    popularItemFetchStrategyFactory: posPopularItemFetchStrategyFactory,
+                    itemFetchStrategyFactory: createItemFetchStrategyFactory(isLocalCatalogEnabled: isLocalCatalogEligible),
+                    popularItemFetchStrategyFactory: createPopularItemFetchStrategyFactory(isLocalCatalogEnabled: isLocalCatalogEligible),
                     couponProvider: posCouponProvider,
                     couponFetchStrategyFactory: posCouponFetchStrategyFactory,
                     orderListFetchStrategyFactory: POSOrderListFetchStrategyFactory(

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -16594,6 +16594,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 23.8;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.automattic.alpha.woocommerce;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -17399,6 +17400,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 23.8;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.automattic.woocommerce;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -17428,6 +17430,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 23.8;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.automattic.woocommerce;
 				PRODUCT_NAME = "$(TARGET_NAME)";