Merge pull request #19185 from wordpress-mobile/core-data-adopt-the-new-writer-api

crazytonyli · web-flow · commit d69c8c9252b9 · 2022-08-22T08:06:32.000+12:00
Adopt the new Core Data writer API
diff --git a/WordPress/Classes/Services/BloggingPromptsService.swift b/WordPress/Classes/Services/BloggingPromptsService.swift
@@ -331,15 +331,12 @@ private extension BloggingPromptsService {
     ///   - remoteSettings: The blogging prompt settings from the remote.
     ///   - completion: Closure to be called on completion.
     func saveSettings(_ remoteSettings: RemoteBloggingPromptsSettings, completion: @escaping () -> Void) {
-        let derivedContext = contextManager.newDerivedContext()
-        derivedContext.perform {
+        contextManager.performAndSave { derivedContext in
             let settings = self.loadSettings(context: derivedContext) ?? BloggingPromptSettings(context: derivedContext)
             settings.configure(with: remoteSettings, siteID: self.siteID.int32Value, context: derivedContext)
-
-            self.contextManager.save(derivedContext) {
-                DispatchQueue.main.async {
-                    completion()
-                }
+        } completion: {
+            DispatchQueue.main.async {
+                completion()
             }
         }
     }
diff --git a/WordPress/Classes/Services/CommentService+Likes.swift b/WordPress/Classes/Services/CommentService+Likes.swift
@@ -90,26 +90,23 @@ private extension CommentService {
 
         guard let remoteLikeUsers = remoteLikeUsers,
               !remoteLikeUsers.isEmpty else {
-            onComplete()
+            DispatchQueue.main.async {
+                onComplete()
+            }
             return
         }
 
-        let derivedContext = ContextManager.shared.newDerivedContext()
-
-        derivedContext.perform {
-
+        ContextManager.shared.performAndSave { derivedContext in
             let likers = remoteLikeUsers.map { remoteUser in
                 LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)
             }
 
             if purgeExisting {
                 self.deleteExistingUsersFor(commentID: commentID, siteID: siteID, from: derivedContext, likesToKeep: likers)
             }
-
-            ContextManager.shared.save(derivedContext) {
-                DispatchQueue.main.async {
-                    onComplete()
-                }
+        } completion: {
+            DispatchQueue.main.async {
+                onComplete()
             }
         }
     }
diff --git a/WordPress/Classes/Services/LikeUserHelpers.swift b/WordPress/Classes/Services/LikeUserHelpers.swift
@@ -59,11 +59,8 @@ import CoreData
     }
 
     class func purgeStaleLikes() {
-        let derivedContext = ContextManager.shared.newDerivedContext()
-
-        derivedContext.perform {
-            purgeStaleLikes(fromContext: derivedContext)
-            ContextManager.shared.save(derivedContext)
+        ContextManager.shared.performAndSave {
+            purgeStaleLikes(fromContext: $0)
         }
     }
 
diff --git a/WordPress/Classes/Services/PlanService.swift b/WordPress/Classes/Services/PlanService.swift
@@ -236,10 +236,7 @@ extension PlanService {
 
 struct PlanStorage {
     static func activatePlan(_ planID: Int, forSite siteID: Int) {
-        let manager = ContextManager.sharedInstance()
-        let context = manager.newDerivedContext()
-
-        context.performAndWait {
+        ContextManager.shared.performAndSave { context in
             guard let blog = try? Blog.lookup(withID: siteID, in: context) else {
                 let error = "Tried to activate a plan for a non-existing site (ID: \(siteID))"
                 assertionFailure(error)
@@ -248,16 +245,12 @@ struct PlanStorage {
             }
             if blog.planID?.intValue != planID {
                 blog.planID = NSNumber(value: planID)
-                manager.saveContextAndWait(context)
             }
         }
     }
 
     static func updateHasDomainCredit(_ planID: Int, forSite siteID: Int, hasDomainCredit: Bool) {
-        let manager = ContextManager.sharedInstance()
-        let context = manager.newDerivedContext()
-
-        context.performAndWait {
+        ContextManager.shared.performAndSave { context in
             guard let blog = try? Blog.lookup(withID: siteID, in: context) else {
                 let error = "Tried to update a plan for a non-existing site (ID: \(siteID))"
                 assertionFailure(error)
@@ -266,7 +259,6 @@ struct PlanStorage {
             }
             if blog.hasDomainCredit != hasDomainCredit {
                 blog.hasDomainCredit = hasDomainCredit
-                manager.saveContextAndWait(context)
             }
         }
     }
diff --git a/WordPress/Classes/Services/PostService+Likes.swift b/WordPress/Classes/Services/PostService+Likes.swift
@@ -90,26 +90,23 @@ private extension PostService {
 
         guard let remoteLikeUsers = remoteLikeUsers,
               !remoteLikeUsers.isEmpty else {
-            onComplete()
+            DispatchQueue.main.async {
+                onComplete()
+            }
             return
         }
 
-        let derivedContext = ContextManager.shared.newDerivedContext()
-
-        derivedContext.perform {
-
+        ContextManager.shared.performAndSave { derivedContext in
             let likers = remoteLikeUsers.map { remoteUser in
                 LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)
             }
 
             if purgeExisting {
                 self.deleteExistingUsersFor(postID: postID, siteID: siteID, from: derivedContext, likesToKeep: likers)
             }
-
-            ContextManager.shared.save(derivedContext) {
-                DispatchQueue.main.async {
-                    onComplete()
-                }
+        } completion: {
+            DispatchQueue.main.async {
+                onComplete()
             }
         }
     }
diff --git a/WordPress/Classes/Utility/ContextManager.h b/WordPress/Classes/Utility/ContextManager.h
@@ -16,8 +16,8 @@ FOUNDATION_EXTERN NSString * const ContextManagerModelNameCurrent;
 - (void)saveContextAndWait:(NSManagedObjectContext *)context;
 - (void)saveContext:(NSManagedObjectContext *)context;
 - (void)saveContext:(NSManagedObjectContext *)context withCompletionBlock:(void (^)(void))completionBlock;
-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock;
-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion;
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock;
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion;
 @end
 
 @interface ContextManager : NSObject <CoreDataStack>
diff --git a/WordPress/Classes/Utility/ContextManager.m b/WordPress/Classes/Utility/ContextManager.m
@@ -195,7 +195,7 @@ - (void)mergeChanges:(NSManagedObjectContext *)context fromContextDidSaveNotific
     }];
 }
 
-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock
 {
     NSManagedObjectContext *context = [self newDerivedContext];
     [context performBlockAndWait:^{
@@ -205,7 +205,7 @@ - (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock
     }];
 }
 
-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion
 {
     NSManagedObjectContext *context = [self newDerivedContext];
     [context performBlock:^{
diff --git a/WordPress/WordPressTest/ContextManagerTests.swift b/WordPress/WordPressTest/ContextManagerTests.swift
@@ -187,7 +187,7 @@ class ContextManagerTests: XCTestCase {
         }
         XCTAssertEqual(numberOfAccounts(), 0)
 
-        await contextManager.save { context in
+        await contextManager.performAndSave { context in
             let account = WPAccount(context: context)
             account.userID = 1
             account.username = "First User"
@@ -202,7 +202,7 @@ class ContextManagerTests: XCTestCase {
         // From: https://github.com/apple/swift-evolution/blob/main/proposals/0296-async-await.md#overloading-and-overload-resolution
         // > "In non-async functions, and closures without any await expression, the compiler selects the non-async overload"
         let sync: () -> Void = {
-            contextManager.save { context in
+            contextManager.performAndSave { context in
                 let account = WPAccount(context: context)
                 account.userID = 2
                 account.username = "Second User"
@@ -226,12 +226,12 @@ class ContextManagerTests: XCTestCase {
             self.expectation(description: "Second User is saved"),
         ]
 
-        contextManager.save {
+        contextManager.performAndSave {
             let account = WPAccount(context: $0)
             account.userID = 1
             account.username = "First User"
 
-            contextManager.save {
+            contextManager.performAndSave {
                 let account = WPAccount(context: $0)
                 account.userID = 2
                 account.username = "Second User"

Original file line number	Diff line number	Diff line change
`@@ -90,26 +90,23 @@ private extension CommentService {`
`90`	`90`
`91`	`91`	`guard let remoteLikeUsers = remoteLikeUsers,`
`92`	`92`	`!remoteLikeUsers.isEmpty else {`
`93`		`- onComplete()`
	`93`	`+ DispatchQueue.main.async {`
	`94`	`+ onComplete()`
	`95`	`+ }`
`94`	`96`	`return`
`95`	`97`	`}`
`96`	`98`
`97`		`- let derivedContext = ContextManager.shared.newDerivedContext()`
`98`		`-`
`99`		`- derivedContext.perform {`
`100`		`-`
	`99`	`+ ContextManager.shared.performAndSave { derivedContext in`
`101`	`100`	`let likers = remoteLikeUsers.map { remoteUser in`
`102`	`101`	`LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`if purgeExisting {`
`106`	`105`	`self.deleteExistingUsersFor(commentID: commentID, siteID: siteID, from: derivedContext, likesToKeep: likers)`
`107`	`106`	`}`
`108`		`-`
`109`		`- ContextManager.shared.save(derivedContext) {`
`110`		`- DispatchQueue.main.async {`
`111`		`- onComplete()`
`112`		`- }`
	`107`	`+ } completion: {`
	`108`	`+ DispatchQueue.main.async {`
	`109`	`+ onComplete()`
`113`	`110`	`}`
`114`	`111`	`}`
`115`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,8 @@ import CoreData`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`class func purgeStaleLikes() {`
`62`		`- let derivedContext = ContextManager.shared.newDerivedContext()`
`63`		`-`
`64`		`- derivedContext.perform {`
`65`		`- purgeStaleLikes(fromContext: derivedContext)`
`66`		`- ContextManager.shared.save(derivedContext)`
	`62`	`+ ContextManager.shared.performAndSave {`
	`63`	`+ purgeStaleLikes(fromContext: $0)`
`67`	`64`	`}`
`68`	`65`	`}`
`69`	`66`
Original file line number	Diff line number	Diff line change
`@@ -236,10 +236,7 @@ extension PlanService {`
`236`	`236`
`237`	`237`	`struct PlanStorage {`
`238`	`238`	`static func activatePlan(_ planID: Int, forSite siteID: Int) {`
`239`		`- let manager = ContextManager.sharedInstance()`
`240`		`- let context = manager.newDerivedContext()`
`241`		`-`
`242`		`- context.performAndWait {`
	`239`	`+ ContextManager.shared.performAndSave { context in`
`243`	`240`	`guard let blog = try? Blog.lookup(withID: siteID, in: context) else {`
`244`	`241`	`let error = "Tried to activate a plan for a non-existing site (ID: \(siteID))"`
`245`	`242`	`assertionFailure(error)`
`@@ -248,16 +245,12 @@ struct PlanStorage {`
`248`	`245`	`}`
`249`	`246`	`if blog.planID?.intValue != planID {`
`250`	`247`	`blog.planID = NSNumber(value: planID)`
`251`		`- manager.saveContextAndWait(context)`
`252`	`248`	`}`
`253`	`249`	`}`
`254`	`250`	`}`
`255`	`251`
`256`	`252`	`static func updateHasDomainCredit(_ planID: Int, forSite siteID: Int, hasDomainCredit: Bool) {`
`257`		`- let manager = ContextManager.sharedInstance()`
`258`		`- let context = manager.newDerivedContext()`
`259`		`-`
`260`		`- context.performAndWait {`
	`253`	`+ ContextManager.shared.performAndSave { context in`
`261`	`254`	`guard let blog = try? Blog.lookup(withID: siteID, in: context) else {`
`262`	`255`	`let error = "Tried to update a plan for a non-existing site (ID: \(siteID))"`
`263`	`256`	`assertionFailure(error)`
`@@ -266,7 +259,6 @@ struct PlanStorage {`
`266`	`259`	`}`
`267`	`260`	`if blog.hasDomainCredit != hasDomainCredit {`
`268`	`261`	`blog.hasDomainCredit = hasDomainCredit`
`269`		`- manager.saveContextAndWait(context)`
`270`	`262`	`}`
`271`	`263`	`}`
`272`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,26 +90,23 @@ private extension PostService {`
`90`	`90`
`91`	`91`	`guard let remoteLikeUsers = remoteLikeUsers,`
`92`	`92`	`!remoteLikeUsers.isEmpty else {`
`93`		`- onComplete()`
	`93`	`+ DispatchQueue.main.async {`
	`94`	`+ onComplete()`
	`95`	`+ }`
`94`	`96`	`return`
`95`	`97`	`}`
`96`	`98`
`97`		`- let derivedContext = ContextManager.shared.newDerivedContext()`
`98`		`-`
`99`		`- derivedContext.perform {`
`100`		`-`
	`99`	`+ ContextManager.shared.performAndSave { derivedContext in`
`101`	`100`	`let likers = remoteLikeUsers.map { remoteUser in`
`102`	`101`	`LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`if purgeExisting {`
`106`	`105`	`self.deleteExistingUsersFor(postID: postID, siteID: siteID, from: derivedContext, likesToKeep: likers)`
`107`	`106`	`}`
`108`		`-`
`109`		`- ContextManager.shared.save(derivedContext) {`
`110`		`- DispatchQueue.main.async {`
`111`		`- onComplete()`
`112`		`- }`
	`107`	`+ } completion: {`
	`108`	`+ DispatchQueue.main.async {`
	`109`	`+ onComplete()`
`113`	`110`	`}`
`114`	`111`	`}`
`115`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ - (void)mergeChanges:(NSManagedObjectContext *)context fromContextDidSaveNotific`
`195`	`195`	`}];`
`196`	`196`	`}`
`197`	`197`
`198`		`-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock`
	`198`	`+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock`
`199`	`199`	`{`
`200`	`200`	`NSManagedObjectContext *context = [self newDerivedContext];`
`201`	`201`	`[context performBlockAndWait:^{`
`@@ -205,7 +205,7 @@ - (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock`
`205`	`205`	`}];`
`206`	`206`	`}`
`207`	`207`
`208`		`-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion`
	`208`	`+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion`
`209`	`209`	`{`
`210`	`210`	`NSManagedObjectContext *context = [self newDerivedContext];`
`211`	`211`	`[context performBlock:^{`