Remove ServiceLocator.stores.sessionManager dependency from POS

Author: staskus

Modules/Sources/PointOfSale/DependencyProviders/POSDependencyProviding.swift

@@ -2,7 +2,7 @@ import Foundation
 import WooFoundation
 import Experiments
 import protocol Yosemite.Action
-import protocol Yosemite.SessionManagerProtocol
+import struct Yosemite.Site
 
 /// Main dependency provider protocol for POS module
 /// This abstracts away direct ServiceLocator access
@@ -11,6 +11,7 @@ public protocol POSDependencyProviding {
     var stores: POSStoresProviding { get }
     var currency: CurrencySettings { get }
     var featureFlags: POSFeatureFlagProviding { get }
+    var session: POSSessionManagerProviding { get }
 }
 
 /// Analytics service abstraction
@@ -28,17 +29,7 @@ public protocol POSStoresProviding {
 
 /// Session manager abstraction
 public protocol POSSessionManagerProviding {
-    var defaultSite: POSSiteProviding? { get }
-}
-
-/// Site abstraction
-public protocol POSSiteProviding {
-    // Add site properties as needed during migration
-}
-
-/// Storage manager abstraction
-public protocol POSStorageProviding {
-    // Storage methods will be added as we migrate files
+    var defaultSite: Site? { get }
 }
 
 /// Feature flag service abstraction

Modules/Sources/PointOfSale/Environment/POSEnvironmentKeys.swift

@@ -2,6 +2,7 @@ import SwiftUI
 import WooFoundation
 import Experiments
 import protocol Yosemite.Action
+import struct Yosemite.Site
 
 /// Environment key for POS analytics service
 public struct POSAnalyticsKey: EnvironmentKey {
@@ -42,13 +43,18 @@ public struct POSFeatureFlagsKey: EnvironmentKey {
     public static let defaultValue: POSFeatureFlagProviding = DefaultPOSFeatureFlags()
 }
 
+/// Environment key for POS session manager
+public struct POSSessionManagerKey: EnvironmentKey {
+    public static let defaultValue: POSSessionManagerProviding = DefaultPOSSessionManager()
+}
+
 // Default implementations for testing/previews
 private struct DefaultPOSStores: POSStoresProviding {
     func dispatch(_ action: Yosemite.Action) {}
 }
 
 private struct DefaultPOSSessionManager: POSSessionManagerProviding {
-    var defaultSite: POSSiteProviding? = nil
+    var defaultSite: Site? = nil
 }
 
 private struct DefaultPOSFeatureFlags: POSFeatureFlagProviding {
@@ -75,4 +81,9 @@ public extension EnvironmentValues {
         get { self[POSFeatureFlagsKey.self] }
         set { self[POSFeatureFlagsKey.self] = newValue }
     }
+
+    var posSession: POSSessionManagerProviding {
+        get { self[POSSessionManagerKey.self] }
+        set { self[POSSessionManagerKey.self] = newValue }
+    }
 }

WooCommerce/Classes/POS/Adaptors/POSServiceLocatorAdaptor.swift

@@ -7,6 +7,7 @@ import protocol Yosemite.StoresManager
 import protocol Yosemite.SessionManagerProtocol
 import protocol Storage.StorageManagerType
 import protocol Yosemite.Action
+import struct Yosemite.Site
 
 /// Adaptor that bridges main app ServiceLocator to POS dependency abstraction to support POS modularization
 final class POSServiceLocatorAdaptor: POSDependencyProviding {
@@ -25,6 +26,10 @@ final class POSServiceLocatorAdaptor: POSDependencyProviding {
     var featureFlags: POSFeatureFlagProviding {
         return POSFeatureFlagAdaptor(featureFlagService: ServiceLocator.featureFlagService)
     }
+
+    var session: POSSessionManagerProviding {
+        return POSSessionManagerAdaptor(sessionManager: ServiceLocator.stores.sessionManager)
+    }
 }
 
 // MARK: - Individual Service Adaptors
@@ -48,30 +53,9 @@ private struct POSSessionManagerAdaptor: POSSessionManagerProviding {
         self.sessionManager = sessionManager
     }
 
-    var defaultSite: POSSiteProviding? {
-        guard let site = sessionManager.defaultSite else { return nil }
-        return POSSiteAdaptor(site: site)
-    }
-}
-
-private struct POSSiteAdaptor: POSSiteProviding {
-    private let site: Site
-
-    init(site: Site) {
-        self.site = site
+    var defaultSite: Site? {
+        return sessionManager.defaultSite
     }
-
-    // Add site properties as needed during migration
-}
-
-private struct POSStorageAdaptor: POSStorageProviding {
-    private let storageManager: StorageManagerType
-
-    init(storage: StorageManagerType) {
-        self.storageManager = storage
-    }
-
-    // Storage methods will be added as we migrate files
 }
 
 private struct POSFeatureFlagAdaptor: POSFeatureFlagProviding {
@@ -86,8 +70,7 @@ private struct POSFeatureFlagAdaptor: POSFeatureFlagProviding {
     }
 }
 
-/// Adaptor that implements POSAnalyticsProviding using ServiceLocator
-final class POSAnalyticsAdaptor: POSAnalyticsProviding {
+private struct POSAnalyticsAdaptor: POSAnalyticsProviding {
     func track(event: WooAnalyticsEvent) {
         let mainAppEvent = WooAnalyticsEvent(statName: event.statName, properties: event.properties, error: event.error)
         ServiceLocator.analytics.track(event: mainAppEvent)

WooCommerce/Classes/POS/Presentation/CartView.swift

@@ -435,7 +435,7 @@ private struct PurchasableItemsCartSection: View {
 
     private func cancelLoadingCallback(for cartItem: Cart.PurchasableItem) -> () -> Void {
         return {
-            ServiceLocator.analytics.track(
+            analytics.track(
                 event: .PointOfSale.itemRemovedFromCart(
                     sourceView: .cart,
                     itemType: .loading

WooCommerce/Classes/POS/Presentation/PointOfSaleDashboardView.swift

@@ -4,6 +4,7 @@ import SwiftUI
 struct PointOfSaleDashboardView: View {
     @Environment(PointOfSaleAggregateModel.self) private var posModel
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+    @Environment(\.posSession) private var session
 
     @State private var showExitPOSModal: Bool = false
     @State private var showSupport: Bool = false
@@ -188,7 +189,7 @@ private extension PointOfSaleDashboardView {
         NavigationView {
             SupportForm(isPresented: $showSupport,
                         viewModel: SupportFormViewModel(sourceTag: Constants.supportTag,
-                                                        defaultSite: ServiceLocator.stores.sessionManager.defaultSite))
+                                                        defaultSite: session.defaultSite))
             .toolbar {
                 ToolbarItem(placement: .confirmationAction) {
                     Button(Localization.supportDone) {

WooCommerce/Classes/POS/Presentation/PointOfSaleEntryPointView.swift

@@ -84,6 +84,7 @@ struct PointOfSaleEntryPointView: View {
         .environment(\.posCurrencySettings, services.currency)
         .environment(\.posStores, services.stores)
         .environment(\.posFeatureFlags, services.featureFlags)
+        .environment(\.posSession, services.session)
         .injectKeyboardObserver()
         .onAppear {
             onPointOfSaleModeActiveStateChange(true)

WooCommerce/Classes/POS/Utils/PreviewHelpers.swift

@@ -25,6 +25,7 @@ import enum Yosemite.PointOfSaleBarcodeScanError
 import Combine
 import struct Yosemite.PaymentIntent
 import protocol Yosemite.Action
+import struct Yosemite.Site
 
 // MARK: - PreviewProvider helpers
 //
@@ -296,6 +297,7 @@ final class POSPreviewServices: POSDependencyProviding {
     var stores: POSStoresProviding = POSPreviewStores()
     var currency: CurrencySettings = CurrencySettings()
     var featureFlags: POSFeatureFlagProviding = POSPreviewFeatureFlags()
+    var session: POSSessionManagerProviding = POSPreviewSessionManager()
 }
 
 // Preview implementations for all service types
@@ -304,7 +306,7 @@ private struct POSPreviewStores: POSStoresProviding {
 }
 
 private struct POSPreviewSessionManager: POSSessionManagerProviding {
-    var defaultSite: POSSiteProviding? = nil
+    var defaultSite: Site? = nil
 }
 
 private struct POSPreviewFeatureFlags: POSFeatureFlagProviding {