Regression 2.19.0 (#1396)

* Update internal and external version names to match build name generated by playstore * Update drawer params clicked with current sort if sort is null, and update tests (#1394)
kickstarter · Sep 17, 2021 · 48e1545 · 48e1545
1 parent e74ba95
commit 48e1545
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/app/external_version_code.txt b/app/external_version_code.txt
@@ -1 +1 @@
-2013150871
+2013150872
diff --git a/app/internal_version_code.txt b/app/internal_version_code.txt
@@ -1 +1 @@
-2013150871
+2013150872
diff --git a/app/src/main/java/com/kickstarter/viewmodels/DiscoveryViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/DiscoveryViewModel.kt
@@ -268,9 +268,17 @@ interface DiscoveryViewModel {
             val paramsFromIntent = intent()
                 .flatMap { DiscoveryIntentMapper.params(it, apiClient) }
 
+            val pagerSelectedPage = pagerSetPrimaryPage.distinctUntilChanged()
+
             val drawerParamsClicked = childFilterRowClick
                 .mergeWith(topFilterRowClick)
-                .map { it.params() }
+                .withLatestFrom(
+                    pagerSelectedPage.map { DiscoveryUtils.sortFromPosition(it) }
+                ) { drawerClickParams, currentParams ->
+                    if (drawerClickParams.params().sort() == null)
+                        drawerClickParams.params().toBuilder().sort(currentParams).build()
+                    else drawerClickParams.params()
+                }
 
             // Merge various param data sources.
             val params = Observable.merge(
@@ -279,8 +287,6 @@ interface DiscoveryViewModel {
                 drawerParamsClicked
             )
 
-            val pagerSelectedPage = pagerSetPrimaryPage.distinctUntilChanged()
-
             val sortToTabOpen = Observable.merge(
                 pagerSelectedPage.map { DiscoveryUtils.sortFromPosition(it) },
                 params.map { it.sort() }

diff --git a/app/src/test/java/com/kickstarter/viewmodels/DiscoveryViewModelTest.java b/app/src/test/java/com/kickstarter/viewmodels/DiscoveryViewModelTest.java
@@ -297,9 +297,9 @@ public void testInteractionBetweenParamsAndPageAdapter() {
       DiscoveryParams.builder().sort(DiscoveryParams.Sort.MAGIC).build(),
       DiscoveryParams.builder().sort(DiscoveryParams.Sort.POPULAR).build(),
       DiscoveryParams.builder().sort(DiscoveryParams.Sort.POPULAR).category(CategoryFactory.artCategory()).build(),
-      DiscoveryParams.builder().category(CategoryFactory.artCategory()).build()
+      DiscoveryParams.builder().category(CategoryFactory.artCategory()).sort(DiscoveryParams.Sort.POPULAR).build()
     );
-    this.updatePage.assertValues(0, 0, 1, 1, 0);
+    this.updatePage.assertValues(0, 0, 1, 1, 1);
 
     // Select MAGIC sort position.
     this.vm.getInputs().discoveryPagerAdapterSetPrimaryPage(Mockito.mock(DiscoveryPagerAdapter.class), 0);
@@ -310,10 +310,10 @@ public void testInteractionBetweenParamsAndPageAdapter() {
       DiscoveryParams.builder().sort(DiscoveryParams.Sort.MAGIC).build(),
       DiscoveryParams.builder().sort(DiscoveryParams.Sort.POPULAR).build(),
       DiscoveryParams.builder().sort(DiscoveryParams.Sort.POPULAR).category(CategoryFactory.artCategory()).build(),
-      DiscoveryParams.builder().category(CategoryFactory.artCategory()).build(),
+      DiscoveryParams.builder().category(CategoryFactory.artCategory()).sort(DiscoveryParams.Sort.POPULAR).build(),
       DiscoveryParams.builder().sort(DiscoveryParams.Sort.MAGIC).category(CategoryFactory.artCategory()).build()
     );
-    this.updatePage.assertValues(0, 0, 1, 1, 0, 0);
+    this.updatePage.assertValues(0, 0, 1, 1, 1, 0);
 
     // Simulate rotating the device and hitting initial getInputs() again.
     this.vm.getOutputs().updateParamsForPage().subscribe(this.rotatedUpdateParams);