Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Core Data: Migrate storage usage for ShippingMethodStore #14568

Merged
merged 3 commits into from
Dec 4, 2024
+4 −12
Merged

Core Data: Migrate storage usage for ShippingMethodStore #14568

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7515d05
Replace deprecated usage of writerDerivedStorage with the new method …
itsmeichigo Dec 2, 2024
c6259ae
Update release notes
itsmeichigo Dec 2, 2024
829a218
Merge branch 'trunk' into task/14122-shipping-method-store
itsmeichigo Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- [Internal] Updated CoreDataManager to be thread-safe [https://github.com/woocommerce/woocommerce-ios/pull/14534]
- [Internal] Updated storage usage in CouponStore [https://github.com/woocommerce/woocommerce-ios/pull/14530]
- [Internal] Updated storage usage in ProductShippingClassStore [https://github.com/woocommerce/woocommerce-ios/pull/14520]
- [Internal] Updated storage usage in ShippingMethodStore [https://github.com/woocommerce/woocommerce-ios/pull/14568]

21.2
-----
Expand Down
15 changes: 3 additions & 12 deletions Yosemite/Yosemite/Stores/ShippingMethodStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ import Storage
public final class ShippingMethodStore: Store {
private let remote: ShippingMethodsRemote

private lazy var sharedDerivedStorage: StorageType = {
return storageManager.writerDerivedStorage
}()

public init(remote: ShippingMethodsRemote,
dispatcher: Dispatcher,
storageManager: StorageManagerType,
Expand Down Expand Up @@ -77,15 +73,10 @@ private extension ShippingMethodStore {
/// Triggers `completion` on main thread.
///
func upsertShippingMethodsInBackground(siteID: Int64, readOnlyMethods: [ShippingMethod], completion: @escaping () -> Void) {
let derivedStorage = sharedDerivedStorage
derivedStorage.perform { [weak self] in
storageManager.performAndSave({ [weak self] storage in
guard let self else { return }
self.upsertShippingMethods(siteID: siteID, readOnlyMethods: readOnlyMethods, in: derivedStorage)
}

storageManager.saveDerivedType(derivedStorage: derivedStorage) {
DispatchQueue.main.async(execute: completion)
}
self.upsertShippingMethods(siteID: siteID, readOnlyMethods: readOnlyMethods, in: storage)
}, completion: completion, on: .main)
}

/// Updates or inserts Readonly `ShippingMethod` entities in specified storage.
Expand Down