Use shippableCountriesExpanded instead of simpleShippingRulesExpanded

Author: amy-at-kickstarter

GraphAPI/GraphAPITestMocks/Project+Mock.graphql.swift

@@ -3547,7 +3547,6 @@
 		E1A310212D270C610062646C /* BuildPaymentPlanQueryTestData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildPaymentPlanQueryTestData.swift; sourceTree = "<group>"; };
 		E1A310252D2840680062646C /* PledgeOverTimeUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PledgeOverTimeUseCase.swift; sourceTree = "<group>"; };
 		E1A310272D2845CB0062646C /* PledgeOverTimeUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PledgeOverTimeUseCaseTests.swift; sourceTree = "<group>"; };
-		E1A530372EDE2F97000D8CC3 /* SimpleShippingRuleLocationFragment.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = SimpleShippingRuleLocationFragment.graphql; sourceTree = "<group>"; };
 		E1B33F502E538157008903BA /* GraphAPI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = GraphAPI; sourceTree = "<group>"; };
 		E1B813C62BC851CB00DF33CF /* FetchMyBackedProjectsQueryRequestForTests.graphql_test */ = {isa = PBXFileReference; lastKnownFileType = text; path = FetchMyBackedProjectsQueryRequestForTests.graphql_test; sourceTree = "<group>"; };
 		E1B813C82BC851E100DF33CF /* FetchMyBackedProjectsQuery.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = FetchMyBackedProjectsQuery.json; sourceTree = "<group>"; };
@@ -7677,7 +7676,6 @@
 				E190EB322E29944E006A6DB6 /* ProjectPamphletMainCellPropertiesFragment.graphql */,
 				E190EB332E29944E006A6DB6 /* RewardFragment.graphql */,
 				E190EB342E29944E006A6DB6 /* ShippingRuleFragment.graphql */,
-				E1A530372EDE2F97000D8CC3 /* SimpleShippingRuleLocationFragment.graphql */,
 				E190EB352E29944E006A6DB6 /* UserEmailFragment.graphql */,
 				E190EB362E29944E006A6DB6 /* UserFeaturesFragment.graphql */,
 				E190EB372E29944E006A6DB6 /* UserFragment.graphql */,

GraphAPI/Sources/Fragments/SimpleShippingRuleLocationFragment.graphql.swift

@@ -16,24 +16,6 @@ extension Location {
     )
   }
 
-  static func location(from rule: GraphAPI.SimpleShippingRuleLocationFragment?) -> Location? {
-    guard let rule = rule,
-          let name = rule.locationName,
-          let graphId = rule.locationId,
-          let id = decompose(id: graphId)
-    else {
-      return nil
-    }
-
-    return Location(
-      country: rule.country,
-      displayableName: name,
-      id: id,
-      localizedName: name,
-      name: name
-    )
-  }
-
   public static func locations(from data: GraphAPI.DefaultLocationsQuery.Data) -> [Location] {
     guard let nodes = data.locations?.nodes else {
       return []
@@ -57,37 +39,9 @@ extension Location {
   }
 
   public static func locations(from data: GraphAPI.ShippableLocationsForProjectQuery.Data) -> [Location] {
-    let allLocations = allLocations(from: data)
-    return self.flattenAndDedupeLocations(from: allLocations)
-  }
-
-  static func allLocations(from data: GraphAPI.ShippableLocationsForProjectQuery.Data) -> [[Location]] {
-    return data.project?.rewards?.nodes?.compactMap { reward in
-      reward?.simpleShippingRulesExpanded.compactMap { rule -> Location? in
-        Location.location(from: rule?.fragments.simpleShippingRuleLocationFragment)
-      }
+    return data.project?.shippableCountriesExpanded.compactMap { node in
+      let fragment = node.fragments.locationFragment
+      return KsApi.Location.location(from: fragment)
     } ?? []
   }
-
-  static func flattenAndDedupeLocations(from rewardLocations: [[Location]]) -> [Location] {
-    // Flatten the list of locations from all rewards into one list
-    let locations = rewardLocations.reduce(into: []) { partialResults, location in
-      partialResults += location
-    }
-
-    // ...and then filter out any duplicates
-    var filteredLocations: [Location] = []
-    var seenLocationIds = Set<Int>()
-
-    for location in locations {
-      if seenLocationIds.contains(location.id) {
-        continue
-      }
-
-      filteredLocations.append(location)
-      seenLocationIds.insert(location.id)
-    }
-
-    return filteredLocations
-  }
 }

GraphAPI/Sources/Operations/Queries/ShippableLocationsForProjectQuery.graphql.swift

@@ -15,25 +15,4 @@ final class Location_LocationFragmentTests: XCTestCase {
 
     XCTAssertNotNil(Location.location(from: locationFragment))
   }
-
-  func testSimpleShippingRule() {
-    let simpleShippingRuleFragment = GraphAPI.SimpleShippingRuleLocationFragment(
-      locationId: "TG9jYXRpb24tMjM0MjQ3NzU=",
-      locationName: "Canada",
-      country: "CA"
-    )
-
-    XCTAssertNotNil(Location.location(from: simpleShippingRuleFragment))
-  }
-
-  func testFlattenAndDedupeLocations() {
-    let allRewardLocations: [[Location]] = [
-      [Location.usa],
-      [Location.usa, Location.australia],
-      [Location.australia, Location.canada]
-    ]
-
-    let flattened = Location.flattenAndDedupeLocations(from: allRewardLocations)
-    XCTAssertEqual(flattened, [Location.usa, Location.australia, Location.canada])
-  }
 }

GraphAPI/Sources/Schema/SchemaMetadata.graphql.swift

@@ -1,11 +1,7 @@
 query ShippableLocationsForProject($id: Int!) {
   project(pid: $id) {
-    rewards {
-      nodes {
-        simpleShippingRulesExpanded {
-          ...SimpleShippingRuleLocationFragment
-        }
-      }
+    shippableCountriesExpanded {
+      ...LocationFragment
     }
   }
 }