[Woo POS][Modularization] Remove all ServiceLocator usage from POS code (#15956)

Author: staskus

Modules/Sources/PointOfSale/DependencyProviders/POSDependencyProviding.swift

@@ -1,58 +1,38 @@
 import Foundation
 import WooFoundation
 import Experiments
+import protocol Yosemite.Action
+import struct Yosemite.Site
 
 /// Main dependency provider protocol for POS module
 /// This abstracts away direct ServiceLocator access
 public protocol POSDependencyProviding {
     var analytics: POSAnalyticsProviding { get }
-    var stores: POSStoresProviding { get }
-    var currency: POSCurrencyProviding { get }
-    var storage: POSStorageProviding { get }
+    var currency: POSCurrencySettingsProviding { get }
     var featureFlags: POSFeatureFlagProviding { get }
-    var pushNotifications: POSPushNotificationProviding { get }
+    var session: POSSessionManagerProviding { get }
+    var connectivity: POSConnectivityProviding { get }
 }
 
-/// Analytics service abstraction
 public protocol POSAnalyticsProviding {
     func track(event: WooAnalyticsEvent)
     func track(_ stat: WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType], error: Error)
     func track(_ stat: WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType])
     func track(_ stat: WooAnalyticsStat)
 }
 
-/// Stores manager abstraction
-public protocol POSStoresProviding {
-    var sessionManager: POSSessionManagerProviding { get }
-    // Add other stores manager methods as needed
-}
-
-/// Session manager abstraction
 public protocol POSSessionManagerProviding {
-    var defaultSite: POSSiteProviding? { get }
-}
-
-/// Site abstraction
-public protocol POSSiteProviding {
-    // Add site properties as needed during migration
-}
-
-/// Currency settings and formatting abstraction
-public protocol POSCurrencyProviding {
-    // Currency-related methods will be added as we migrate files
-}
-
-/// Storage manager abstraction
-public protocol POSStorageProviding {
-    // Storage methods will be added as we migrate files
+    var defaultSite: Site? { get }
 }
 
-/// Feature flag service abstraction
 public protocol POSFeatureFlagProviding {
     func isFeatureFlagEnabled(_ flag: FeatureFlag) -> Bool
 }
 
-/// Push notifications abstraction
-public protocol POSPushNotificationProviding {
-    // Push notification methods will be added as we migrate files
+public protocol POSCurrencySettingsProviding {
+    var currencySettings: CurrencySettings { get }
+}
+
+public protocol POSConnectivityProviding {
+    var connectivityObserver: ConnectivityObserver { get }
 }

Modules/Sources/PointOfSale/Environment/POSEnvironmentKeys.swift

@@ -1,33 +1,96 @@
 import SwiftUI
+import Combine
 import WooFoundation
+import Experiments
+import protocol Yosemite.Action
+import struct Yosemite.Site
 
-/// Environment key for POS analytics service
+/// Environment key for POS analytics service in SwiftUI
 public struct POSAnalyticsKey: EnvironmentKey {
-    public static let defaultValue: POSAnalyticsProviding = DefaultPOSAnalytics()
+    public static let defaultValue: POSAnalyticsProviding = EmptyPOSAnalytics()
 }
 
-/// Default implementation that does nothing (for previews/testing)
-private struct DefaultPOSAnalytics: POSAnalyticsProviding {
-    func track(event: WooAnalyticsEvent) {
-        // No-op implementation for previews/testing
-    }
+/// Environment key for POS currency settings
+public struct POSCurrencySettingsKey: EnvironmentKey {
+    public static let defaultValue: POSCurrencySettingsProviding = EmptyPOSCurrencySettings()
+}
 
-    func track(_ stat: WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType] = [:]) {
-        // No-op implementation for previews/testing
-    }
+/// Environment key for POS feature flags service
+public struct POSFeatureFlagsKey: EnvironmentKey {
+    public static let defaultValue: POSFeatureFlagProviding = EmptyPOSFeatureFlags()
+}
 
-    func track(_ stat: WooAnalyticsStat) {
-        // No-op implementation for previews/testing
-    }
+/// Environment key for POS session manager
+public struct POSSessionManagerKey: EnvironmentKey {
+    public static let defaultValue: POSSessionManagerProviding = EmptyPOSSessionManager()
+}
 
-    func track(_ stat: WooFoundationCore.WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType], error: any Error) {
-        // No-op implementation for previews/testing
-    }
+/// Environment key for POS connectivity
+public struct POSConnectivityKey: EnvironmentKey {
+    public static let defaultValue: POSConnectivityProviding = EmptyPOSConnectivityProvider()
 }
 
 public extension EnvironmentValues {
     var posAnalytics: POSAnalyticsProviding {
         get { self[POSAnalyticsKey.self] }
         set { self[POSAnalyticsKey.self] = newValue }
     }
+
+    var posCurrencyProvider: POSCurrencySettingsProviding {
+        get { self[POSCurrencySettingsKey.self] }
+        set { self[POSCurrencySettingsKey.self] = newValue }
+    }
+
+    var posFeatureFlags: POSFeatureFlagProviding {
+        get { self[POSFeatureFlagsKey.self] }
+        set { self[POSFeatureFlagsKey.self] = newValue }
+    }
+
+    var posSession: POSSessionManagerProviding {
+        get { self[POSSessionManagerKey.self] }
+        set { self[POSSessionManagerKey.self] = newValue }
+    }
+
+    var posConnectivityProvider: POSConnectivityProviding {
+        get { self[POSConnectivityKey.self] }
+        set { self[POSConnectivityKey.self] = newValue }
+    }
+}
+
+// MARK: - Empty Default Values
+
+public struct EmptyPOSSessionManager: POSSessionManagerProviding {
+    public var defaultSite: Site? = nil
+    public init() {}
+}
+
+public struct EmptyPOSFeatureFlags: POSFeatureFlagProviding {
+    public func isFeatureFlagEnabled(_ flag: FeatureFlag) -> Bool { false }
+    public init() {}
+}
+
+public struct EmptyPOSCurrencySettings: POSCurrencySettingsProviding {
+    public var currencySettings = CurrencySettings()
+    public init() {}
+}
+
+public class EmptyPOSConnectivityProvider: POSConnectivityProviding {
+    public var connectivityObserver: WooFoundation.ConnectivityObserver = EmptyPOSConnectivity()
+    public init() {}
+}
+
+public class EmptyPOSConnectivity: ConnectivityObserver {
+    @Published private(set) public var currentStatus: ConnectivityStatus = .reachable(type: .ethernetOrWiFi)
+    public var statusPublisher: AnyPublisher<ConnectivityStatus, Never> { $currentStatus.eraseToAnyPublisher() }
+    public func startObserving() {}
+    public func stopObserving() {}
+    public init() {}
+}
+
+public struct EmptyPOSAnalytics: POSAnalyticsProviding {
+    public func track(event: WooAnalyticsEvent) {}
+    public func track(_ stat: WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType] = [:]) {}
+    public func track(_ stat: WooAnalyticsStat) {}
+    public func track(_ stat: WooFoundationCore.WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType], error: any Error) {}
+    public init() {}
 }

WooCommerce/Classes/Tools/Connectivity/ConnectivityObserver.swift renamed to Modules/Sources/WooFoundation/Utilities/Connectivity/ConnectivityObserver.swift

@@ -2,7 +2,7 @@ import Combine
 
 /// Interface for the observing connectivity
 ///
-protocol ConnectivityObserver {
+public protocol ConnectivityObserver {
     /// Getter for current state of the connectivity.
     var currentStatus: ConnectivityStatus { get }
 
@@ -21,7 +21,7 @@ protocol ConnectivityObserver {
 /// - unknown:      It is unknown whether the network is reachable.
 /// - notReachable: The network is not reachable.
 /// - reachable:    The network is reachable.
-enum ConnectivityStatus: Equatable {
+public enum ConnectivityStatus: Equatable {
     case unknown
     case notReachable
     case reachable(type: ConnectionType)
@@ -32,7 +32,7 @@ enum ConnectivityStatus: Equatable {
 /// - ethernetOrWiFi: The connection type is either over Ethernet or WiFi.
 /// - cellular:       The connection type is a cellular connection.
 /// - other:          The connection type is via a local loopback network, virtual network or other unknown types.
-enum ConnectionType: Equatable {
+public enum ConnectionType: Equatable {
     case ethernetOrWiFi
     case cellular
     case other

WooCommerce/Classes/Tools/Connectivity/DefaultConnectivityObserver.swift renamed to Modules/Sources/WooFoundation/Utilities/Connectivity/DefaultConnectivityObserver.swift

@@ -1,19 +1,23 @@
 import Combine
 import Network
 
-final class DefaultConnectivityObserver: ConnectivityObserver {
+public final class DefaultConnectivityObserver: ConnectivityObserver {
 
     /// Network monitor to evaluate connection.
     ///
     private let networkMonitor: NetworkMonitoring
     private let observingQueue: DispatchQueue = .global(qos: .background)
 
-    @Published private(set) var currentStatus: ConnectivityStatus = .unknown
+    @Published private(set) public var currentStatus: ConnectivityStatus = .unknown
 
-    var statusPublisher: AnyPublisher<ConnectivityStatus, Never> {
+    public var statusPublisher: AnyPublisher<ConnectivityStatus, Never> {
         $currentStatus.eraseToAnyPublisher()
     }
 
+    public convenience init() {
+        self.init(networkMonitor: NWPathMonitor())
+    }
+
     init(networkMonitor: NetworkMonitoring = NWPathMonitor()) {
         self.networkMonitor = networkMonitor
         startObserving()
@@ -25,11 +29,11 @@ final class DefaultConnectivityObserver: ConnectivityObserver {
         }
     }
 
-    func startObserving() {
+    public func startObserving() {
         networkMonitor.start(queue: observingQueue)
     }
 
-    func stopObserving() {
+    public func stopObserving() {
         networkMonitor.cancel()
     }
 

WooCommerce/WooCommerceTests/Tools/DefaultConnectivityObserver.swift renamed to Modules/Tests/WooFoundationTests/Utilities/DefaultConnectivityObserverTests.swift

@@ -1,7 +1,7 @@
 import Combine
 import Network
 import XCTest
-@testable import WooCommerce
+@testable import WooFoundation
 
 final class DefaultConnectivityObserverTests: XCTestCase {
     private var subscriptions: Set<AnyCancellable> = []

WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentCollectOrderPaymentUseCaseAdaptor.swift renamed to WooCommerce/Classes/POS/Adaptors/Card Present Payments/CardPresentPaymentCollectOrderPaymentUseCaseAdaptor.swift

@@ -6,6 +6,7 @@ import struct Yosemite.CardReader
 import enum Yosemite.CardPresentPaymentAction
 import enum Yosemite.PaymentChannel
 import protocol Yosemite.StoresManager
+import class WooFoundation.CurrencySettings
 
 final class CardPresentPaymentService: CardPresentPaymentFacade {
     let paymentEventPublisher: AnyPublisher<CardPresentPaymentEvent, Never>