Initialize CardPresentPaymentService together with aggregate model

Implement connectedReaderPublisher in a way that subscription could be done without async call. This way initializer can be made sync as well.

Author: staskus

WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentService.swift

@@ -10,9 +10,39 @@ import protocol Yosemite.StoresManager
 final class CardPresentPaymentService: CardPresentPaymentFacade {
     let paymentEventPublisher: AnyPublisher<CardPresentPaymentEvent, Never>
 
-    let readerConnectionStatusPublisher: AnyPublisher<CardPresentPaymentReaderConnectionStatus, Never>
-
-    private let connectedReaderPublisher: AnyPublisher<CardPresentPaymentCardReader?, Never>
+    lazy var readerConnectionStatusPublisher: AnyPublisher<CardPresentPaymentReaderConnectionStatus, Never> = {
+        connectedReaderPublisher
+           .map({ reader -> CardPresentPaymentReaderConnectionStatus in
+               guard let reader else {
+                   return .disconnected
+               }
+               return .connected(reader)
+           })
+           .merge(with: paymentAlertsPresenterAdaptor.readerConnectionStatusPublisher)
+           .merge(with: readerConnectionStatusSubject)
+           .receive(on: DispatchQueue.main)
+           .eraseToAnyPublisher()
+    }()
+
+    private let connectedReaderSubject = PassthroughSubject<CardPresentPaymentCardReader?, Never>()
+    private lazy var connectedReaderPublisher: AnyPublisher<CardPresentPaymentCardReader?, Never> = {
+        let action = CardPresentPaymentAction.publishCardReaderConnections { [weak self] cardReadersConnectionPublisher in
+            guard let self else { return }
+            cardReadersConnectionPublisher
+                .map { readers -> CardPresentPaymentCardReader? in
+                    guard let reader = readers.first else {
+                        return nil
+                    }
+                    return CardPresentPaymentCardReader(name: reader.name ?? reader.id,
+                                                      batteryLevel: reader.batteryLevel)
+                }
+                .receive(on: DispatchQueue.main)
+                .subscribe(self.connectedReaderSubject)
+                .store(in: &self.subscriptions)
+        }
+        stores.dispatch(action)
+        return connectedReaderSubject.eraseToAnyPublisher()
+    }()
 
     private let paymentEventSubject = PassthroughSubject<CardPresentPaymentEvent, Never>()
 
@@ -33,8 +63,11 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {
 
     private var paymentTask: Task<CardPresentPaymentAdaptedCollectOrderPaymentResult, Error>?
 
-    @MainActor
-    init(siteID: Int64, stores: StoresManager = ServiceLocator.stores, collectOrderPaymentAnalyticsTracker: CollectOrderPaymentAnalyticsTracking) async {
+    private var subscriptions = Set<AnyCancellable>()
+
+    init(siteID: Int64,
+         stores: StoresManager = ServiceLocator.stores,
+         collectOrderPaymentAnalyticsTracker: CollectOrderPaymentAnalyticsTracking) {
         self.siteID = siteID
         let onboardingAdaptor = CardPresentPaymentsOnboardingPresenterAdaptor()
         self.onboardingAdaptor = onboardingAdaptor
@@ -61,21 +94,6 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {
             .merge(with: paymentEventSubject)
             .receive(on: DispatchQueue.main) // These will be used for UI changes, so moving to the Main thread helps.
             .eraseToAnyPublisher()
-
-        let connectedReaderPublisher = await Self.createCardReaderConnectionPublisher(stores: stores)
-        self.connectedReaderPublisher = connectedReaderPublisher
-
-        readerConnectionStatusPublisher = connectedReaderPublisher
-            .map({ reader -> CardPresentPaymentReaderConnectionStatus in
-                guard let reader else {
-                    return .disconnected
-                }
-                return .connected(reader)
-            })
-            .merge(with: paymentAlertsPresenterAdaptor.readerConnectionStatusPublisher)
-            .merge(with: readerConnectionStatusSubject)
-            .receive(on: DispatchQueue.main)
-            .eraseToAnyPublisher()
     }
 
     @MainActor
@@ -183,30 +201,6 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {
 }
 
 private extension CardPresentPaymentService {
-    @MainActor
-    static func createCardReaderConnectionPublisher(stores: StoresManager) async -> AnyPublisher<CardPresentPaymentCardReader?, Never> {
-        return await withCheckedContinuation { continuation in
-            var nillableContinuation: CheckedContinuation<AnyPublisher<CardPresentPaymentCardReader?, Never>, Never>? = continuation
-
-            let action = CardPresentPaymentAction.publishCardReaderConnections { cardReadersConnectionPublisher in
-                let readerConnectionPublisher = cardReadersConnectionPublisher
-                    .map { readers -> CardPresentPaymentCardReader? in
-                        guard let reader = readers.first else {
-                            return nil
-                        }
-                        return CardPresentPaymentCardReader(name: reader.name ?? reader.id,
-                                                            batteryLevel: reader.batteryLevel)
-                    }
-                    .receive(on: DispatchQueue.main)
-                    .eraseToAnyPublisher()
-
-                nillableContinuation?.resume(returning: readerConnectionPublisher)
-                nillableContinuation = nil
-            }
-            stores.dispatch(action)
-        }
-    }
-
     func createPreflightController() -> CardPresentPaymentPreflightController<
         CardPresentPaymentBuiltInReaderConnectionAlertsProvider,
         CardPresentPaymentBluetoothReaderConnectionAlertsProvider,

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenu.swift

@@ -32,8 +32,10 @@ struct HubMenu: View {
                     viewModel.setupMenuElements()
                 }
                 .fullScreenCover(isPresented: $viewModel.showsPOS) {
-                    if let cardPresentPaymentService = viewModel.cardPresentPaymentService,
-                       let receiptService = POSReceiptService(siteID: viewModel.siteID,
+                    let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics()
+                    let cardPresentPaymentService = CardPresentPaymentService(siteID: viewModel.siteID,
+                                                                              collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker)
+                    if let receiptService = POSReceiptService(siteID: viewModel.siteID,
                                                               credentials: viewModel.credentials),
                        let orderService = POSOrderService(siteID: viewModel.siteID,
                                                           credentials: viewModel.credentials),
@@ -46,7 +48,7 @@ struct HubMenu: View {
                             cardPresentPaymentService: cardPresentPaymentService,
                             orderController: PointOfSaleOrderController(orderService: orderService,
                                                                         receiptService: receiptService),
-                            collectOrderPaymentAnalyticsTracker: viewModel.collectOrderPaymentAnalyticsTracker)
+                            collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker)
                     } else {
                         // TODO: When we have a singleton for the card payment service, this should not be required.
                         Text("Error creating card payment service")

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift

@@ -135,8 +135,6 @@ final class HubMenuViewModel: ObservableObject {
             navigationPath: navigationPathBinding)
     }()
 
-    private(set) var cardPresentPaymentService: CardPresentPaymentFacade?
-    private(set) var collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics()
     private let analytics: Analytics
 
     init(siteID: Int64,
@@ -167,7 +165,6 @@ final class HubMenuViewModel: ObservableObject {
         observePlanName()
         observeGoogleAdsEntryPointAvailability()
         tapToPayBadgePromotionChecker.$shouldShowTapToPayBadges.share().assign(to: &$shouldShowNewFeatureBadgeOnPayments)
-        createCardPresentPaymentService()
     }
 
     func viewDidAppear() async {
@@ -287,13 +284,6 @@ private extension HubMenuViewModel {
 // MARK: - Helper methods
 //
 private extension HubMenuViewModel {
-    func createCardPresentPaymentService() {
-        Task {
-            self.cardPresentPaymentService = await CardPresentPaymentService(siteID: siteID,
-                                                                             collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker)
-        }
-    }
-
     func setupPOSElement() {
         posEligibilityChecker.isEligible.map { isEligibleForPOS in
             if isEligibleForPOS {