MBL-1123: Refactor PledgePaymentMethodsViewModel to use PaymentSourceSelected

Kickstarter-iOS/Features/PledgePaymentMethods/Controller/PledgePaymentMethodsViewController.swift

@@ -76,7 +76,7 @@ final class PledgePaymentMethodsViewController: UIViewController {
 
     self.viewModel.outputs.reloadPaymentMethods
       .observeForUI()
-      .observeValues { [weak self] cards, paymentSheetCards, selectedCard, selectedPaymentSheetCardId, shouldReload, isLoading in
+      .observeValues { [weak self] cards, paymentSheetCards, selectedPaymentMethod, shouldReload, isLoading in
         guard let self = self else { return }
 
         self.dataSource.load(
@@ -88,15 +88,15 @@ final class PledgePaymentMethodsViewController: UIViewController {
         if shouldReload {
           self.tableView.reloadData()
         } else {
-          switch (selectedCard, selectedPaymentSheetCardId) {
-          case let (.none, .some(selectedPaymentSheetCardId)):
+          switch selectedPaymentMethod {
+          case let .setupIntentClientSecret(selectedPaymentSheetCardId):
             self.tableView.visibleCells
               .compactMap { $0 as? PledgePaymentSheetPaymentMethodCell }
               .forEach { $0.setSelectedCard(selectedPaymentSheetCardId) }
-          case let (.some(selectedCard), .none):
+          case let .paymentSourceId(selectedCardId):
             self.tableView.visibleCells
               .compactMap { $0 as? PledgePaymentMethodCell }
-              .forEach { $0.setSelectedCard(selectedCard) }
+              .forEach { $0.setSelectedCardId(selectedCardId) }
           default:
             break
           }

Kickstarter-iOS/Features/PledgePaymentMethods/Views/Cells/PledgePaymentMethodCell.swift

@@ -163,8 +163,8 @@ final class PledgePaymentMethodCell: UITableViewCell, ValueCell {
 
   // MARK: - Accessors
 
-  func setSelectedCard(_ card: UserCreditCards.CreditCard) {
-    self.viewModel.inputs.setSelectedCard(card)
+  func setSelectedCardId(_ id: String) {
+    self.viewModel.inputs.setSelectedCardId(id)
   }
 }
 

Library/ViewModels/PledgePaymentMethodCellViewModel.swift

@@ -17,7 +17,7 @@ public protocol PledgePaymentMethodCellViewModelInputs {
   func configureWith(value: PledgePaymentMethodCellData)
 
   /// Call with the currently selected card.
-  func setSelectedCard(_ creditCard: UserCreditCards.CreditCard)
+  func setSelectedCardId(_ id: String)
 }
 
 public protocol PledgePaymentMethodCellViewModelOutputs {
@@ -64,7 +64,7 @@ public final class PledgePaymentMethodCellViewModel: PledgePaymentMethodCellView
   PledgePaymentMethodCellViewModelOutputs, PledgePaymentMethodCellViewModelType {
   public init() {
     let creditCard = self.configureValueProperty.signal.skipNil().map(\.card)
-    let selectedCard = self.selectedCardProperty.signal.skipNil()
+    let selectedCardId = self.selectedCardIdProperty.signal.skipNil()
     let cardTypeIsAvailable = self.configureValueProperty.signal.skipNil().map(\.isEnabled)
     let configuredAsSelected = self.configureValueProperty.signal.skipNil().map(\.isSelected)
 
@@ -90,10 +90,12 @@ public final class PledgePaymentMethodCellViewModel: PledgePaymentMethodCellView
 
     let cardAndSelectedCard = Signal.combineLatest(
       creditCard,
-      selectedCard
+      selectedCardId
     )
 
-    let setAsSelected = cardAndSelectedCard.map(==)
+    let setAsSelected = cardAndSelectedCard.map { card, id in
+      card.id == id
+    }
 
     let creditCardCheckImageName = Signal.merge(configuredAsSelected, setAsSelected)
       .map { $0 ? "icon-payment-method-selected" : "icon-payment-method-unselected" }
@@ -135,9 +137,9 @@ public final class PledgePaymentMethodCellViewModel: PledgePaymentMethodCellView
     self.configureValueProperty.value = value
   }
 
-  private let selectedCardProperty = MutableProperty<UserCreditCards.CreditCard?>(nil)
-  public func setSelectedCard(_ creditCard: UserCreditCards.CreditCard) {
-    self.selectedCardProperty.value = creditCard
+  private let selectedCardIdProperty = MutableProperty<String?>(nil)
+  public func setSelectedCardId(_ id: String) {
+    self.selectedCardIdProperty.value = id
   }
 
   public let cardImageAlpha: Signal<CGFloat, Never>

Library/ViewModels/PledgePaymentMethodCellViewModelTests.swift

@@ -148,7 +148,7 @@ internal final class PledgePaymentMethodCellViewModelTests: TestCase {
     self.unavailableCardText.assertDidNotEmitValue()
 
     self.vm.inputs.configureWith(value: (UserCreditCards.generic, true, true, "Brooklyn, NY", false))
-    self.vm.inputs.setSelectedCard(UserCreditCards.diners)
+    self.vm.inputs.setSelectedCardId(UserCreditCards.diners.id)
 
     self.cardImageName.assertValues(["icon--generic"])
     self.cardImageAlpha.assertValues([1.0])
@@ -177,7 +177,7 @@ internal final class PledgePaymentMethodCellViewModelTests: TestCase {
     self.unavailableCardText.assertDidNotEmitValue()
 
     self.vm.inputs.configureWith(value: (UserCreditCards.generic, true, false, "Brooklyn, NY", false))
-    self.vm.inputs.setSelectedCard(UserCreditCards.generic)
+    self.vm.inputs.setSelectedCardId(UserCreditCards.generic.id)
 
     self.cardImageName.assertValues(["icon--generic"])
     self.cardImageAlpha.assertValues([1.0])
@@ -206,7 +206,7 @@ internal final class PledgePaymentMethodCellViewModelTests: TestCase {
     self.unavailableCardText.assertDidNotEmitValue()
 
     self.vm.inputs.configureWith(value: (UserCreditCards.generic, false, true, "Brooklyn, NY", false))
-    self.vm.inputs.setSelectedCard(UserCreditCards.generic)
+    self.vm.inputs.setSelectedCardId(UserCreditCards.generic.id)
 
     self.cardImageName.assertValues(["icon--generic"])
     self.cardImageAlpha.assertValues([0.5])

Library/ViewModels/PledgePaymentMethodsViewModel.swift

@@ -27,8 +27,7 @@ public typealias PaymentSheetSetupData = (
 public typealias PledgePaymentMethodsAndSelectionData = (
   paymentMethodsCellData: [PledgePaymentMethodCellData],
   paymentSheetPaymentMethodsCellData: [PaymentSheetPaymentMethodCellData],
-  selectedCard: UserCreditCards.CreditCard?,
-  selectedSetupIntent: String?,
+  selectedPaymentMethod: PaymentSourceSelected?,
   shouldReload: Bool,
   isLoading: Bool
 )
@@ -134,19 +133,23 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
       .map { _ in (
         paymentMethodsCellData: [],
         paymentSheetPaymentMethodsCellData: [],
-        selectedCard: nil,
-        selectedSetupIntent: nil,
+        selectedPaymentMethod: nil,
         shouldReload: true,
         isLoading: true
       ) }
 
     let configuredCards: Signal<PledgePaymentMethodsAndSelectionData, Never> = cards
       .map { cellData, selectedCard -> PledgePaymentMethodsAndSelectionData in
-        PledgePaymentMethodsAndSelectionData(
+
+        var selectedPaymentMethod: PaymentSourceSelected?
+        if let selectedCardId = selectedCard?.id {
+          selectedPaymentMethod = .paymentSourceId(selectedCardId)
+        }
+
+        return PledgePaymentMethodsAndSelectionData(
           paymentMethodsCellData: cellData,
           paymentSheetPaymentMethodsCellData: [],
-          selectedCard: selectedCard,
-          selectedSetupIntent: nil,
+          selectedPaymentMethod: selectedPaymentMethod,
           shouldReload: true,
           isLoading: false
         )
@@ -186,8 +189,7 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
         let updatedData = data
           |> \.paymentMethodsCellData .~ []
           |> \.paymentSheetPaymentMethodsCellData .~ []
-          |> \.selectedCard .~ nil
-          |> \.selectedSetupIntent .~ nil
+          |> \.selectedPaymentMethod .~ nil
           |> \.isLoading .~ false
           |> \.shouldReload .~ true
 
@@ -211,8 +213,7 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
           let selectionUpdatedData = updatedData
             |> \.paymentMethodsCellData .~ cellData(data.paymentMethodsCellData, selecting: nil)
             |> \.paymentSheetPaymentMethodsCellData .~ selectedAllSheetPaymentMethods
-            |> \.selectedCard .~ nil
-            |> \.selectedSetupIntent .~ setupIntent
+            |> \.selectedPaymentMethod .~ .setupIntentClientSecret(setupIntent)
 
           return selectionUpdatedData
         } else if indexPath.row < paymentSheetPaymentMethodCount + paymentMethodCount {
@@ -232,7 +233,7 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
           let selectionUpdatedData = updatedData
             |> \.paymentMethodsCellData .~ cellData(data.paymentMethodsCellData, selecting: card)
             |> \.paymentSheetPaymentMethodsCellData .~ deselectAllSheetPaymentMethods
-            |> \.selectedCard .~ card
+            |> \.selectedPaymentMethod .~ .paymentSourceId(card.id)
 
           return selectionUpdatedData
         }
@@ -253,19 +254,7 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
     )
 
     self.notifyDelegateCreditCardSelected = self.reloadPaymentMethods
-      .map { paymentMethodData -> PaymentSourceSelected? in
-        let selectedPaymentMethodCardId = paymentMethodData.selectedCard?.id
-        let selectedPaymentSheetPaymentMethodCardId = paymentMethodData.selectedSetupIntent
-
-        switch (selectedPaymentMethodCardId, selectedPaymentSheetPaymentMethodCardId) {
-        case let (.none, .some(selectedPaymentSheetPaymentMethodCardId)):
-          return PaymentSourceSelected.setupIntentClientSecret(selectedPaymentSheetPaymentMethodCardId)
-        case let (.some(selectedPaymentMethodCardId), .none):
-          return PaymentSourceSelected.paymentSourceId(selectedPaymentMethodCardId)
-        default:
-          return nil
-        }
-      }
+      .map { $0.selectedPaymentMethod }
       .skipNil()
       .skipRepeats()
 
@@ -511,8 +500,7 @@ private func pledgePaymentSheetMethodCellDataAndSelectedCardSetupIntent(
     let updatePaymentMethodData = paymentMethodData
       |> \.paymentMethodsCellData .~ preexistingCardDataUnselected
       |> \.paymentSheetPaymentMethodsCellData .~ data
-      |> \.selectedCard .~ nil
-      |> \.selectedSetupIntent .~ newestPaymentSheetPaymentMethod.setupIntent
+      |> \.selectedPaymentMethod .~ .setupIntentClientSecret(newestPaymentSheetPaymentMethod.setupIntent)
 
     return updatePaymentMethodData
   }()