Add loadSystemPlugin(siteID:fileNameWithoutExtension:) storage extension for POS use case to fix scenario when plugin folder path is altered by plugins or hosts.

Author: jaclync

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

@@ -855,6 +855,23 @@ public extension StorageType {
         return firstObject(ofType: SystemPlugin.self, matching: predicate)
     }
 
+    /// Returns a system plugin with a specified `siteID` and `fileNameWithoutExtension`.
+    ///
+    /// - Parameters:
+    ///   - siteID: The site ID to filter by.
+    ///   - fileNameWithoutExtension: The plugin file name to match without extension (e.g., "woocommerce", "woocommerce-payments").
+    ///   - active: Optional active state filter. If provided, only plugins with matching active state are returned. If nil, active state is ignored.
+    /// - Returns: The matching system plugin, or nil if not found.
+    func loadSystemPlugin(siteID: Int64, fileNameWithoutExtension: String, active: Bool? = nil) -> SystemPlugin? {
+        let pathPattern = "*/\(fileNameWithoutExtension).*"
+        let predicate = if let active {
+            NSPredicate(format: "siteID == %lld AND plugin LIKE %@ AND active == %@", siteID, pathPattern, NSNumber(value: active))
+        } else {
+            NSPredicate(format: "siteID == %lld AND plugin LIKE %@", siteID, pathPattern)
+        }
+        return firstObject(ofType: SystemPlugin.self, matching: predicate)
+    }
+
     /// Returns stored system plugins for a provided `siteID` matching the given plugin `paths`.
     ///
     func loadSystemPlugins(siteID: Int64, matchingPaths paths: [String]) -> [SystemPlugin] {

Modules/Sources/Yosemite/PointOfSale/Eligibility/POSSystemStatusService.swift

@@ -54,7 +54,9 @@ public final class POSSystemStatusService: POSSystemStatusServiceProtocol {
         })
 
         // Loads WooCommerce plugin from storage.
-        guard let wcPlugin = storageManager.viewStorage.loadSystemPlugin(siteID: siteID, path: Constants.wcPluginPath, active: true)?.toReadOnly() else {
+        guard let wcPlugin = storageManager.viewStorage.loadSystemPlugin(siteID: siteID,
+                                                                         fileNameWithoutExtension: Constants.wcPluginFileNameWithoutExtension,
+                                                                         active: true)?.toReadOnly() else {
             return POSPluginAndFeatureInfo(wcPlugin: nil, featureValue: nil)
         }
 
@@ -66,7 +68,7 @@ public final class POSSystemStatusService: POSSystemStatusServiceProtocol {
 
 private extension POSSystemStatusService {
     enum Constants {
-        static let wcPluginPath = "woocommerce/woocommerce.php"
+        static let wcPluginFileNameWithoutExtension = "woocommerce"
     }
 }
 

Modules/Tests/StorageTests/Tools/StorageTypeExtensionsTests.swift

@@ -1538,6 +1538,141 @@ final class StorageTypeExtensionsTests: XCTestCase {
         XCTAssertNil(foundPlugin)
     }
 
+    // MARK: - `loadSystemPlugin(siteID:fileNameWithoutExtension:)`
+
+    func test_loadSystemPlugin_by_fileNameWithoutExtension_returns_matching_plugin_when_two_plugins_in_storage() throws {
+        // Given
+        let systemPlugin1 = storage.insertNewObject(ofType: SystemPlugin.self)
+        systemPlugin1.plugin = "woocommerce-payments/woocommerce-payments.php"
+        systemPlugin1.siteID = sampleSiteID
+
+        let systemPlugin2 = storage.insertNewObject(ofType: SystemPlugin.self)
+        systemPlugin2.plugin = "test-plugin/woocommerce-gift-cards.php"
+        systemPlugin2.siteID = sampleSiteID
+
+        // When
+        let foundSystemPlugin = try XCTUnwrap(storage.loadSystemPlugin(siteID: sampleSiteID, fileNameWithoutExtension: "woocommerce-gift-cards"))
+
+        // Then
+        XCTAssertEqual(foundSystemPlugin, systemPlugin2)
+    }
+
+    func test_loadSystemPlugin_by_fileNameWithoutExtension_returns_matching_plugin_when_plugin_path_is_in_different_valid_formats() throws {
+        let validPluginPaths = [
+            "woocommerce/woocommerce.php",
+            "woocommerce/woocommerce.swift",
+            "woocommerce//woocommerce.php",
+            "test-plugin/test-plugin/woocommerce.php",
+            "test-plugin/test-plugin/test-plugin/woocommerce.tmp.php",
+            "test-plugin/test-plugin/woocommerce.tmp.php",
+            "test-plugin/woocommerce.tmp.php",
+            "/woocommerce.tmp.php"
+        ]
+
+        for pluginPath in validPluginPaths {
+            // Given
+            let plugin = storage.insertNewObject(ofType: SystemPlugin.self)
+            plugin.plugin = pluginPath
+            plugin.siteID = sampleSiteID
+
+            // When
+            let foundPlugin = try XCTUnwrap(storage.loadSystemPlugin(siteID: sampleSiteID, fileNameWithoutExtension: "woocommerce"))
+
+            // Then
+            XCTAssertEqual(foundPlugin, plugin)
+
+            // Cleanup for next iteration
+            storage.deleteObject(plugin)
+        }
+    }
+
+    func test_loadSystemPlugin_by_fileNameWithoutExtension_returns_nil_when_plugin_path_is_in_different_invalid_formats() throws {
+        let invalidPluginPaths = [
+            "woocommerce/woocommerce",
+            "woocommerce/woocommerce-dev.php",
+            "test-plugin/woocommerce-dev.php",
+            "test-plugin/test-plugin/woocommerce-dev.php",
+            "woocommerce.tmp.php"
+        ]
+
+        for pluginPath in invalidPluginPaths {
+            // Given
+            let plugin = storage.insertNewObject(ofType: SystemPlugin.self)
+            plugin.plugin = pluginPath
+            plugin.siteID = sampleSiteID
+
+            // When
+            let foundPlugin = storage.loadSystemPlugin(siteID: sampleSiteID, fileNameWithoutExtension: "woocommerce")
+
+            // Then
+            XCTAssertNil(foundPlugin)
+
+            // Cleanup for next iteration
+            storage.deleteObject(plugin)
+        }
+    }
+
+    func test_loadSystemPlugin_by_fileNameWithoutExtension_returns_matching_plugin_when_active_state_is_set() throws {
+        // Given
+        let inactivePlugin = storage.insertNewObject(ofType: SystemPlugin.self)
+        inactivePlugin.plugin = "test-plugin/woocommerce.php"
+        inactivePlugin.siteID = sampleSiteID
+        inactivePlugin.active = false
+
+        let activePlugin = storage.insertNewObject(ofType: SystemPlugin.self)
+        activePlugin.plugin = "woocommerce/woocommerce.php"
+        activePlugin.siteID = sampleSiteID
+        activePlugin.active = true
+
+        // When
+        let foundActivePlugin = try XCTUnwrap(storage.loadSystemPlugin(siteID: sampleSiteID, fileNameWithoutExtension: "woocommerce", active: true))
+
+        // Then
+        XCTAssertEqual(foundActivePlugin, activePlugin)
+
+        // When
+        let foundInactivePlugin = try XCTUnwrap(storage.loadSystemPlugin(siteID: sampleSiteID, fileNameWithoutExtension: "woocommerce", active: false))
+
+        // Then
+        XCTAssertEqual(foundInactivePlugin, inactivePlugin)
+    }
+
+    func test_loadSystemPlugin_by_fileNameWithoutExtension_returns_matching_plugin_when_active_state_is_nil() throws {
+        // Given
+        let activePlugin = storage.insertNewObject(ofType: SystemPlugin.self)
+        activePlugin.plugin = "test-plugin/woocommerce.php"
+        activePlugin.siteID = sampleSiteID
+        activePlugin.active = true
+
+        let inactivePlugin = storage.insertNewObject(ofType: SystemPlugin.self)
+        inactivePlugin.plugin = "jetpack/jetpack.php"
+        inactivePlugin.siteID = sampleSiteID
+        inactivePlugin.active = false
+
+        // When
+        let foundPlugin = storage.loadSystemPlugin(siteID: sampleSiteID, fileNameWithoutExtension: "woocommerce", active: nil)
+
+        // Then
+        XCTAssertNotNil(foundPlugin)
+        XCTAssertEqual(foundPlugin, activePlugin)
+    }
+
+    func test_loadSystemPlugin_by_fileNameWithoutExtension_returns_nil_when_active_state_does_not_match() {
+        // Given
+        let activePlugin = storage.insertNewObject(ofType: SystemPlugin.self)
+        activePlugin.plugin = "woocommerce/woocommerce.php"
+        activePlugin.siteID = sampleSiteID
+        activePlugin.active = true
+
+        // When
+        let foundPlugin = storage.loadSystemPlugin(siteID: sampleSiteID, fileNameWithoutExtension: "woocommerce", active: false)
+
+        // Then
+        XCTAssertNil(foundPlugin)
+    }
+
+    // MARK: - `loadSystemPlugins(siteID:matchingPaths:)`
+
     func test_loadSystemPlugins_by_siteID_matching_paths() {
         // Given
         let systemPlugin1 = storage.insertNewObject(ofType: SystemPlugin.self)