More cleanup

Author: amy-at-kickstarter

Library/SharedFunctions.swift

@@ -224,8 +224,8 @@ public func defaultShippingLocation(fromLocations locations: [Location]) -> Loca
     return currentLocation
   }
 
-  if let 🇺🇸🦅 = locations.first(where: { $0.country == "US" }) {
-    return 🇺🇸🦅
+  if let usaLocation = locations.first(where: { $0.country == "US" }) {
+    return usaLocation
   }
 
   return locations.first

Library/ViewModels/PledgeShippingLocationViewModel.swift

@@ -51,14 +51,20 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
     let shippingShouldBeginLoading = project
       .mapConst(true)
 
-    let locations: Signal<[Location], Never> = project.switchMap { p -> SignalProducer<[Location], Never> in
-      shippingLocations(forProject: p)
-        .demoteErrors(replaceErrorWith: [])
-    }
+    let locations: Signal<[Location]?, Never> = configData
+      .ignoreValues()
+      .switchMap { _ in
+        shippableLocations()
+          .wrapInOptional()
+          .demoteErrors(replaceErrorWith: nil)
+      }
+
+    let loadedLocations = locations.skipNil()
+    let erroredLocations = locations.filter { $0.isNil }
 
     let shippingRulesLoadingCompleted = locations
+      .demoteErrors(replaceErrorWith: [])
       .mapConst(false)
-      .ksr_debounce(.seconds(1), on: AppEnvironment.current.scheduler)
 
     let isLoading = Signal.merge(
       shippingShouldBeginLoading,
@@ -70,21 +76,21 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
 
     let initialShippingLocation = Signal.combineLatest(
       project,
-      locations,
+      loadedLocations,
       selectedLocationId
     )
     .map(determineShippingLocation)
 
-    self.shippingRulesError = locations.map { $0 == [] ? "Shoot" : nil }
-      .skipNil()
+    self.shippingRulesError = erroredLocations
+      .mapConst(Strings.We_were_unable_to_load_the_shipping_destinations())
 
     self.notifyDelegateOfSelectedShippingLocation = Signal.merge(
       initialShippingLocation.skipNil(),
       self.shippingLocationUpdatedSignal
     )
 
     self.presentShippingLocations = Signal.combineLatest(
-      locations,
+      loadedLocations,
       self.notifyDelegateOfSelectedShippingLocation
     )
     .takeWhen(self.shippingLocationButtonTappedSignal)
@@ -172,70 +178,12 @@ private func determineShippingLocation(
   return defaultShippingLocation(fromLocations: locations)
 }
 
-private func shippingLocations(forProject _: Project) -> SignalProducer<[Location], ErrorEnvelope> {
-  let query = GraphAPI.LocationsByTermQuery(
-    term: GraphQLNullable.some("America"),
-    first: GraphQLNullable.some(25)
-  )
+private func shippableLocations() -> SignalProducer<[Location], ErrorEnvelope> {
+  let query = GraphAPI.ShippableLocationsQuery()
   let signal = AppEnvironment.current.apiService.fetch(query: query)
     .map { data in
       let locations = Location.locations(from: data)
       return locations
     }
   return signal
 }
-
-/*
- Iterates through all reward shipping preferences to get all possible shipping rules.
- */
-
-private func getShippingRulesForAllRewards(in project: Project) -> SignalProducer<Signal<
-  [ShippingRule],
-  ErrorEnvelope
->.Event, Never> {
-  /// Get  all of the reward IDs we'll need to fetch the Shipping Rules. See inner method logic for more details.
-  let rewardIDsToQuery: Set<Int> = getRewardIDsToQuery(for: project)
-
-  /// Initializing the result with a fetch using the first reward ID in the Set to avoid optional warnings
-  var queryResult: SignalProducer<Signal<[ShippingRule], ErrorEnvelope>.Event, Never>?
-
-  /// Fetch the shipping rules for each reward and then consolidate each corresponding SignalProducer into the `queryResult` variable using .merge(with:).
-  rewardIDsToQuery.forEach { id in
-    let fetchResult = AppEnvironment.current.apiService.fetchRewardShippingRules(
-      projectId: project.id,
-      rewardId: id
-    )
-    .ksr_delay(AppEnvironment.current.apiDelayInterval, on: AppEnvironment.current.scheduler)
-    .map(ShippingRulesEnvelope.lens.shippingRules.view)
-    .retry(upTo: 3)
-    .materialize()
-
-    queryResult = queryResult?.merge(with: fetchResult) ?? fetchResult
-  }
-
-  return queryResult ?? SignalProducer(value: .value([]))
-}
-
-private func getRewardIDsToQuery(for project: Project) -> Set<Int> {
-  /// Using a Set to avoid adding duplicate reward IDs. Some rewards may have the same shipping preferences.
-  var rewardIDsToQuery = Set<Int>()
-
-  /// If project contains a reward with an `unrestricted` shipping preference, we can query just that reward. This will return ALL available locations.
-  if let reward = project.rewards
-    .first(where: { $0.isUnRestrictedShippingPreference && $0.shipping.enabled }) {
-    rewardIDsToQuery.insert(reward.id)
-  }
-
-  /// If project does not contain a reward with an `unrestricted` shipping preference, then we'll need to query all other rewards to capture all possible shipping locations.
-  if rewardIDsToQuery.isEmpty {
-    let restrictedRewards = project.rewards
-      .filter {
-        ($0.isRestrictedShippingPreference || $0.hasNoShippingPreference)
-          && $0.shipping.enabled
-      }
-
-    restrictedRewards.forEach { rewardIDsToQuery.insert($0.id) }
-  }
-
-  return rewardIDsToQuery
-}

Library/ViewModels/RewardsCollectionViewModelTests.swift

@@ -10,6 +10,7 @@ final class RewardsCollectionViewModelTests: TestCase {
   private let reloadDataWithValues = TestObserver<[Reward], Never>()
   private let scrollToRewardIndex = TestObserver<Int, Never>()
   private let goToCustomizeYourReward = TestObserver<PledgeViewData, Never>()
+  private let shippingLocationViewHidden = TestObserver<Bool, Never>()
 
   private let vm = RewardsCollectionViewModel()
 
@@ -22,6 +23,8 @@ final class RewardsCollectionViewModelTests: TestCase {
     self.vm.outputs.scrollToRewardIndexPath.map { $0.row }.observe(self.scrollToRewardIndex.observer)
 
     self.vm.outputs.goToCustomizeYourReward.observe(self.goToCustomizeYourReward.observer)
+
+    self.vm.outputs.shippingLocationViewHidden.observe(self.shippingLocationViewHidden.observer)
   }
 
   func testRewardsOrdered() {
@@ -203,6 +206,8 @@ final class RewardsCollectionViewModelTests: TestCase {
     self.vm.viewDidLoad()
     self.vm.viewDidLayoutSubviews()
 
+    self.shippingLocationViewHidden.assertLastValue(true)
+
     self.vm.inputs.shippingLocationSelected(location2)
     self.vm.inputs.rewardSelected(with: reward.id)
 
@@ -249,6 +254,8 @@ final class RewardsCollectionViewModelTests: TestCase {
     self.vm.viewDidLoad()
     self.vm.viewDidLayoutSubviews()
 
+    self.shippingLocationViewHidden.assertLastValue(true)
+
     self.vm.inputs.shippingLocationSelected(location1)
     self.vm.inputs.rewardSelected(with: reward.id)
 
@@ -300,12 +307,14 @@ final class RewardsCollectionViewModelTests: TestCase {
       |> Project.lens.rewardData.rewards .~ rewards
 
     self.vm.configure(with: testProject, refTag: nil, context: .createPledge, secretRewardToken: nil)
-    // Because the shipping location is powered by the available shipping rules,
-    // if there are no shippable rewards, the location element may be hidden and output `nil` once.
     self.vm.inputs.shippingLocationSelected(nil)
     self.vm.viewDidLoad()
     self.vm.viewDidLayoutSubviews()
 
+    // Because the shipping location is powered by the available shipping rules,
+    // if there are no shippable rewards, the location element may be hidden and output `nil` once.
+    self.shippingLocationViewHidden.assertLastValue(false)
+
     self.vm.inputs.rewardSelected(with: digitalReward.id)
 
     self.goToCustomizeYourReward.assertDidEmitValue()