Rework CIAB eligibility checker and add tests

Author: RafaelKayumov

Modules/Sources/Yosemite/Stores/OrderCardPresentPaymentEligibilityStore.swift

@@ -5,16 +5,18 @@ import protocol NetworkingCore.Network
 /// Determines whether an order is eligible for card present payment or not
 ///
 public final class OrderCardPresentPaymentEligibilityStore: Store {
-    private let stores: () -> StoresManager
-    private lazy var siteCIABEligibilityChecker: CIABEligibilityCheckerProtocol = CIABEligibilityChecker(stores: stores())
+    private let currentSite: () -> Site?
+    private lazy var siteCIABEligibilityChecker: CIABEligibilityCheckerProtocol = CIABEligibilityChecker(
+        currentSite: currentSite
+    )
 
     public init(
         dispatcher: Dispatcher,
         storageManager: StorageManagerType,
         network: Network,
-        stores: @escaping () -> StoresManager
+        currentSite: @escaping () -> Site?
     ) {
-        self.stores = stores
+        self.currentSite = currentSite
         super.init(
             dispatcher: dispatcher,
             storageManager: storageManager,

Modules/Sources/Yosemite/Tools/CIAB/CIABEligibilityChecker.swift

@@ -1,16 +1,18 @@
 import Foundation
 
 public final class CIABEligibilityChecker {
-    public let stores: StoresManager
+    public typealias ObtainSiteClosure = () -> Site?
 
-    public init(stores: StoresManager) {
-        self.stores = stores
+    public let currentSite: ObtainSiteClosure
+
+    public init(currentSite: @escaping ObtainSiteClosure) {
+        self.currentSite = currentSite
     }
 }
 
 extension CIABEligibilityChecker: CIABEligibilityCheckerProtocol {
     public var isCurrentSiteCIAB: Bool {
-        guard let currentSite = stores.sessionManager.defaultSite else {
+        guard let currentSite = currentSite() else {
             return false
         }
         return isSiteCIAB(currentSite)

Modules/Tests/YosemiteTests/Stores/OrderCardPresentPaymentEligibilityStoreTests.swift

@@ -27,12 +27,26 @@ final class OrderCardPresentPaymentEligibilityStoreTests: XCTestCase {
     ///
     private var store: OrderCardPresentPaymentEligibilityStore!
 
+    private var currentSite: Site?
+
     override func setUp() {
         super.setUp()
         dispatcher = Dispatcher()
         network = MockNetwork(useResponseQueue: true)
         storageManager = MockStorageManager()
-        store = OrderCardPresentPaymentEligibilityStore(dispatcher: dispatcher, storageManager: storageManager, network: network)
+        store = OrderCardPresentPaymentEligibilityStore(
+            dispatcher: dispatcher,
+            storageManager: storageManager,
+            network: network,
+            currentSite: { [weak self] in
+                return self?.currentSite
+            }
+        )
+    }
+
+    override func tearDown() {
+        currentSite = nil
+        super.tearDown()
     }
 
     // Other behavioural tests are in Order_CardPresentPaymentTests
@@ -55,6 +69,14 @@ final class OrderCardPresentPaymentEligibilityStoreTests: XCTestCase {
                                                          name: "Chocolate cake",
                                                          productTypeKey: "simple")
 
+        let regularSite = Site.fake().copy(
+            siteID: sampleSiteID,
+            isGarden: false,
+            gardenName: nil
+        )
+        self.currentSite = regularSite
+
+        storageManager.insertSampleSite(readOnlySite: regularSite)
         storageManager.insertSampleProduct(readOnlyProduct: nonSubscriptionProduct)
         storageManager.insertSampleOrder(readOnlyOrder: cppEligibleOrder)
 
@@ -75,4 +97,54 @@ final class OrderCardPresentPaymentEligibilityStoreTests: XCTestCase {
         let eligibility = try XCTUnwrap(result.get())
         XCTAssertTrue(eligibility)
     }
+
+    func test_orderIsEligibleForCardPresentPayment_returns_failure_for_CIAB_sites() throws {
+        // Given
+        let orderItem = OrderItem.fake().copy(itemID: 1234,
+                                              name: "Chocolate cake",
+                                              productID: 678,
+                                              quantity: 1.0)
+        let cppEligibleOrder = Order.fake().copy(siteID: sampleSiteID,
+                                                 orderID: 111,
+                                                 status: .pending,
+                                                 currency: "USD",
+                                                 datePaid: nil,
+                                                 total: "5.00",
+                                                 paymentMethodID: "woocommerce_payments",
+                                                 items: [orderItem])
+        let nonSubscriptionProduct = Product.fake().copy(siteID: sampleSiteID,
+                                                         productID: 678,
+                                                         name: "Chocolate cake",
+                                                         productTypeKey: "simple")
+
+        let ciabSite = Site.fake().copy(
+            siteID: sampleSiteID,
+            isGarden: true,
+            gardenName: "commerce"
+        )
+        self.currentSite = ciabSite
+
+        storageManager.insertSampleSite(readOnlySite: ciabSite)
+        storageManager.insertSampleProduct(readOnlyProduct: nonSubscriptionProduct)
+        storageManager.insertSampleOrder(readOnlyOrder: cppEligibleOrder)
+
+        let configuration = CardPresentPaymentsConfiguration(country: .US)
+
+        // When
+        let result = waitFor { promise in
+            let action = OrderCardPresentPaymentEligibilityAction
+                .orderIsEligibleForCardPresentPayment(orderID: 111,
+                                                      siteID: self.sampleSiteID,
+                                                      cardPresentPaymentsConfiguration: configuration) { result in
+                promise(result)
+            }
+            self.store.onAction(action)
+        }
+
+        // Then
+        XCTAssertThrowsError(try result.get()) { error in
+            XCTAssertEqual(error as? OrderCardPresentPaymentEligibilityStore.OrderIsEligibleForCardPresentPaymentError,
+                           .cardReaderPaymentOptionIsNotSupportedForCIABSites)
+        }
+    }
 }

WooCommerce/Classes/CIAB/CIABEligibilityChecker.swift

@@ -5,6 +5,10 @@ import Yosemite
 
 extension CIABEligibilityChecker {
     convenience init() {
-        self.init(stores: ServiceLocator.stores)
+        self.init(
+            currentSite: {
+                return ServiceLocator.stores.sessionManager.defaultSite
+            }
+        )
     }
 }

WooCommerce/Classes/Yosemite/AuthenticatedState.swift

@@ -75,7 +75,7 @@ class AuthenticatedState: StoresManagerState {
             MediaStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             NotificationStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             NotificationCountStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: PListFileStorage()),
-            OrderCardPresentPaymentEligibilityStore(dispatcher: dispatcher, storageManager: storageManager, network: network, stores: { ServiceLocator.stores }),
+            OrderCardPresentPaymentEligibilityStore(dispatcher: dispatcher, storageManager: storageManager, network: network, currentSite: { ServiceLocator.stores.sessionManager.defaultSite }),
             OrderNoteStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             OrderStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             OrderStatusStore(dispatcher: dispatcher, storageManager: storageManager, network: network),

WooCommerce/WooCommerceTests/ViewRelated/CIAB/CIABEligibilityCheckerTests.swift

@@ -3,20 +3,23 @@ import XCTest
 @testable import Yosemite
 
 class CIABEligibilityCheckerTests: XCTestCase {
-    private var storesManager: MockStoresManager!
     private var sessionManager: SessionManager!
     private var checker: CIABEligibilityChecker!
 
     override func setUp() {
         super.setUp()
         sessionManager = .makeForTesting()
-        storesManager = MockStoresManager(sessionManager: sessionManager)
-        checker = CIABEligibilityChecker(stores: storesManager)
+        checker = CIABEligibilityChecker(
+            currentSite: {
+                return MockStoresManager(
+                    sessionManager: self.sessionManager
+                ).sessionManager.defaultSite
+            }
+        )
     }
 
     override func tearDown() {
         checker = nil
-        storesManager = nil
         sessionManager = nil
         super.tearDown()
     }