MBL-1893 && MBL-1877: Separate rewards from project query #2173

Arkariang · 2024-11-19T19:31:57Z

📲 What

Project query obtains now very minimum information about rewards,(ideally in the future will not query anything around rewards, but for now some details to pre-load quickly the rewards carousel is required).
New query that will fetch the rewards + simple shipping rules + reward Items has being created, this new query is called within RewardsSelectionViewModel.
Crash fixed related to changing the selected location for a pledge.

🤔 Why

Project query has modified to obtain all simple shipping rules, for all rewards, (Globally shipping rewards then will hold a collection of 246 shipping rules each). Project (as any other data model within the app) can be parzelized to be serialized/deserialized from Intents, but unfortunately we have hit again the transactionTooLarge exception due to Project being too big (we need to find other ways to persist information within the app, passing the hole object from screen to screen via intent to avoid extra network calls has clear limitations).

👀 See

Filtering rewards keeps working as usual, the restricted reward ships only to canada, if changing location to other countries will not be displayed on the carousel

filteringRewards.mp4

Selecting new location and new addons crash has been fixed

modifiedRewardShippingAndAddOn.mp4

Change reward selected to "No Reward", the blue pill is now showing for "No rewards" was not before

ChangerewardToNoRewardAndBluePill.mp4

Changing payment method keeps working as usual

changePaymentMethod.mp4

Change reward selection from Digital reward to reward with shipping

chooseAnotherRewardFromDigitalToShipping.mp4

| | |

📋 QA

Go to this project in staging, is freshly created and all the checkout flows can be applied as it is still in campaign and has days before the campaign ends -> https://staging.kickstarter.com/projects/isabel-martin/mouth-trumpet-think-tank-banana
If you wanna pledge for lated pledges (filtering rewards as well) use this other project -> https://staging.kickstarter.com/projects/isabel-martin/locally-sourced-board-game-movie

Story 📖

MBL-1877
MBL-1893

- In RewardsSelectionViewModel we fetch all rewards again with simpleShippingRules this time, but this information is not moved via intent to any other screen.

…f github.com:kickstarter/android-oss into imartin/separate-rewards-from-project

…wardsSelectionVM - Removed from project query the rewards, only added the reward no reward with minimum pledge for a project. - When updating/managing a reward the information for reward/addons was collected from backing, therefore shippingRules was not available within baking that nested object. - Use as default the fresly queried information, and update with the backed information rather that the other way around.

…tin/separate-rewards-from-project

…mation to who "change payment method"/ "Fix Pledge" do require the rewards information for the project

…rd", but always for fixing changing payment method AND choosing another reward it will show "Manage pledge"

…e" option was removed from the menu

codecov-commenter · 2024-11-19T19:35:05Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 68.88889% with 14 lines in your changes missing coverage. Please review.

Project coverage is 68.57%. Comparing base (952fef2) to head (ffdffbb).

Files with missing lines	Patch %	Lines
...iewmodels/projectpage/RewardsSelectionViewModel.kt	78.94%	1 Missing and 3 partials ⚠️
...kstarter/viewmodels/projectpage/AddOnsViewModel.kt	57.14%	0 Missing and 3 partials ⚠️
...ter/viewmodels/usecases/GetShippingRulesUseCase.kt	78.57%	0 Missing and 3 partials ⚠️
...arter/services/transformers/GraphQLTransformers.kt	0.00%	2 Missing ⚠️
...kickstarter/libs/utils/extensions/PledgeDataExt.kt	0.00%	0 Missing and 1 partial ⚠️
...ewmodels/projectpage/CrowdfundCheckoutViewModel.kt	50.00%	0 Missing and 1 partial ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #2173      +/-   ##
============================================
+ Coverage     68.55%   68.57%   +0.01%     
  Complexity     2164     2164              
============================================
  Files           347      347              
  Lines         23015    23018       +3     
  Branches       3357     3354       -3     
============================================
+ Hits          15778    15784       +6     
+ Misses         5436     5434       -2     
+ Partials       1801     1800       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Arkariang · 2024-11-19T19:39:49Z

app/src/main/java/com/kickstarter/libs/utils/extensions/PledgeDataExt.kt

@@ -28,7 +28,7 @@ fun PledgeData.shippingCostIfShipping(): Double {
    var addOnsShippingCost = 0.0
    this.addOns()?.map {
        if (RewardUtils.shipsWorldwide(it) || RewardUtils.shipsToRestrictedLocations(it)) {
-            addOnsShippingCost += (it.shippingRules()?.first()?.cost() ?: 0.0) * (it.quantity() ?: 0)
+            addOnsShippingCost += (it.shippingRules()?.firstOrNull()?.cost() ?: 0.0) * (it.quantity() ?: 0)


The crash was due to using the reward and addOns from the backing object, where shipping locations information is not available

Arkariang · 2024-11-19T19:40:37Z

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

@@ -220,7 +220,8 @@ fun RewardCarouselScreen(
                                id = R.string.Back_it_because_you_believe_in_it
                            ),
                            onRewardSelectClicked = { onRewardSelected(reward) },
-                            isCTAButtonVisible = project.isAllowedToPledge()
+                            isCTAButtonVisible = project.isAllowedToPledge(),
+                            yourSelectionIsVisible = project.backing()?.isBacked(reward) ?: false,


Blue pill was not visible when the baked reward is a "Reward no reward"

Arkariang · 2024-11-19T19:42:23Z

app/src/main/java/com/kickstarter/viewmodels/projectpage/AddOnsViewModel.kt

+            val aux = holder[backedAddOn.id()]
+            if (aux != null) {
+                val updated = aux.toBuilder().quantity(backedAddOn.quantity()).build()
+                holder[backedAddOn.id()] = updated


before we were using the information from the baked object, now we update the "quantity" field alone to not loose the "shipping rules" field

Arkariang · 2024-11-19T19:46:16Z

app/src/main/java/com/kickstarter/viewmodels/projectpage/CrowdfundCheckoutViewModel.kt

-            when (flowContext) {
-                PledgeFlowContext.NEW_PLEDGE,
-                PledgeFlowContext.CHANGE_REWARD -> getPledgeInfoFrom(pData)
-                PledgeFlowContext.MANAGE_REWARD,


"Manage_Reward" is used for both updating selected reward and changing reward, it describes the fact of having to present to the user RewardsCarousel not granular enough.
Exchanged to use PledgeReason instead of PledgeFlowContext as it's uniquely identified.

Arkariang · 2024-11-19T22:26:26Z

app/src/main/java/com/kickstarter/services/KSApolloClientV2.kt

+                            // - API does not provide the Reward no reward, we need to add it first
+                            val minPledge = data.project()?.minPledge()?.toDouble() ?: 1.0
+                            val modifiedRewards = rwList.toMutableList()
+                            modifiedRewards.add(0, RewardFactory.noReward().toBuilder().minimum(minPledge).build())


Adding reward no reward to the list of rewards. It is not provided by the API, but the minimum value to be pledged is configured in a project level.

Arkariang · 2024-11-19T22:29:02Z

app/src/main/java/com/kickstarter/viewmodels/projectpage/AddOnsViewModel.kt

@@ -150,7 +150,6 @@ class AddOnsViewModel(val environment: Environment, bundle: Bundle? = null) : Vi
                        bonusAmount = b.amount()
                    } else {
                        backedAddOns = b.addOns() ?: emptyList()
-                        currentUserReward = b.reward() ?: currentUserReward


this was causing the issue mentioned here

leighdouglas

LGTM!!!!

Arkariang added 12 commits November 15, 2024 16:37

- Remove from project query the simpleShippingRules from rewards

b9133a8

- In RewardsSelectionViewModel we fetch all rewards again with simpleShippingRules this time, but this information is not moved via intent to any other screen.

Merge branches 'imartin/separate-rewards-from-project' and 'master' o…

aca8860

…f github.com:kickstarter/android-oss into imartin/separate-rewards-from-project

- Tests

5303933

Merge branch 'master' of github.com:kickstarter/android-oss into imar…

df8d8d5

…tin/separate-rewards-from-project

- Added back rewards on project query, as the the backed reward infor…

c0c0bad

…mation to who "change payment method"/ "Fix Pledge" do require the rewards information for the project

- Use pledgeReason, PledgeFlowContext will never present "Change Rewa…

38497bb

…rd", but always for fixing changing payment method AND choosing another reward it will show "Manage pledge"

no message

a4c4625

- Tests!

94df6a6

no message

5c08ff9

- "Update_PLEDGE" will never show the rewards carousel, "Update_Pledg…

db789ed

…e" option was removed from the menu

- Added your selection tag for reward no reward

e4a78e5

Arkariang commented Nov 19, 2024

View reviewed changes

Arkariang marked this pull request as ready for review November 19, 2024 19:47

Arkariang requested review from leighdouglas and jlplks November 19, 2024 19:47

Arkariang changed the title ~~Imartin/separate rewards from project~~ MBL-1893 && MBL-1877: Separate rewards from project query Nov 19, 2024

Arkariang self-assigned this Nov 19, 2024

Arkariang commented Nov 19, 2024

View reviewed changes

Arkariang and others added 2 commits November 19, 2024 14:31

Merge branch 'master' into imartin/separate-rewards-from-project

840ebfe

Merge branch 'master' into imartin/separate-rewards-from-project

ffdffbb

leighdouglas approved these changes Nov 25, 2024

View reviewed changes

Arkariang merged commit 9975252 into master Nov 26, 2024
3 checks passed

Arkariang deleted the imartin/separate-rewards-from-project branch November 26, 2024 16:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MBL-1893 && MBL-1877: Separate rewards from project query #2173

MBL-1893 && MBL-1877: Separate rewards from project query #2173

Arkariang commented Nov 19, 2024 •

edited

Loading

codecov-commenter commented Nov 19, 2024 •

edited

Loading

Arkariang Nov 19, 2024

Arkariang Nov 19, 2024

Arkariang Nov 19, 2024 •

edited

Loading

Arkariang Nov 19, 2024

Arkariang Nov 19, 2024 •

edited

Loading

Arkariang Nov 19, 2024

leighdouglas left a comment

MBL-1893 && MBL-1877: Separate rewards from project query #2173

MBL-1893 && MBL-1877: Separate rewards from project query #2173

Conversation

Arkariang commented Nov 19, 2024 • edited Loading

📲 What

🤔 Why

👀 See

📋 QA

Story 📖

codecov-commenter commented Nov 19, 2024 • edited Loading

Codecov Report

Arkariang Nov 19, 2024

Choose a reason for hiding this comment

Arkariang Nov 19, 2024

Choose a reason for hiding this comment

Arkariang Nov 19, 2024 • edited Loading

Choose a reason for hiding this comment

Arkariang Nov 19, 2024

Choose a reason for hiding this comment

Arkariang Nov 19, 2024 • edited Loading

Choose a reason for hiding this comment

Arkariang Nov 19, 2024

Choose a reason for hiding this comment

leighdouglas left a comment

Choose a reason for hiding this comment

Arkariang commented Nov 19, 2024 •

edited

Loading

codecov-commenter commented Nov 19, 2024 •

edited

Loading

Arkariang Nov 19, 2024 •

edited

Loading

Arkariang Nov 19, 2024 •

edited

Loading