Update product entitlement mapping request to new format #976
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
tonidero
added
the
refactor
tonidero
commented
Apr 19, 2023
| errorLog(OfflineEntitlementsStrings.ERROR_PARSING_PRODUCT_ENTITLEMENT_MAPPING.format(jsonString), e) | ||
| preferences.edit().remove(productEntitlementMappingCacheKey).apply() | ||
| null | ||
| } |
There was a problem hiding this comment.
Found this small edge case, without this, we would have crashed later when trying to get the cached mappings if there was an invalid format (which should never happen)
| val productObject = productsArray.getJSONObject(productIndex) | ||
| val productsObject = json.getJSONObject(PRODUCT_ENTITLEMENT_MAPPING_KEY) | ||
| val mappings = mutableMapOf<String, Mapping>() | ||
| for (mappingIdentifier in productsObject.keys()) { |
There was a problem hiding this comment.
I'm not sure what to call this, since it would be productId:basePlanId or productId. In StoreProduct, this would be the id...
There was a problem hiding this comment.
Alternatively I can suggest productsObjectKey, but mappingIdentifier works fine imo
| val entitlements: List<String> | ||
| ) | ||
|
|
||
| fun toMap(): Map<String, List<String>> { | ||
| return mappings.associateBy({ it.identifier }, { it.entitlements }) | ||
| } |
There was a problem hiding this comment.
Can't really use this now that it's not a simple mapping anymore, so I removed it
| return PurchasedProduct( | ||
| productIdentifier, | ||
| mapping?.basePlanId, |
| @@ -57,11 +57,13 @@ class PurchasedProductsFetcher( | |||
| val purchaseAssociatedToProduct = allPurchases.first { it.skus[0] == productIdentifier } | |||
| val isActive = activeProducts.contains(productIdentifier) | |||
| val expirationDate = getExpirationDate(isActive, purchaseAssociatedToProduct) | |||
| val mapping = productEntitlementMapping?.mappings?.get(productIdentifier) | |||
NachoSoto
reviewed
Apr 20, 2023
vegaro
approved these changes
Apr 26, 2023
| val productObject = productsArray.getJSONObject(productIndex) | ||
| val productsObject = json.getJSONObject(PRODUCT_ENTITLEMENT_MAPPING_KEY) | ||
| val mappings = mutableMapOf<String, Mapping>() | ||
| for (mappingIdentifier in productsObject.keys()) { |
There was a problem hiding this comment.
Alternatively I can suggest productsObjectKey, but mappingIdentifier works fine imo
Base automatically changed from
toniricodiez/sdk-2992-write-flow-to-use-locally-computed-2
to
main
April 27, 2023 07:10
tonidero
force-pushed
the
update-product-entitlement-mapping-request-format
branch
from
893ac77
to
d197ce3
Compare
tonidero
added a commit
that referenced
this pull request
May 18, 2023
**This is an automatic release.** ### New Features * CAT-859 Expose whether or not a SubscriptionOption is Prepaid in the SDK (#1005) via Deema AlShamaa (@dalshamaa) ### Bugfixes * [CF-1324] Fix personalizedPrice defaulting to false (#952) via beylmk (@beylmk) ### Performance Improvements * Store and return ETag last refresh time header (#978) via Toni Rico (@tonidero) ### Dependency Updates * Bump fastlane-plugin-revenuecat_internal from `3b03efa` to `fe45299` (#991) via dependabot[bot] (@dependabot[bot]) * Bump danger from 9.2.0 to 9.3.0 (#981) via dependabot[bot] (@dependabot[bot]) * Bump fastlane-plugin-revenuecat_internal from `8482a43` to `3b03efa` (#974) via dependabot[bot] (@dependabot[bot]) * Bump fastlane from 2.212.1 to 2.212.2 (#973) via dependabot[bot] (@dependabot[bot]) * Bump fastlane-plugin-revenuecat_internal from `9255366` to `8482a43` (#961) via dependabot[bot] (@dependabot[bot]) ### Other Changes * Add proration modes to post to backend (#977) via swehner (@swehner) * Added ENTITLEMENTS_COMPUTED_ON_DEVICE (#939) via Cesar de la Vega (@vegaro) * Fix flaky test in OfflineCustomerInfoCalculatorTest (#997) via Cesar de la Vega (@vegaro) * Fix `OfflineCustomerInfoCalculatorTest` `Unresolved reference: ProducType` (#995) via Cesar de la Vega (@vegaro) * Add support for product_plan_identifier for offline customer info (#959) via Cesar de la Vega (@vegaro) * Add non-subscriptions support to offline customer info (#958) via Cesar de la Vega (@vegaro) * Query only active purchases when generating offline entitlements customer info (#1003) via Toni Rico (@tonidero) * Fix `PurchasesIntegrationTest` building issue (#996 into main) (#998) via Cesar de la Vega (@vegaro) * Fail offline entitlements computation if product entitlement mapping not available (#999) via Toni Rico (@tonidero) * Fix build_magic_weather lane (#993) via Cesar de la Vega (@vegaro) * Add backend integration tests and test product entitlement mapping endpoint (#988) via Toni Rico (@tonidero) * Fix purchases integration tests (#980) via Toni Rico (@tonidero) * Disable offline entitlements if active inapp purchases exist (#983) via Toni Rico (@tonidero) * Clear cached customer info upon entering offline entitlements mode (#989) via Toni Rico (@tonidero) * Update product entitlement mapping request to new format (#976) via Toni Rico (@tonidero) * Support enabling/disabling offline entitlements (#964) via Toni Rico (@tonidero) * Add back integration tests automation (#972) via Toni Rico (@tonidero) * Upgrade to AGP 8.0 (#975) via Toni Rico (@tonidero) * Extract post receipt logic to PostReceiptHelper (#967) via Toni Rico (@tonidero) * Add isServerDown to error callback for postReceipt and getCustomerInfo requests (#963) via Toni Rico (@tonidero) * Add back integration test flavors (#962) via Toni Rico (@tonidero) * Fix storing test results (#966) via Cesar de la Vega (@vegaro) * Extract detekt job from test job (#965) via Cesar de la Vega (@vegaro) [CF-1324]: https://revenuecats.atlassian.net/browse/CF-1324?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: Toni Rico <antonio.rico.diez@revenuecat.com>
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.
Description
We are changing the format of the request to get the product entitlement mapping. This is safe to change since this is still not being used in production.
TODO