Clear cached offerings and products after Storefront changes (2/4) by Juanpe · Pull Request #1583 · RevenueCat/purchases-ios

Juanpe · 2022-05-17T11:45:46Z

Follow up to #1557. Subtask of #1382

Description

This PR aims to clear the stuff in the cache when the Storefront changes.

Changes:

Add clearCachedOfferings method to DeviceCache.
Add clearCache method to ProductFetcherSK1.
Make internal the clearCache method in ProductsFetcherSK2.
Handle the Storefront changes in the PurchasesOrchestator.
Add tests to cover some scenarios.

…anges for SK2

…_changes

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

…lear_cache_after_changing_Storefront

NachoSoto · 2022-05-19T18:24:24Z

    }

+    @available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *)
+    func testClearCachedProductsAndOfferingsAfterStorefrontChangesWithSK2() async throws {


Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

taquitos

This looks awesome to me, I'd love your thoughts on the .async(flags: .barrier) comment.

…to clear_cache_after_changing_Storefront

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

NachoSoto

I think this is ready! Looks a lot better with the logic taken out now of both fetchers :)

NachoSoto · 2022-06-14T16:31:21Z

    }

+    func clearCache() {
+        self.cachedProductsByIdentifier.removeAll(keepingCapacity: false)


NachoSoto · 2022-06-14T16:31:55Z

+
+        await productsFetcherSK2.clearCache()
+
+        let cachedProducts = await productsFetcherSK2.cachedProductsByIdentifier


I would check that this isn't empty before clearing the cache.

Good point 👍🏼

Done ✅ (9d556b3)

NachoSoto · 2022-06-14T16:35:17Z

+        self.productsFetcherSK2 = ProductsFetcherSK2()
+    }
+
+    func testCachedProductsAreEmptyAfterClearingCachedProductCorrectly() async throws {


I think this needs try AvailabilityChecks.iOS15APIAvailableOrSkipTest() so it gets skipped on iOS 14.

Good catch :)

Done ✅ (9d556b3)

NachoSoto · 2022-06-14T16:36:02Z

+@testable import RevenueCat
+
+@available(iOS 15.0, tvOS 15.0, macOS 12.0, watchOS 8.0, *)
+class ProductsFetcherSK2Tests: StoreKitConfigTestCase {


Whoa we didn't have any tests before? 😕

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

…b.com/Juanpe/purchases-ios into clear_cache_after_changing_Storefront

Juanpe · 2022-06-15T09:26:17Z

I think this is ready! Looks a lot better with the logic taken out now of both fetchers :)

Yeah, totally agree. Thanks for the feedback 👍🏼

Juanpe · 2022-06-16T14:53:29Z

Hi guys, I made the suggested changes but I didn't re-request the review. Should I do it? Please, let me know, ok? 🙂 Thanks!

NachoSoto · 2022-06-16T16:16:33Z

I'm about to run tests on here and merge this 🎉

NachoSoto · 2022-06-16T16:27:41Z

Looks StoreProductTests.testSk2PriceFormatterReactsToStorefrontChanges is failing:

…orefront

NachoSoto · 2022-06-16T17:09:39Z

+        // Note: this test passes only because the fetcher is recreated
+        // therefore clearing the cache. `ProductsFetcherSK2` does not
+        // detect Storefront changes to invalidate the cache.


Oh makes sense.
Can you expand this comment to explain that this is done by StoreKit2StorefrontListenerDelegate?

Also maybe it makes more sense to call clearCache() on the fetcher to mimic the real-world behavior?

Yep, it's a good point, let me expand it 👍🏼

yep, I thought the same, but I wanted to use the same logic for both fetchers. 🤔 Although... I agree with you that it would mimic real-world behaviour. Let me change it

Done ✅ (645cf5d). I've updated the test cases. Now, we clear manually the cache to mimic the real-world behaviour. Moreover, I've updated the comment to indicate that now, the changes of the Storefront are managed by the SK2 listener delegate.

I think, now it looks better 👍🏼 Thanks!

NachoSoto

All tests passing!

NachoSoto · 2022-06-16T17:29:36Z

Thanks again for the hard work with this!

Juanpe · 2022-06-16T17:46:42Z

Thanks again for the hard work with this!

Thank you all for the feedback and for being so patient 🙂

@NachoSoto

### Changes: * Replaced `CustomerInfo.nonSubscriptionTransactions` with a new non-`StoreTransaction` type (#1733) via NachoSoto (@NachoSoto) * `Purchases.configure`: added overload taking a `Configuration.Builder` (#1720) via NachoSoto (@NachoSoto) * Extract Attribution logic out of Purchases (#1693) via Joshua Liebowitz (@taquitos) * Remove create alias (#1695) via Joshua Liebowitz (@taquitos) All attribution APIs can now be accessed from `Purchases.shared.attribution`. ### Improvements: * Improved purchasing logs, added promotional offer information (#1725) via NachoSoto (@NachoSoto) * `PurchasesOrchestrator`: don't log attribute errors if there are none (#1742) via NachoSoto (@NachoSoto) * `FatalErrorUtil`: don't override `fatalError` on release builds (#1736) via NachoSoto (@NachoSoto) * `SKPaymentTransaction`: added more context to warnings about missing properties (#1731) via NachoSoto (@NachoSoto) * New SwiftUI Purchase Tester example (#1722) via Josh Holtz (@joshdholtz) * update docs for `showManageSubscriptions` (#1729) via aboedo (@aboedo) * `PurchasesOrchestrator`: unify finish transactions between SK1 and SK2 (#1704) via NachoSoto (@NachoSoto) * `SubscriberAttribute`: converted into `struct` (#1648) via NachoSoto (@NachoSoto) * `CacheFetchPolicy.notStaleCachedOrFetched`: added warning to docstring (#1708) via NachoSoto (@NachoSoto) * Clear cached offerings and products after Storefront changes (2/4) (#1583) via Juanpe Catalán (@Juanpe) * `ROT13`: optimized initialization and removed magic numbers (#1702) via NachoSoto (@NachoSoto) ### Fixes: * `logIn`/`logOut`: sync attributes before aliasing (#1716) via NachoSoto (@NachoSoto) * `Purchases.customerInfo(fetchPolicy:)`: actually use `fetchPolicy` parameter (#1721) via NachoSoto (@NachoSoto) * `PurchasesOrchestrator`: fix behavior dealing with `nil` `SKPaymentTransaction.productIdentifier` during purchase (#1680) via NachoSoto (@NachoSoto) * `PurchasesOrchestrator.handlePurchasedTransaction`: always refresh receipt data (#1703) via NachoSoto (@NachoSoto)

…#1743) Follow up to #1583. Subtask of #1382. ### Description This PR aims to invalidate and re-fetch if appropriate the stuff in the cache when the Storefront changes. I've used both `OfferingsManager` and `ProductsManager` to manage the logic of invalidate and re-fetch the data. Changes: - Add `invalidateAndReFetchCachedOfferingsIfAppropiate` method to `OfferingsManager` class. - Rename `clearCachedProducts` method to `invalidateAndReFetchCachedProductsIfAppropiate` in `ProductsManager` class. - Add `OfferingsManager` as a dependency of `PurchasesOrchestrator`. - Clear cache methods returns the identifiers of the elements that have been removed or an empty list if there was no stuff in the cache. - Add tests to cover some scenarios.

Juanpe and others added 25 commits May 9, 2022 09:29

Listen changes via paymentQueueDidChangeStorefront method

d306755

Create StoreKit2StorefrontListener.swift to listen to Storefront ch…

a59aa39

…anges for SK2

Update PurchasesOrchestrator to listen to the Storefront changes

dbc5f8e

Fix failing tests

25aacfd

Add some unit tests related to the Storefront changes

999faa4

Include StoreKit2StorefrontListenerTests in StoreKitTests

567ffd2

Merge remote-tracking branch 'origin/main' into respond_to_Storefront…

8d58de4

…_changes

Use didSet observer to cancel any previous tasks

cee546e

Add required explicit self

683a7ef

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

Remove force unwrap

ca285d5

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

Add required spaces

c57ae0f

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

Remove useless cancel method when the listener is released

171db44

Notify Storefront changes in the main thread

ddf8312

Add cancel task when the Listener is released

ad5e799

Merge branch 'main' into respond_to_Storefront_changes

6ed5fb9

Merge branch 'main' of https://github.com/Juanpe/purchases-ios into c…

915252a

…lear_cache_after_changing_Storefront

Add clearCachedOfferings method to DeviceCache

519d643

Handle Storefront update and clear cached offerings

57ced5d

Add test to cover clear cached offerings

b70c04b

Add clearCache to ProductFetcherSK1

b1c1828

Make internal clearCache method in ProductsFetcherSK2

b57a299

Add clearCachedProducts method in ProductsManager

e9d6321

Clear cached products when Storefront changes

b7bca28

Add test for ProductsFetcherSK1

03c2891

Add test cases for PurchasesOrchestrator

97f8f58

Juanpe changed the title ~~Clear cache after changing storefront~~ Clear cached offerings and products after Storefront changes (2/4) May 17, 2022

Juanpe mentioned this pull request May 17, 2022

Respond to Storefront updates #1382

Closed

NachoSoto reviewed May 19, 2022

View reviewed changes

Juanpe and others added 2 commits May 20, 2022 10:41

Update Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift

91493fc

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

Update Tests/UnitTests/Purchasing/ProductsFetcherSK1Tests.swift

ecc6c74

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

taquitos reviewed Jun 13, 2022

View reviewed changes

Juanpe added 2 commits June 13, 2022 21:45

Remove an outdated comment related to the changes of the Storefront

e611beb

Merge branch 'main' of https://github.com/RevenueCat/purchases-ios in…

2a5b337

…to clear_cache_after_changing_Storefront

NachoSoto reviewed Jun 14, 2022

View reviewed changes

Comment thread Sources/Purchasing/PurchasesOrchestrator.swift Outdated

Update Sources/Purchasing/PurchasesOrchestrator.swift

af1e195

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

NachoSoto approved these changes Jun 14, 2022

View reviewed changes

Juanpe and others added 6 commits June 15, 2022 11:07

Update Tests/StoreKitUnitTests/ProductsFetcherSK2Tests.swift

0c1053d

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

Update Tests/StoreKitUnitTests/ProductsFetcherSK2Tests.swift

cdd51be

Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>

Merge branch 'clear_cache_after_changing_Storefront' of https://githu…

5fa98b7

…b.com/Juanpe/purchases-ios into clear_cache_after_changing_Storefront

Merge branch 'main' into clear_cache_after_changing_Storefront

86b4cb5

Fix DeviceCache failing test

f8ab246

Add validation of cached products in ProductFetcherSK2 test case

9d556b3

NachoSoto approved these changes Jun 16, 2022

View reviewed changes

Juanpe added 2 commits June 16, 2022 18:56

Merge branch 'main' into clear_cache_after_changing_Storefront

e7cbde1

Fix failing tests and update comment related to the changes of the St…

0f31898

…orefront

NachoSoto reviewed Jun 16, 2022

View reviewed changes

Update test cases related to the changes of Storefront.

645cf5d

NachoSoto approved these changes Jun 16, 2022

View reviewed changes

NachoSoto merged commit 9482e8d into RevenueCat:main Jun 16, 2022

Juanpe deleted the clear_cache_after_changing_Storefront branch June 17, 2022 07:07

Juanpe mentioned this pull request Jun 28, 2022

Re-fetch cached offerings and products after Storefront changes (3/4) #1743

Merged

NachoSoto mentioned this pull request Jun 30, 2022

Release/4.7.0 #1745

Merged


		await productsFetcherSK2.clearCache()

		let cachedProducts = await productsFetcherSK2.cachedProductsByIdentifier

Uh oh!

Conversation

Juanpe commented May 17, 2022

Description

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

taquitos left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

NachoSoto left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Juanpe commented Jun 15, 2022

Uh oh!

Juanpe commented Jun 16, 2022

Uh oh!

NachoSoto commented Jun 16, 2022

Uh oh!

NachoSoto commented Jun 16, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Juanpe Jun 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NachoSoto left a comment

Choose a reason for hiding this comment

Uh oh!

NachoSoto commented Jun 16, 2022

Uh oh!

Juanpe commented Jun 16, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Juanpe Jun 16, 2022 •

edited

Loading