MBL-1198: Reorder rewards so that unavailable ones show last (#1956)

* sort rewards * Sort rewards, testing * cleanup
kickstarter · Feb 24, 2024 · ac5ce6a · ac5ce6a
1 parent bb46ce7
commit ac5ce6a
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 7 deletions.
diff --git a/app/src/main/java/com/kickstarter/ui/adapters/RewardsAdapter.kt b/app/src/main/java/com/kickstarter/ui/adapters/RewardsAdapter.kt
@@ -33,7 +33,7 @@ class RewardsAdapter(private val delegate: Delegate) : KSAdapter() {
 
         val rewards = projectData.project().rewards()
 
-        if (rewards != null) {
+        if (!rewards.isNullOrEmpty()) {
             addSection(
                 Observable.from(rewards)
                     .map { reward -> Pair.create(projectData, reward) }

diff --git a/app/src/main/java/com/kickstarter/viewmodels/RewardsFragmentViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/RewardsFragmentViewModel.kt
@@ -112,8 +112,8 @@ class RewardsFragmentViewModel {
                 .addToDisposable(disposables)
 
             this.projectDataInput
-                .filter { filterOutNotStartedRewards(it).isNotNull() }
-                .map { filterOutNotStartedRewards(it) }
+                .filter { sortAndFilterRewards(it).isNotNull() }
+                .map { sortAndFilterRewards(it) }
                 .subscribe { this.projectData.onNext(it) }
                 .addToDisposable(disposables)
 
@@ -246,9 +246,14 @@ class RewardsFragmentViewModel {
                 .addToDisposable(disposables)
         }
 
-        private fun filterOutNotStartedRewards(pData: ProjectData): ProjectData {
-            val rewards = pData.project().rewards()?.filter { RewardUtils.hasStarted(it) }
-            val modifiedProject = pData.project().toBuilder().rewards(rewards).build()
+        private fun sortAndFilterRewards(pData: ProjectData): ProjectData {
+            val startedRewards = pData.project().rewards()?.filter { RewardUtils.hasStarted(it) }
+            val sortedRewards = startedRewards?.filter { RewardUtils.isAvailable(pData.project(), it) }?.toMutableList() ?: mutableListOf()
+            val unavailableRewards = startedRewards?.filter { !RewardUtils.isAvailable(pData.project(), it) }?.toMutableList()
+
+            unavailableRewards?.let { sortedRewards.addAll(it) }
+
+            val modifiedProject = pData.project().toBuilder().rewards(sortedRewards).build()
             return pData.toBuilder()
                 .project(modifiedProject)
                 .build()

diff --git a/app/src/test/java/com/kickstarter/viewmodels/RewardsFragmentViewModelTest.kt b/app/src/test/java/com/kickstarter/viewmodels/RewardsFragmentViewModelTest.kt
@@ -279,7 +279,7 @@ class RewardsFragmentViewModelTest : KSRobolectricTestCase() {
     }
 
     @Test
-    fun testFilterOutRewards_whenRewardNotStarted() {
+    fun testFilterOutRewards_whenRewardNotStarted_filtersOutReward() {
         val rwNotLimitedStart = RewardFactory.reward()
         val rwLimitedStartNotStartedYet = rwNotLimitedStart.toBuilder().startsAt(DateTime.now().plusDays(1)).build()
         val rwLimitedStartStarted = rwNotLimitedStart.toBuilder().startsAt(DateTime.now()).build()
@@ -301,6 +301,39 @@ class RewardsFragmentViewModelTest : KSRobolectricTestCase() {
         this.rewardsCount.assertValue(2)
     }
 
+    @Test
+    fun testFilterAndSortRewards_whenRewardUnavailable_sortsRewardToEnd() {
+        val rwNotLimitedStart = RewardFactory.reward()
+        val rwLimitedStartNotStartedYet = rwNotLimitedStart.toBuilder().startsAt(DateTime.now().plusDays(1)).build()
+        val rwLimitedStartStarted = rwNotLimitedStart.toBuilder().startsAt(DateTime.now()).build()
+        val limited = RewardFactory.reward().toBuilder().startsAt(DateTime.now()).limit(5).build()
+        val noRemaining = RewardFactory.limitReached()
+        val expired = RewardFactory.ended()
+
+        val rewards = listOf<Reward>(
+            rwNotLimitedStart,
+            rwLimitedStartNotStartedYet,
+            noRemaining,
+            limited,
+            expired,
+            rwLimitedStartStarted
+        )
+
+        val project = ProjectFactory.project().toBuilder().rewards(rewards).build()
+
+        setUpEnvironment(environment())
+        // - We configure the viewModel with a project that has rewards not started yet
+        this.vm.inputs.configureWith(ProjectDataFactory.project(project))
+
+        val filteredList = listOf(rwNotLimitedStart, limited, rwLimitedStartStarted, noRemaining, expired)
+        val projWithFilteredRewards = project.toBuilder().rewards(filteredList).build()
+        val modifiedPData = ProjectData.builder().project(projWithFilteredRewards).build()
+
+        // - We check that the viewModel has filtered out the rewards not started yet
+        this.projectData.assertValue(modifiedPData)
+        this.rewardsCount.assertValue(5)
+    }
+
     @Test
     fun testRewardsCount() {
         val project = ProjectFactory.project()