use isAvailable property on the reward model to render rewards

* updates tests as well
kickstarter · Apr 2, 2024 · 44a9373 · 44a9373
1 parent 6fcf7ee
commit 44a9373
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 39 deletions.
diff --git a/KsApi/models/templates/RewardTemplates.swift b/KsApi/models/templates/RewardTemplates.swift
@@ -30,7 +30,7 @@ extension Reward {
     startsAt: nil,
     title: "My Reward",
     localPickup: nil,
-    isAvailable: nil
+    isAvailable: true
   )
 
   public static let noReward = Reward(
@@ -59,7 +59,7 @@ extension Reward {
     startsAt: nil,
     title: nil,
     localPickup: nil,
-    isAvailable: nil
+    isAvailable: true
   )
 
   public static let otherReward = Reward(

diff --git a/Library/SharedFunctions.swift b/Library/SharedFunctions.swift
@@ -279,30 +279,6 @@ public func isNativeRiskMessagingControlEnabled() -> Bool {
   return true
 }
 
-public func rewardIsAvailable(project: Project, reward: Reward) -> Bool {
-  let isLimited = reward.isLimitedQuantity
-  let isTimebased = reward.isLimitedTime
-
-  guard isLimited || isTimebased else { return true }
-
-  let remainingQty = rewardLimitRemainingForBacker(project: project, reward: reward)
-  let isRemaining = remainingQty == nil || (remainingQty ?? 0) > 0
-
-  let now = AppEnvironment.current.dateType.init().timeIntervalSince1970
-  let endsAt = reward.endsAt.coalesceWith(now)
-  let timeLimitNotReached = endsAt > now
-
-  // Limited availability is valid if the reward is limited and remaining > 0 OR this reward is not limited.
-  let limitedAvailabilityValid = (isLimited && isRemaining) || !isLimited
-
-  // Timebased availability is valid if the reward is timebased and the time limit has not been reached
-  // OR the reward is not timebased.
-  let timebasedAvailabilityValid = (isTimebased && timeLimitNotReached) || !isTimebased
-
-  // Both types of availability must be valid in order for this reward to be considered available.
-  return limitedAvailabilityValid && timebasedAvailabilityValid
-}
-
 public func rewardLimitRemainingForBacker(project: Project, reward: Reward) -> Int? {
   guard let remaining = reward.remaining else {
     return nil
@@ -377,7 +353,7 @@ public func rewardsCarouselCanNavigateToReward(_ reward: Reward, in project: Pro
   guard !currentUserIsCreator(of: project) else { return false }
 
   let isBacking = userIsBacking(reward: reward, inProject: project)
-  let isAvailableForNewBacker = rewardIsAvailable(project: project, reward: reward) && !isBacking
+  let isAvailableForNewBacker = reward.isAvailable == true && !isBacking
   let isAvailableForExistingBackerToEdit = (isBacking && reward.hasAddOns)
 
   if featurePostCampaignPledgeEnabled(), project.isInPostCampaignPledgingPhase {

diff --git a/Library/SharedFunctionsTests.swift b/Library/SharedFunctionsTests.swift
@@ -140,6 +140,7 @@ final class SharedFunctionsTests: TestCase {
       |> Reward.lens.limit .~ 5
       |> Reward.lens.remaining .~ 5
       |> Reward.lens.endsAt .~ (MockDate().timeIntervalSince1970 + 60)
+      |> Reward.lens.isAvailable .~ true
 
     let project = Project.template
       |> Project.lens.rewardData.rewards .~ [reward]
@@ -231,6 +232,7 @@ final class SharedFunctionsTests: TestCase {
       |> Reward.lens.remaining .~ 5
       |> Reward.lens.endsAt .~ (MockDate().timeIntervalSince1970 + 60)
       |> Reward.lens.hasAddOns .~ true
+      |> Reward.lens.isAvailable .~ true
 
     let project = Project.template
       |> Project.lens.rewardData.rewards .~ [reward]

diff --git a/Library/ViewModels/RewardCardContainerViewModel.swift b/Library/ViewModels/RewardCardContainerViewModel.swift
@@ -95,7 +95,7 @@ private func pledgeButtonTitle(project: Project, reward: Reward) -> String? {
 
   let projectBackingState = RewardCellProjectBackingStateType.state(with: project)
   let isBackingThisReward = userIsBacking(reward: reward, inProject: project)
-  let isRewardAvailable = rewardIsAvailable(project: project, reward: reward)
+  let isRewardAvailable = reward.isAvailable == true
 
   switch (projectBackingState, isBackingThisReward, isRewardAvailable) {
   case (.backedError, false, true):

diff --git a/Library/ViewModels/RewardCardContainerViewModelTests.swift b/Library/ViewModels/RewardCardContainerViewModelTests.swift
@@ -17,23 +17,27 @@ final class RewardCardContainerViewModelTests: TestCase {
 
   let availableHasAddOns = Reward.postcards
     |> Reward.lens.hasAddOns .~ true
+    |> Reward.lens.isAvailable .~ true
   let availableLimitedReward = Reward.postcards
     |> Reward.lens.limit .~ 100
     |> Reward.lens.remaining .~ 25
     |> Reward.lens.endsAt .~ nil
+    |> Reward.lens.isAvailable .~ true
   let availableTimebasedReward = Reward.postcards
     |> Reward.lens.limit .~ nil
     |> Reward.lens.remaining .~ nil
     |> Reward.lens.endsAt .~ (MockDate().timeIntervalSince1970 + 60.0 * 60.0 * 24.0)
+    |> Reward.lens.isAvailable .~ true
   let availableLimitedTimebasedReward = Reward.postcards
     |> Reward.lens.limit .~ 100
     |> Reward.lens.remaining .~ 25
     |> Reward.lens.endsAt .~ (MockDate().timeIntervalSince1970 + 60.0 * 60.0 * 24.0)
+    |> Reward.lens.isAvailable .~ true
   let availableNonLimitedReward = Reward.postcards
     |> Reward.lens.limit .~ nil
     |> Reward.lens.remaining .~ nil
     |> Reward.lens.endsAt .~ nil
-
+    |> Reward.lens.isAvailable .~ true
   let unavailableLimitedReward = Reward.postcards
     |> Reward.lens.limit .~ 100
     |> Reward.lens.remaining .~ 0

diff --git a/Library/ViewModels/RewardCardViewModelTests.swift b/Library/ViewModels/RewardCardViewModelTests.swift
@@ -521,6 +521,7 @@ final class RewardCardViewModelTests: TestCase {
     let reward = Reward.template
       |> Reward.lens.remaining .~ nil
       |> Reward.lens.minimum .~ 1_000
+      |> Reward.lens.isAvailable .~ true
 
     self.vm.inputs.configure(with: (project, reward, .pledge))
 
@@ -532,6 +533,7 @@ final class RewardCardViewModelTests: TestCase {
     let reward = Reward.template
       |> Reward.lens.remaining .~ 10
       |> Reward.lens.minimum .~ 1_000.0
+      |> Reward.lens.isAvailable .~ true
 
     self.vm.inputs.configure(with: (project, reward, .pledge))
 

diff --git a/Library/ViewModels/RewardsCollectionViewModel.swift b/Library/ViewModels/RewardsCollectionViewModel.swift
@@ -69,7 +69,8 @@ public final class RewardsCollectionViewModel: RewardsCollectionViewModelType,
 
     self.reloadDataWithValues = Signal.combineLatest(project, rewards)
       .map { project, rewards in
-        rewards.filter { reward in isStartDateBeforeToday(for: reward) }
+        rewards
+          .filter { reward in isStartDateBeforeToday(for: reward) }
           .map { reward in (project, reward, .pledge) }
       }
 
@@ -389,7 +390,7 @@ private func backingAndShippingTotal(for project: Project, and reward: Reward) -
 }
 
 private func allowableSortedProjectRewards(from project: Project) -> [Reward] {
-  let availableRewards = project.rewards.filter { rewardIsAvailable(project: project, reward: $0) }
-  let unAvailableRewards = project.rewards.filter { !rewardIsAvailable(project: project, reward: $0) }
+  let availableRewards = project.rewards.filter { $0.isAvailable == true || $0.isNoReward }
+  let unAvailableRewards = project.rewards.filter { $0.isAvailable == false }
   return availableRewards + unAvailableRewards
 }
diff --git a/Library/ViewModels/RewardsCollectionViewModelTests.swift b/Library/ViewModels/RewardsCollectionViewModelTests.swift
@@ -93,6 +93,7 @@ final class RewardsCollectionViewModelTests: TestCase {
           |> Reward.lens.localPickup .~ .brooklyn
           |> Reward.lens.shipping.preference .~ .local
           |> Reward.lens.shipping.enabled .~ false
+          |> Reward.lens.isAvailable .~ true
 
         return updatedReward
       }
@@ -131,6 +132,7 @@ final class RewardsCollectionViewModelTests: TestCase {
           |> Reward.lens.localPickup .~ .brooklyn
           |> Reward.lens.shipping.preference .~ .local
           |> Reward.lens.shipping.enabled .~ false
+          |> Reward.lens.isAvailable .~ true
 
         return updatedReward
       }
@@ -172,6 +174,7 @@ final class RewardsCollectionViewModelTests: TestCase {
           |> Reward.lens.localPickup .~ .brooklyn
           |> Reward.lens.shipping.preference .~ .local
           |> Reward.lens.shipping.enabled .~ false
+          |> Reward.lens.isAvailable .~ true
 
         return updatedReward
       }
@@ -208,6 +211,7 @@ final class RewardsCollectionViewModelTests: TestCase {
 
       let reward = rewards.first!
         |> Reward.lens.hasAddOns .~ true
+        |> Reward.lens.isAvailable .~ true
 
       rewards[0] = reward
 
@@ -310,6 +314,7 @@ final class RewardsCollectionViewModelTests: TestCase {
       let firstReward = Project.cosmicSurgery.rewards[0]
       let secondReward = Project.cosmicSurgery.rewards[1]
         |> Reward.lens.remaining .~ 5
+        |> Reward.lens.isAvailable .~ true
 
       let project = Project.cosmicSurgery
         |> Project.lens.rewardData.rewards .~ [firstReward, secondReward]
@@ -360,6 +365,7 @@ final class RewardsCollectionViewModelTests: TestCase {
     withEnvironment(config: .template) {
       let reward = Reward.template
         |> Reward.lens.hasAddOns .~ true
+        |> Reward.lens.isAvailable .~ true
 
       let project = Project.cosmicSurgery
         |> Project.lens.rewardData.rewards .~ [reward]
@@ -404,6 +410,7 @@ final class RewardsCollectionViewModelTests: TestCase {
         |> Reward.lens.limit .~ 5
         |> Reward.lens.remaining .~ 0
         |> Reward.lens.endsAt .~ (MockDate().timeIntervalSince1970 - 1)
+        |> Reward.lens.isAvailable .~ true
 
       let project = Project.cosmicSurgery
         |> Project.lens.rewardData.rewards .~ [reward]
@@ -445,9 +452,11 @@ final class RewardsCollectionViewModelTests: TestCase {
     withEnvironment(config: .template) {
       let reward = Reward.template
         |> Reward.lens.hasAddOns .~ true
+        |> Reward.lens.isAvailable .~ true
 
       let backedReward = Reward.template
         |> Reward.lens.id .~ 55
+        |> Reward.lens.isAvailable .~ true
 
       let project = Project.cosmicSurgery
         |> Project.lens.rewardData.rewards .~ [reward, backedReward]
@@ -505,10 +514,11 @@ final class RewardsCollectionViewModelTests: TestCase {
     withEnvironment(config: .template) {
       let reward = Reward.template
         |> Reward.lens.hasAddOns .~ false
+        |> Reward.lens.isAvailable .~ true
 
       let backedReward = Reward.template
         |> Reward.lens.id .~ 55
-
+        |> Reward.lens.isAvailable .~ true
       let project = Project.cosmicSurgery
         |> Project.lens.rewardData.rewards .~ [reward, backedReward]
         |> Project.lens.personalization.backing .~ (
@@ -799,16 +809,21 @@ final class RewardsCollectionViewModelTests: TestCase {
   func testBackedRewardIndexPath() {
     let backedReward = Reward.template
       |> Reward.lens.id .~ 5
+      |> Reward.lens.isAvailable .~ true
 
     let rewards = [
       .template
-        |> Reward.lens.id .~ 1,
+        |> Reward.lens.id .~ 1
+        |> Reward.lens.isAvailable .~ true,
       .template
-        |> Reward.lens.id .~ 2,
+        |> Reward.lens.id .~ 2
+        |> Reward.lens.isAvailable .~ true,
       .template
-        |> Reward.lens.id .~ 3,
+        |> Reward.lens.id .~ 3
+        |> Reward.lens.isAvailable .~ true,
       .template
-        |> Reward.lens.id .~ 4,
+        |> Reward.lens.id .~ 4
+        |> Reward.lens.isAvailable .~ true,
       backedReward
     ]
 
@@ -884,7 +899,8 @@ final class RewardsCollectionViewModelTests: TestCase {
       .template
         |> Reward.lens.id .~ 1,
       .template
-        |> Reward.lens.id .~ 2,
+        |> Reward.lens.id .~ 2
+        |> Reward.lens.isAvailable .~ true,
       .template
         |> Reward.lens.id .~ 3,
       .template
@@ -906,6 +922,7 @@ final class RewardsCollectionViewModelTests: TestCase {
   func testTrackingRewardClicked_ProjectBackingNil() {
     let rewardTwo = Reward.template
       |> Reward.lens.id .~ 2
+      |> Reward.lens.isAvailable .~ true
 
     let rewards = [
       .template
@@ -940,6 +957,7 @@ final class RewardsCollectionViewModelTests: TestCase {
   func testTrackingRewardClicked_ProjectBackingNotNil() {
     let rewardTwo = Reward.template
       |> Reward.lens.id .~ 2
+      |> Reward.lens.isAvailable .~ true
     let backing = Backing.template
       |> Backing.lens.amount .~ 20.00
       |> Backing.lens.bonusAmount .~ 100.00
@@ -982,7 +1000,8 @@ final class RewardsCollectionViewModelTests: TestCase {
       .template
         |> Reward.lens.id .~ 1,
       .template
-        |> Reward.lens.id .~ 2,
+        |> Reward.lens.id .~ 2
+        |> Reward.lens.isAvailable .~ true,
       .template
         |> Reward.lens.id .~ 3,
       .template