CHECK-171: Fix estimated shipping range used for Rewards that ship worldwide (#2527)

Co-authored-by: Tony Teate <4317686+tonyteate@users.noreply.github.com>
(cherry picked from commit 094eb33)

Author: tonyteate

app/src/main/java/com/kickstarter/libs/utils/RewardViewUtils.kt

@@ -216,38 +216,30 @@ object RewardViewUtils {
         selectedShippingRule: ShippingRule,
         multipleQuantitiesAllowed: Boolean,
         useUserPreference: Boolean,
-        useAbout: Boolean,
-        forceSelectedShippingRule: Boolean = false,
+        useAbout: Boolean
     ): String {
         var min = ""
         var max = ""
         var minTotal = 0.0
         var maxtotal = 0.0
 
         rewards.forEach { reward ->
-            val shippingRule = reward.shippingRules()?.firstOrNull {
+            if (RewardUtils.isDigital(reward) || RewardUtils.isLocalPickup(reward) || !RewardUtils.isShippable(reward))
+                return@forEach
+
+            var shippingRule = reward.shippingRules()?.firstOrNull {
                 it.location()?.id() == selectedShippingRule.location()?.id()
             }
 
-            val selectedShippingRuleCondition =
-                (forceSelectedShippingRule && shippingRule != null)
+            if (shippingRule == null && RewardUtils.shipsWorldwide(reward))
+                shippingRule = reward.shippingRules()?.firstOrNull()
 
-            if (!RewardUtils.isDigital(reward) && (selectedShippingRuleCondition || RewardUtils.shipsToRestrictedLocations(reward)) && !RewardUtils.isLocalPickup(reward)) {
-                reward.shippingRules()?.filter {
-                    it.location()?.id() == selectedShippingRule.location()?.id()
-                }?.map {
-                    minTotal += (it.estimatedMin() * (reward.quantity() ?: 1))
-                    maxtotal += (it.estimatedMax() * (reward.quantity() ?: 1))
-                }
-            }
-
-            if (!selectedShippingRuleCondition && RewardUtils.shipsWorldwide(reward) && !reward.shippingRules().isNullOrEmpty()) {
-                reward.shippingRules()?.first()?.let {
-                    minTotal += (it.estimatedMin() * (reward.quantity() ?: 1))
-                    maxtotal += (it.estimatedMax() * (reward.quantity() ?: 1))
-                }
+            shippingRule?.let {
+                minTotal += (it.estimatedMin() * (reward.quantity() ?: 1))
+                maxtotal += (it.estimatedMax() * (reward.quantity() ?: 1))
             }
         }
+
         if (minTotal <= 0 || maxtotal <= 0) return ""
 
         min = if (useUserPreference) {

app/src/main/java/com/kickstarter/ui/activities/compose/projectpage/RewardCarouselScreen.kt

@@ -370,8 +370,7 @@ fun RewardCarouselScreen(
                                             selectedShippingRule = currentShippingRule,
                                             multipleQuantitiesAllowed = false,
                                             useUserPreference = false,
-                                            useAbout = true,
-                                            forceSelectedShippingRule = true
+                                            useAbout = true
                                         )
                                     }
                                 }

app/src/test/java/com/kickstarter/libs/utils/RewardViewUtilsTest.kt

@@ -108,6 +108,10 @@ class RewardViewUtilsTest : KSRobolectricTestCase() {
             .estimatedMin(2.0)
             .estimatedMax(20.0)
             .build()
+        val caRule = ShippingRuleFactory.canadaShippingRule().toBuilder()
+            .estimatedMin(3.0)
+            .estimatedMax(30.0)
+            .build()
 
         val shippingPreference = Reward.ShippingPreference.UNRESTRICTED
         val reward = RewardFactory.reward().toBuilder()
@@ -118,7 +122,7 @@ class RewardViewUtilsTest : KSRobolectricTestCase() {
             .build()
         val rewards = listOf(reward)
 
-        val selectedShippingRule = usRule
+        val selectedShippingRule = caRule
 
         val estimatedShippingString = RewardViewUtils.getEstimatedShippingCostString(
             context, ksCurrency, ksString, project, rewards, selectedShippingRule,
@@ -131,7 +135,7 @@ class RewardViewUtilsTest : KSRobolectricTestCase() {
     }
 
     @Test
-    fun `test estimated shipping range for reward with worldwide shipping uses first selected shipping rule when forced`() {
+    fun `test estimated shipping range for reward with restricted shipping`() {
         val context = context()
 
         val config = ConfigFactory.configForUSUser()
@@ -140,7 +144,7 @@ class RewardViewUtilsTest : KSRobolectricTestCase() {
         val ksCurrency = KSCurrency(currentConfig)
 
         val ksString = ksString()
-        val project = ProjectFactory.project() // KSCurrency.formatWithUserPreference()
+        val project = ProjectFactory.project()
 
         val usRule = ShippingRuleFactory.usShippingRule().toBuilder()
             .estimatedMin(1.0)
@@ -151,11 +155,12 @@ class RewardViewUtilsTest : KSRobolectricTestCase() {
             .estimatedMax(20.0)
             .build()
 
-        val shippingPreference = Reward.ShippingPreference.UNRESTRICTED
+        val shippingPreference = Reward.ShippingPreference.RESTRICTED
+
         val reward = RewardFactory.reward().toBuilder()
-            .shippingPreference(shippingPreference.name)
-            .shippingType(shippingPreference.name)
             .shippingPreferenceType(shippingPreference)
+            .shippingPreference(shippingPreference.name.lowercase())
+            .shippingType(shippingPreference.name.lowercase())
             .shippingRules(listOf(mxRule, usRule))
             .build()
         val rewards = listOf(reward)
@@ -167,9 +172,42 @@ class RewardViewUtilsTest : KSRobolectricTestCase() {
             multipleQuantitiesAllowed = false,
             useUserPreference = false,
             useAbout = false,
-            forceSelectedShippingRule = true
         )
 
         assertEquals("$1-$10", estimatedShippingString)
     }
+
+    @Test
+    fun `test estimated shipping range for digital reward`() {
+        val context = context()
+
+        val config = ConfigFactory.configForUSUser()
+        val currentConfig = MockCurrentConfigV2()
+        currentConfig.config(config)
+        val ksCurrency = KSCurrency(currentConfig)
+
+        val ksString = ksString()
+        val project = ProjectFactory.project()
+
+        val shippingPreference = Reward.ShippingPreference.NONE
+
+        val reward = RewardFactory.reward().toBuilder()
+            .shippingPreferenceType(shippingPreference)
+            .shippingPreference(shippingPreference.name.lowercase())
+            .shippingType(shippingPreference.name.lowercase())
+            .shippingRules(listOf())
+            .build()
+        val rewards = listOf(reward)
+
+        val selectedShippingRule = ShippingRuleFactory.usShippingRule()
+
+        val estimatedShippingString = RewardViewUtils.getEstimatedShippingCostString(
+            context, ksCurrency, ksString, project, rewards, selectedShippingRule,
+            multipleQuantitiesAllowed = false,
+            useUserPreference = false,
+            useAbout = false,
+        )
+
+        assertTrue(estimatedShippingString.isEmpty())
+    }
 }