[MBL-1601] Filter Rewards By Selected Shipping Location #2114
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scottkicks
force-pushed
the
scott/filter-rewards-by-shipping-location
branch
from
02bf3a3 to
553126a
Compare
scottkicks
commented
Aug 6, 2024
| @@ -549,7 +549,7 @@ public struct Service: ServiceType { | |||
| let query = GraphAPI | |||
| .FetchProjectRewardsByIdQuery( | |||
| projectId: projectId, | |||
| includeShippingRules: false, | |||
| includeShippingRules: true, | |||
There was a problem hiding this comment.
Tested around the app and made sure tests passed to make sure this didn't impact anything unexpectedly. All this does is include shipping rule/location data in each reward for a project.
In theory, this might slow down project load time. I haven't seen a notable difference, but I will keep an eye on it.
scottkicks
commented
Aug 6, 2024
Comment on lines
+445
to
+476
| private func filteredRewardsByLocation( | ||
| _ rewards: [Reward], | ||
| shippingRule: ShippingRule? | ||
| ) -> [Reward] { | ||
| return rewards.filter { reward in | ||
| var shouldDisplayReward = false | ||
|
|
||
| let isRewardLocalOrDigital = isRewardDigital(reward) || isRewardLocalPickup(reward) | ||
| let isUnrestrictedShippingReward = reward.isUnRestrictedShippingPreference | ||
| let isRestrictedShippingReward = reward.isRestrictedShippingPreference | ||
|
|
||
| // return all rewards that are digital or ship anywhere in the world. | ||
| if isRewardLocalOrDigital || isUnrestrictedShippingReward { | ||
| shouldDisplayReward = true | ||
|
|
||
| // if add on is local pickup, ensure locations are equal. | ||
| if isRewardLocalPickup(reward) { | ||
| if let rewardLocation = reward.localPickup?.country, | ||
| let shippingRuleLocation = shippingRule?.location.country, rewardLocation == shippingRuleLocation { | ||
| shouldDisplayReward = true | ||
| } else { | ||
| shouldDisplayReward = false | ||
| } | ||
| } | ||
| // If restricted shipping, compare against selected shipping location. | ||
| } else if isRestrictedShippingReward { | ||
| shouldDisplayReward = rewardShipsTo(selectedLocation: shippingRule?.location.id, reward) | ||
| } | ||
|
|
||
| return shouldDisplayReward | ||
| } | ||
| } |
There was a problem hiding this comment.
This logic is mostly from the existing AddOns screen filtering logic with minor adjustments.
If there are any suggestions for simplifying or making this easier to understand, please suggest them!
ifosli
approved these changes
Aug 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📲 What
Filters the displayed rewards based on the selected shipping location.
🤔 Why
We only want users to select rewards that they can actually get.
🛠 How
The shipping dropdown is already on this screen. We need to filter based on the currently selected location.
The types of rewards are:
Right now, we pull in a project's rewards using this GraphQL Query
FetchProjectRewardsById.This returns all rewards for a project and has an option to
includeShippingRules.Flipping this to
trueallows us to compare individual reward shipping info to the selected location and filter accordingly.👀 See
I created a test project, A Really Cool Proj, that has the following reward types.
✅ Acceptance criteria