WIP: Clean up view model

Author: amy-at-kickstarter

Kickstarter-iOS/Features/PledgeShippingLocation/PledgeShippingLocationViewController.swift

@@ -123,19 +123,19 @@ final class PledgeShippingLocationViewController: UIViewController {
       self.delegate?.pledgeShippingLocationViewControllerLayoutDidUpdate(self, shimmerLoadingViewIsHidden)
     }
 
-    self.viewModel.outputs.notifyDelegateOfSelectedShippingRule
+    self.viewModel.outputs.notifyDelegateOfSelectedShippingLocation
       .observeForUI()
-      .observeValues { [weak self] shippingRule in
+      .observeValues { [weak self] location in
         guard let self = self else { return }
 
-        self.delegate?.pledgeShippingLocationViewController(self, didSelect: shippingRule.location)
+        self.delegate?.pledgeShippingLocationViewController(self, didSelect: location)
       }
 
     self.viewModel.outputs.presentShippingRules
       .observeForUI()
-      .observeValues { [weak self] project, shippingRules, selectedShippingRule in
+      .observeValues { [weak self] project, shippingRules, location in
         self?.presentShippingRules(
-          project, shippingRules: shippingRules, selectedShippingRule: selectedShippingRule
+          project, shippingRules: shippingRules, selectedLocation: location
         )
       }
 
@@ -169,41 +169,29 @@ final class PledgeShippingLocationViewController: UIViewController {
   // MARK: - Functions
 
   private func presentShippingRules(
-    _: Project, shippingRules: [ShippingRule], selectedShippingRule: ShippingRule
+    _: Project, shippingRules: [ShippingRule], selectedLocation: Location
   ) {
     let viewController = ShippingLocationsViewController(
       withLocations: shippingRules.map { $0.location },
-      selectedLocation: selectedShippingRule.location
-    ) { _ in
-      // TODO:
+      selectedLocation: selectedLocation
+    ) { location in
+
+      self.viewModel.inputs.shippingLocationUpdated(to: location)
     }
     self.presentViewControllerWithSheetOverlay(viewController, offset: Layout.Sheet.offset)
-
-    /*
-     let viewController = ShippingRulesTableViewController.instantiate()
-     viewController.configureWith(
-       project, shippingRules: shippingRules,
-       selectedShippingRule: selectedShippingRule
-     )
-     viewController.delegate = self
-
-     let navigationController = UINavigationController(rootViewController: viewController)
-
-     self.presentViewControllerWithSheetOverlay(navigationController, offset: Layout.Sheet.offset)
-      */
   }
 }
 
 extension PledgeShippingLocationViewController: ShippingRulesTableViewControllerDelegate {
   func shippingRulesTableViewControllerCancelButtonTapped() {
-    self.viewModel.inputs.shippingRulesCancelButtonTapped()
+    // self.viewModel.inputs.shippingLocationCancelButtonTapped()
   }
 
   func shippingRulesTableViewController(
     _: ShippingRulesTableViewController,
-    didSelect shippingRule: ShippingRule
+    didSelect _: ShippingRule
   ) {
-    self.viewModel.inputs.shippingRuleUpdated(to: shippingRule)
+    //  self.viewModel.inputs.shippingLocationUpdated(to: lo)
   }
 }
 

Library/ViewModels/PledgeShippingLocationViewModel.swift

@@ -12,16 +12,16 @@ public struct PledgeShippingLocationViewData {
 public protocol PledgeShippingLocationViewModelInputs {
   func configureWith(data: PledgeShippingLocationViewData)
   func shippingLocationButtonTapped()
-  func shippingRulesCancelButtonTapped()
-  func shippingRuleUpdated(to rule: ShippingRule)
+  func shippingLocationCancelButtonTapped()
+  func shippingLocationUpdated(to rule: Location)
   func viewDidLoad()
 }
 
 public protocol PledgeShippingLocationViewModelOutputs {
   var adaptableStackViewIsHidden: Signal<Bool, Never> { get }
   var dismissShippingRules: Signal<Void, Never> { get }
-  var presentShippingRules: Signal<(Project, [ShippingRule], ShippingRule), Never> { get }
-  var notifyDelegateOfSelectedShippingRule: Signal<ShippingRule, Never> { get }
+  var presentShippingRules: Signal<(Project, [ShippingRule], Location), Never> { get }
+  var notifyDelegateOfSelectedShippingLocation: Signal<Location, Never> { get }
   var shimmerLoadingViewIsHidden: Signal<Bool, Never> { get }
   var shippingLocationButtonTitle: Signal<String, Never> { get }
   var shippingRulesError: Signal<String, Never> { get }
@@ -76,29 +76,30 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
       selectedLocationId
     )
     .map(determineShippingRule)
+    .map { $0?.location }
 
     self.shippingRulesError = shippingRulesEvent.errors().map { _ in
       Strings.We_were_unable_to_load_the_shipping_destinations()
     }
 
-    self.notifyDelegateOfSelectedShippingRule = Signal.merge(
+    self.notifyDelegateOfSelectedShippingLocation = Signal.merge(
       initialShippingRule.skipNil(),
-      self.shippingRuleUpdatedSignal
+      self.shippingLocationUpdatedSignal
     )
 
     self.presentShippingRules = Signal.combineLatest(
       project,
       shippingRulesEvent.values(),
-      self.notifyDelegateOfSelectedShippingRule
+      self.notifyDelegateOfSelectedShippingLocation
     )
     .takeWhen(self.shippingLocationButtonTappedSignal)
 
-    self.shippingLocationButtonTitle = self.notifyDelegateOfSelectedShippingRule
-      .map { $0.location.localizedName }
+    self.shippingLocationButtonTitle = self.notifyDelegateOfSelectedShippingLocation
+      .map { $0.localizedName }
 
     self.dismissShippingRules = Signal.merge(
-      self.shippingRulesCancelButtonTappedProperty.signal,
-      self.shippingRuleUpdatedSignal.signal
+      self.shippingLocationCancelButtonTappedProperty.signal,
+      self.shippingLocationUpdatedSignal.signal
         .ignoreValues()
         .ksr_debounce(.milliseconds(300), on: AppEnvironment.current.scheduler)
     )
@@ -115,14 +116,15 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
     self.shippingLocationButtonTappedObserver.send(value: ())
   }
 
-  private let shippingRulesCancelButtonTappedProperty = MutableProperty(())
-  public func shippingRulesCancelButtonTapped() {
-    self.shippingRulesCancelButtonTappedProperty.value = ()
+  private let shippingLocationCancelButtonTappedProperty = MutableProperty(())
+  public func shippingLocationCancelButtonTapped() {
+    self.shippingLocationCancelButtonTappedProperty.value = ()
   }
 
-  private let (shippingRuleUpdatedSignal, shippingRuleUpdatedObserver) = Signal<ShippingRule, Never>.pipe()
-  public func shippingRuleUpdated(to rule: ShippingRule) {
-    self.shippingRuleUpdatedObserver.send(value: rule)
+  private let (shippingLocationUpdatedSignal, shippingLocationUpdatedObserver) = Signal<Location, Never>
+    .pipe()
+  public func shippingLocationUpdated(to location: Location) {
+    self.shippingLocationUpdatedObserver.send(value: location)
   }
 
   private let viewDidLoadProperty = MutableProperty(())
@@ -132,8 +134,8 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
 
   public let adaptableStackViewIsHidden: Signal<Bool, Never>
   public let dismissShippingRules: Signal<Void, Never>
-  public let presentShippingRules: Signal<(Project, [ShippingRule], ShippingRule), Never>
-  public let notifyDelegateOfSelectedShippingRule: Signal<ShippingRule, Never>
+  public let presentShippingRules: Signal<(Project, [ShippingRule], Location), Never>
+  public let notifyDelegateOfSelectedShippingLocation: Signal<Location, Never>
   public let shimmerLoadingViewIsHidden: Signal<Bool, Never>
   public let shippingLocationButtonTitle: Signal<String, Never>
   public let shippingRulesError: Signal<String, Never>