MBL-1316: Use isAvailable to filter visible add-ons

KsApi/GraphAPI.swift

@@ -15520,6 +15520,7 @@ public enum GraphAPI {
         estimatedDeliveryOn
         id
         isMaxPledge
+        available
         items {
           __typename
           edges {
@@ -15570,6 +15571,7 @@ public enum GraphAPI {
         GraphQLField("estimatedDeliveryOn", type: .scalar(String.self)),
         GraphQLField("id", type: .nonNull(.scalar(GraphQLID.self))),
         GraphQLField("isMaxPledge", type: .nonNull(.scalar(Bool.self))),
+        GraphQLField("available", type: .nonNull(.scalar(Bool.self))),
         GraphQLField("items", type: .object(Item.selections)),
         GraphQLField("limit", type: .scalar(Int.self)),
         GraphQLField("limitPerBacker", type: .scalar(Int.self)),
@@ -15595,8 +15597,8 @@ public enum GraphAPI {
       self.resultMap = unsafeResultMap
     }
 
-    public init(amount: Amount, backersCount: Int? = nil, convertedAmount: ConvertedAmount, allowedAddons: AllowedAddon, description: String, displayName: String, endsAt: String? = nil, estimatedDeliveryOn: String? = nil, id: GraphQLID, isMaxPledge: Bool, items: Item? = nil, limit: Int? = nil, limitPerBacker: Int? = nil, localReceiptLocation: LocalReceiptLocation? = nil, name: String? = nil, postCampaignPledgingEnabled: Bool, project: Project? = nil, remainingQuantity: Int? = nil, shippingPreference: ShippingPreference? = nil, shippingSummary: String? = nil, shippingRules: [ShippingRule?]? = nil, startsAt: String? = nil) {
-      self.init(unsafeResultMap: ["__typename": "Reward", "amount": amount.resultMap, "backersCount": backersCount, "convertedAmount": convertedAmount.resultMap, "allowedAddons": allowedAddons.resultMap, "description": description, "displayName": displayName, "endsAt": endsAt, "estimatedDeliveryOn": estimatedDeliveryOn, "id": id, "isMaxPledge": isMaxPledge, "items": items.flatMap { (value: Item) -> ResultMap in value.resultMap }, "limit": limit, "limitPerBacker": limitPerBacker, "localReceiptLocation": localReceiptLocation.flatMap { (value: LocalReceiptLocation) -> ResultMap in value.resultMap }, "name": name, "postCampaignPledgingEnabled": postCampaignPledgingEnabled, "project": project.flatMap { (value: Project) -> ResultMap in value.resultMap }, "remainingQuantity": remainingQuantity, "shippingPreference": shippingPreference, "shippingSummary": shippingSummary, "shippingRules": shippingRules.flatMap { (value: [ShippingRule?]) -> [ResultMap?] in value.map { (value: ShippingRule?) -> ResultMap? in value.flatMap { (value: ShippingRule) -> ResultMap in value.resultMap } } }, "startsAt": startsAt])
+    public init(amount: Amount, backersCount: Int? = nil, convertedAmount: ConvertedAmount, allowedAddons: AllowedAddon, description: String, displayName: String, endsAt: String? = nil, estimatedDeliveryOn: String? = nil, id: GraphQLID, isMaxPledge: Bool, available: Bool, items: Item? = nil, limit: Int? = nil, limitPerBacker: Int? = nil, localReceiptLocation: LocalReceiptLocation? = nil, name: String? = nil, postCampaignPledgingEnabled: Bool, project: Project? = nil, remainingQuantity: Int? = nil, shippingPreference: ShippingPreference? = nil, shippingSummary: String? = nil, shippingRules: [ShippingRule?]? = nil, startsAt: String? = nil) {
+      self.init(unsafeResultMap: ["__typename": "Reward", "amount": amount.resultMap, "backersCount": backersCount, "convertedAmount": convertedAmount.resultMap, "allowedAddons": allowedAddons.resultMap, "description": description, "displayName": displayName, "endsAt": endsAt, "estimatedDeliveryOn": estimatedDeliveryOn, "id": id, "isMaxPledge": isMaxPledge, "available": available, "items": items.flatMap { (value: Item) -> ResultMap in value.resultMap }, "limit": limit, "limitPerBacker": limitPerBacker, "localReceiptLocation": localReceiptLocation.flatMap { (value: LocalReceiptLocation) -> ResultMap in value.resultMap }, "name": name, "postCampaignPledgingEnabled": postCampaignPledgingEnabled, "project": project.flatMap { (value: Project) -> ResultMap in value.resultMap }, "remainingQuantity": remainingQuantity, "shippingPreference": shippingPreference, "shippingSummary": shippingSummary, "shippingRules": shippingRules.flatMap { (value: [ShippingRule?]) -> [ResultMap?] in value.map { (value: ShippingRule?) -> ResultMap? in value.flatMap { (value: ShippingRule) -> ResultMap in value.resultMap } } }, "startsAt": startsAt])
     }
 
     public var __typename: String {
@@ -15709,6 +15711,16 @@ public enum GraphAPI {
       }
     }
 
+    /// Whether or not the reward is available for new pledges
+    public var available: Bool {
+      get {
+        return resultMap["available"]! as! Bool
+      }
+      set {
+        resultMap.updateValue(newValue, forKey: "available")
+      }
+    }
+
     /// Items in the reward.
     public var items: Item? {
       get {

KsApi/fragments/RewardFragment.graphql

@@ -17,6 +17,7 @@ fragment RewardFragment on Reward {
   estimatedDeliveryOn
   id
   isMaxPledge
+  available
   items {
     edges {
       quantity

KsApi/models/Reward.swift

@@ -21,6 +21,8 @@ public struct Reward {
   public let startsAt: TimeInterval?
   public let title: String?
   public let localPickup: Location?
+  /// isAvailable is provided by GraphQL but not by API V1.
+  public let isAvailable: Bool?
 
   /// Returns `true` is this is the "fake" "No reward" reward.
   public var isNoReward: Bool {
@@ -147,6 +149,7 @@ extension Reward: Decodable {
     self.title = try values.decodeIfPresent(String.self, forKey: .title)
     // NOTE: `v1` is deprecated and doesn't contain any location pickup information.
     self.localPickup = nil
+    self.isAvailable = nil
   }
 }
 

KsApi/models/graphql/adapters/Reward+RewardFragment.swift

@@ -54,7 +54,8 @@ extension Reward {
       shippingRulesExpanded: expandedShippingRules,
       startsAt: rewardFragment.startsAt.flatMap(TimeInterval.init),
       title: rewardFragment.name,
-      localPickup: location
+      localPickup: location,
+      isAvailable: rewardFragment.available
     )
   }
 }

KsApi/models/lenses/RewardLenses.swift

@@ -24,7 +24,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -49,7 +50,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $0
+        localPickup: $0,
+        isAvailable: nil
       ) }
     )
 
@@ -74,7 +76,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -99,7 +102,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -124,7 +128,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -149,7 +154,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -174,7 +180,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -199,7 +206,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -224,7 +232,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -249,7 +258,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -274,7 +284,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -299,7 +310,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -324,7 +336,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -349,7 +362,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -374,7 +388,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -399,7 +414,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -424,7 +440,8 @@ extension Reward {
         shippingRulesExpanded: $0,
         startsAt: $1.startsAt,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -449,7 +466,8 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $0,
         title: $1.title,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
       ) }
     )
 
@@ -474,7 +492,34 @@ extension Reward {
         shippingRulesExpanded: $1.shippingRulesExpanded,
         startsAt: $1.startsAt,
         title: $0,
-        localPickup: $1.localPickup
+        localPickup: $1.localPickup,
+        isAvailable: nil
+      ) }
+    )
+
+    public static let isAvailable = Lens<Reward, Bool?>(
+      view: { $0.isAvailable },
+      set: { Reward(
+        backersCount: $1.backersCount,
+        convertedMinimum: $1.convertedMinimum,
+        description: $1.description,
+        endsAt: $1.endsAt,
+        estimatedDeliveryOn: $1.estimatedDeliveryOn,
+        hasAddOns: $1.hasAddOns,
+        id: $1.id,
+        limit: $1.limit,
+        limitPerBacker: $1.limitPerBacker,
+        minimum: $1.minimum,
+        postCampaignPledgingEnabled: $1.postCampaignPledgingEnabled,
+        remaining: $1.remaining,
+        rewardsItems: $1.rewardsItems,
+        shipping: $1.shipping,
+        shippingRules: $1.shippingRules,
+        shippingRulesExpanded: $1.shippingRulesExpanded,
+        startsAt: $1.startsAt,
+        title: $1.title,
+        localPickup: $1.localPickup,
+        isAvailable: $0
       ) }
     )
   }

KsApi/models/templates/RewardTemplates.swift

@@ -29,7 +29,8 @@ extension Reward {
     shippingRulesExpanded: nil,
     startsAt: nil,
     title: "My Reward",
-    localPickup: nil
+    localPickup: nil,
+    isAvailable: nil
   )
 
   public static let noReward = Reward(
@@ -57,7 +58,8 @@ extension Reward {
     shippingRulesExpanded: nil,
     startsAt: nil,
     title: nil,
-    localPickup: nil
+    localPickup: nil,
+    isAvailable: nil
   )
 
   public static let otherReward = Reward(
@@ -85,7 +87,8 @@ extension Reward {
     shippingRulesExpanded: nil,
     startsAt: nil,
     title: nil,
-    localPickup: nil
+    localPickup: nil,
+    isAvailable: nil
   )
 
   public static let postcards = Reward.template

Library/ViewModels/RewardAddOnSelectionViewModel.swift

@@ -108,7 +108,6 @@ public final class RewardAddOnSelectionViewModel: RewardAddOnSelectionViewModelT
     self.endRefreshing = projectEvent.filter { $0.isTerminating }.ignoreValues()
 
     let addOns = projectEvent.values().map(\.rewardData.addOns).skipNil()
-
     let requestErrored = projectEvent.map(\.error).map(isNotNil)
 
     // Quantities updated as the user selects them, merged with an empty initial value.
@@ -468,17 +467,7 @@ private func addOnIsAvailable(_ addOn: Reward, in project: Project) -> Bool {
     return true
   }
 
-  let isUnlimitedOrAvailable = addOn.limit == nil || addOn.remaining ?? 0 > 0
-
-  // Assuming the user has not backed the addOn, we only display if it's within range of the start and end date
-  let hasNoTimeLimitOrIsWithinRange = isStartDateBeforeToday(for: addOn) && isEndDateAfterToday(for: addOn)
-
-  return [
-    project.state == .live,
-    hasNoTimeLimitOrIsWithinRange,
-    isUnlimitedOrAvailable
-  ]
-  .allSatisfy(isTrue)
+  return addOn.isAvailable ?? false
 }
 
 private func filteredAddOns(