Query only active purchases when generating offline entitlements customer info #1003
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
May 15, 2023
| @@ -7,7 +7,6 @@ data class PurchasedProduct( | |||
| val productIdentifier: String, | |||
| val basePlanId: String?, | |||
| val storeTransaction: StoreTransaction, | |||
| val isActive: Boolean, | |||
There was a problem hiding this comment.
Now all these will be active, so I just removed this property.
There was a problem hiding this comment.
It was a very confusing property too
| val activePurchases = activePurchasesByHashedToken.values.toList() | ||
| val purchasedProducts = activePurchases.map { | ||
| createPurchasedProduct(it, productEntitlementMapping) | ||
| } |
There was a problem hiding this comment.
Here I'm assuming there can't be more than 1 active purchase with the same product id. I think that's safe to assume but lmk if I'm wrong.
| ) | ||
|
|
||
| mockAllPurchases(purchaseRecordMonthly, purchaseRecordAnnual) | ||
| mockActivePurchases(activePurchase) |
There was a problem hiding this comment.
I noticed a couple of these tests were wrong, it was actually only mocking a single active purchase, and multiple non-active. They are fixed on this PR.
| @@ -175,10 +175,13 @@ fun stubPurchaseHistoryRecord( | |||
| fun stubStoreTransactionFromGooglePurchase( | |||
| productIds: List<String>, | |||
| purchaseTime: Long, | |||
| purchaseToken: String = "abcdefghijipehfnbbnldmai.AO-J1OxqriTepvB7suzlIhxqPIveA0IHtX9amMedK0KK9CsO0S3Zk5H6gdwvV" + | |||
| "7HzZIJeTzqkY4okyVk8XKTmK1WZKAKSNTKop4dgwSmFnLWsCxYbahUmADg" | |||
There was a problem hiding this comment.
Had to add this as a parameter to allow having multiple purchases in the map returned by queryPurchases
Codecov Report
@@ Coverage Diff @@
## main #1003 +/- ##
==========================================
+ Coverage 85.07% 85.35% +0.27%
==========================================
Files 165 168 +3
Lines 5824 5983 +159
Branches 801 834 +33
==========================================
+ Hits 4955 5107 +152
+ Misses 550 546 -4
- Partials 319 330 +11
|
vegaro
approved these changes
May 15, 2023
| @@ -18,7 +18,7 @@ class PurchasedProductsFetcher( | |||
| private val dateProvider: DateProvider = DefaultDateProvider() | |||
| ) { | |||
|
|
|||
| fun queryPurchasedProducts( | |||
| fun queryActiveProducts( | |||
tonidero
deleted the
toniricodiez/sdk-3111-android-query-only-active-purchases-when
branch
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>
tonidero
added a commit
that referenced
this pull request
May 23, 2023
### Description This removes the flag that was disabling offline entitlements, so we actually start using offline entitlements #### TODO - [x] Hold until making sure it all works correctly - [x] Hold until #983 is merged - [x] Hold until #959 is merged - [x] Hold until #999 is merged - [x] Hold until #1003 is merged
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 were querying for the whole history of purchases when generating the offline entitlements customer info. This was done to get more accurate data in that situation. However, it adds complexity for a non-critical use case. This PR removes that functionality, simplifying the use cases for offline entitlements.