move reader observation from aggregate to settings controller

Author: iamgabrielma

WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift

@@ -133,7 +133,6 @@ protocol PointOfSaleAggregateModelProtocol {
         publishCardReaderConnectionStatus()
         publishPaymentMessages()
         setupReaderReconnectionObservation()
-        observeCardReaderForSettings()
     }
 }
 
@@ -324,21 +323,6 @@ extension PointOfSaleAggregateModel {
         }
     }
 
-    private func observeCardReaderForSettings() {
-        cardPresentPaymentService.readerConnectionStatusPublisher
-            .sink(receiveValue: { [weak self] connectionStatus in
-                guard let self else { return }
-                let cardReader: CardPresentPaymentCardReader?
-                switch connectionStatus {
-                case .connected(let reader):
-                    cardReader = reader
-                default:
-                    cardReader = nil
-                }
-                settingsController.updateCardReader(cardReader)
-            })
-            .store(in: &cancellables)
-    }
 
     /// Starts a payment immediately if a reader is connected.
     /// Otherwise, schedules a payment to start the next time a reader connects.

WooCommerce/Classes/POS/Models/PointOfSaleSettingsController.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Combine
 import struct Yosemite.SiteSetting
 import enum Yosemite.Plugin
 import class Yosemite.PluginsService
@@ -22,7 +23,6 @@ protocol PointOfSaleSettingsControllerProtocol {
     var connectedCardReader: CardPresentPaymentCardReader? { get }
 
     func retrievePOSReceiptSettings() async
-    func updateCardReader(_ cardReader: CardPresentPaymentCardReader?)
 }
 
 @Observable final class PointOfSaleSettingsController: PointOfSaleSettingsControllerProtocol {
@@ -38,17 +38,32 @@ protocol PointOfSaleSettingsControllerProtocol {
     private let settingsService: PointOfSaleSettingsServiceProtocol
     private let siteSettings: [SiteSetting]
     private(set) var connectedCardReader: CardPresentPaymentCardReader?
+    private var cancellables: AnyCancellable?
 
     init(settingsService: PointOfSaleSettingsServiceProtocol,
+         cardPresentPaymentService: CardPresentPaymentFacade,
          defaultSiteName: String? = ServiceLocator.stores.sessionManager.defaultSite?.name,
          siteSettings: [SiteSetting] = ServiceLocator.selectedSiteSettings.siteSettings) {
         self.settingsService = settingsService
         self.defaultSiteName = defaultSiteName
         self.siteSettings = siteSettings
+
+        observeCardReader(from: cardPresentPaymentService)
     }
 
-    func updateCardReader(_ cardReader: CardPresentPaymentCardReader?) {
-        connectedCardReader = cardReader
+    private func observeCardReader(from service: CardPresentPaymentFacade) {
+        cancellables = service.readerConnectionStatusPublisher
+            .sink(receiveValue: { [weak self] connectionStatus in
+                guard let self else { return }
+                let cardReader: CardPresentPaymentCardReader?
+                switch connectionStatus {
+                case .connected(let reader):
+                    cardReader = reader
+                default:
+                    cardReader = nil
+                }
+                connectedCardReader = cardReader
+            })
     }
 
     var storeName: String {
@@ -149,8 +164,5 @@ final class PointOfSaleSettingsPreviewController: PointOfSaleSettingsControllerP
         // no-op
     }
 
-    func updateCardReader(_ cardReader: CardPresentPaymentCardReader?) {
-        // no-op for preview
-    }
 }
 #endif

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -121,7 +121,8 @@ private extension POSTabCoordinator {
                     cardPresentPaymentService: cardPresentPaymentService,
                     orderController: PointOfSaleOrderController(orderService: orderService,
                                                                 receiptService: receiptService),
-                    settingsController: PointOfSaleSettingsController(settingsService: settingsService),
+                    settingsController: PointOfSaleSettingsController(settingsService: settingsService,
+                                                                      cardPresentPaymentService: cardPresentPaymentService),
                     collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker,
                     searchHistoryService: POSSearchHistoryService(siteID: siteID),
                     popularPurchasableItemsController: PointOfSaleItemsController(

WooCommerce/WooCommerceTests/POS/Controllers/PointOfSaleSettingsControllerTests.swift

@@ -1,4 +1,3 @@
-
 import Testing
 import Foundation
 @testable import WooCommerce
@@ -9,11 +8,13 @@ import Storage
 struct PointOfSaleSettingsControllerTests {
     private let mockSettingsService = MockPointOfSaleSettingsService()
     private let mockStorageManager = MockStorageManager()
+    private let mockCardPresentPaymentService = MockCardPresentPaymentService()
 
     @Test func storeName_when_defaultSiteName_provided_then_returns_defaultSiteName() async throws {
         // Given
         let expectedStoreName = "My Test Store"
         let sut = PointOfSaleSettingsController(settingsService: mockSettingsService,
+                                                cardPresentPaymentService: mockCardPresentPaymentService,
                                                 defaultSiteName: expectedStoreName,
                                                 siteSettings: [])
 
@@ -27,6 +28,7 @@ struct PointOfSaleSettingsControllerTests {
     @Test func storeName_when_defaultSiteName_nil_then_returns_notSet() async throws {
         // Given
         let sut = PointOfSaleSettingsController(settingsService: mockSettingsService,
+                                                cardPresentPaymentService: mockCardPresentPaymentService,
                                                 defaultSiteName: nil,
                                                 siteSettings: [])
 
@@ -41,6 +43,7 @@ struct PointOfSaleSettingsControllerTests {
         // Given
         let siteSettings = makeSampleSiteSettings()
         let sut = PointOfSaleSettingsController(settingsService: mockSettingsService,
+                                                cardPresentPaymentService: mockCardPresentPaymentService,
                                                 defaultSiteName: "Test Store",
                                                 siteSettings: siteSettings)
 
@@ -54,6 +57,7 @@ struct PointOfSaleSettingsControllerTests {
     @Test func connectedCardReader_initially_nil() async throws {
         // Given
         let sut = PointOfSaleSettingsController(settingsService: mockSettingsService,
+                                                cardPresentPaymentService: mockCardPresentPaymentService,
                                                 defaultSiteName: "Test Store",
                                                 siteSettings: [])
 
@@ -64,35 +68,26 @@ struct PointOfSaleSettingsControllerTests {
         #expect(cardReader == nil)
     }
 
-    @Test func updateCardReader_sets_connectedCardReader() async throws {
+    @Test func cardReader_observation_updates_connectedCardReader() async throws {
         // Given
+        let mockService = MockCardPresentPaymentService()
         let sut = PointOfSaleSettingsController(settingsService: mockSettingsService,
+                                                cardPresentPaymentService: mockService,
                                                 defaultSiteName: "Test Store",
                                                 siteSettings: [])
-        let cardReader = CardPresentPaymentCardReader(name: "WisePad 3", batteryLevel: 0.85)
+
+        // Initially nil
+        #expect(sut.connectedCardReader == nil)
 
         // When
-        sut.updateCardReader(cardReader)
+        let cardReader = CardPresentPaymentCardReader(name: "WisePad 3", batteryLevel: 0.75)
+        mockService.connectedReader = cardReader
 
         // Then
         #expect(sut.connectedCardReader?.name == "WisePad 3")
-        #expect(sut.connectedCardReader?.batteryLevel == 0.85)
+        #expect(sut.connectedCardReader?.batteryLevel == 0.75)
     }
 
-    @Test func updateCardReader_with_nil_clears_connectedCardReader() async throws {
-        // Given
-        let sut = PointOfSaleSettingsController(settingsService: mockSettingsService,
-                                                defaultSiteName: "Test Store",
-                                                siteSettings: [])
-        let cardReader = CardPresentPaymentCardReader(name: "WisePad 3", batteryLevel: 0.85)
-        sut.updateCardReader(cardReader)
-
-        // When
-        sut.updateCardReader(nil)
-
-        // Then
-        #expect(sut.connectedCardReader == nil)
-    }
 
     private func makeSampleSiteSettings() -> [Yosemite.SiteSetting] {
         return [
@@ -154,7 +149,4 @@ final class MockPointOfSaleSettingsController: PointOfSaleSettingsControllerProt
         // no-op
     }
 
-    func updateCardReader(_ cardReader: CardPresentPaymentCardReader?) {
-        // no-op
-    }
 }