changes for deleteAsyncBy

Author: Dilip Parmar

CoreDataWrapper_iOSTests/AsyncOperationsTests.swift

@@ -111,7 +111,10 @@ class AsyncOperationsTests: XCTestCase {
 
         let expectation = XCTestExpectation.init(description: "\(#file)\(#line)")
 
-        coreDataWrapper.deleteAsyncBy(objectId: car!.objectID, shouldSave: true, completion: {
+        coreDataWrapper.deleteAsyncBy(objectId: car!.objectID, shouldSave: true, completion: { (isDeleted) in
+            
+            XCTAssert(isDeleted)
+            
             let fetched = coreDataWrapper.fetchBy(objectId: car!.objectID) as? Car
             XCTAssertNil(fetched)
             expectation.fulfill()
@@ -572,7 +575,10 @@ class AsyncOperationsTests: XCTestCase {
         let expectation = XCTestExpectation.init(description: "\(#file)\(#line)")
         let context = coreDataWrapper.newBgContext()
 
-        coreDataWrapper.deleteAsyncBy(objectId: car!.objectID, context: context, shouldSave: true, completion: {
+        coreDataWrapper.deleteAsyncBy(objectId: car!.objectID, context: context, shouldSave: true, completion: { (isDeleted) in
+                       
+            XCTAssert(isDeleted)
+                       
             let fetched = coreDataWrapper.fetchBy(objectId: car!.objectID) as? Car
             XCTAssert(fetched!.isDeleted)
 
@@ -595,7 +601,10 @@ class AsyncOperationsTests: XCTestCase {
 
         let expectation = XCTestExpectation.init(description: "\(#file)\(#line)")
         let context = coreDataWrapper.newBgContext()
-        coreDataWrapper.deleteAsyncBy(objectId: car!.objectID, context: context, shouldSave: true, completion: {
+        coreDataWrapper.deleteAsyncBy(objectId: car!.objectID, context: context, shouldSave: true, completion: {  (isDeleted) in
+                   
+            XCTAssert(isDeleted)
+                   
             let fetched = coreDataWrapper.fetchBy(objectId: car!.objectID) as? Car
             XCTAssert(fetched!.isDeleted)
             XCTAssert(Thread.isMainThread)

CoreDataWrapper_iOSTests/SyncOperationsTests.swift

@@ -92,7 +92,8 @@ class SyncOperationsTests: XCTestCase {
         let car = coreDataWrapper.addOf(type: Car.self, properties: ["model": "Audi", "regNo": 30], shouldSave: false)
         XCTAssertNotNil(car)
 
-        coreDataWrapper.deleteBy(objectId: car!.objectID, shouldSave: true)
+        let isDeleted = coreDataWrapper.deleteBy(objectId: car!.objectID, shouldSave: true)
+        XCTAssert(isDeleted)
 
         let fetched = coreDataWrapper.fetchBy(objectId: car!.objectID) as? Car
         XCTAssertNil(fetched)

Sources/CoreDataWrapper/CoreDataWrapper+AsyncOperations.swift

@@ -308,7 +308,7 @@ extension CoreDataWrapper {
         (objectId: NSManagedObjectID,
          context: NSManagedObjectContext? = nil,
          shouldSave: Bool,
-         completion: @escaping () -> Void,
+         completion: @escaping (Bool) -> Void,
          completionOnMainThread: Bool) {
         var innerContext: NSManagedObjectContext
         if let context = context {
@@ -317,53 +317,55 @@ extension CoreDataWrapper {
             innerContext = self.mainContext
         }
         innerContext.perform {
+            var isDeleted = false
             if let existingObject = try? innerContext.existingObject(with: objectId),
                 !existingObject.isDeleted {
                 innerContext.delete(existingObject)
+                isDeleted = true
             }
-            let saveMain = { (completion: @escaping () -> Void) in
-                self.saveMainContext(isSync: false, completion: { (Bool) in
-                    completion()
+            let saveMain = { (completion: @escaping (Bool) -> Void) in
+                self.saveMainContext(isSync: false, completion: { (isSuccess) in
+                    completion(isSuccess && isDeleted)
                 })
             }
-            let saveBG = { (completion: @escaping () -> Void) in
-                self.saveBGContext(context: innerContext, isSync: true, completion: { (Bool) in
-                    completion()
+            let saveBG = { (completion: @escaping (Bool) -> Void) in
+                self.saveBGContext(context: innerContext, isSync: true, completion: { (isSuccess) in
+                    completion(isSuccess && isDeleted)
                 })
             }
-            let mainCaller = {
+            let mainCaller = { (isSuccess: Bool) in
                 self.mainContext.perform {
-                    completion()
+                    completion(isSuccess)
                 }
             }
-            let bgCaller = {
-                completion()
+            let bgCaller = { (isSuccess: Bool) in
+                completion(isSuccess)
             }
             let tuple = (completionOnMainThread, (context != nil), shouldSave)
             switch tuple {
             case (false, false, false): //It's main context and no main thread callback
-                bgCaller()
+                bgCaller(isDeleted)
             case (false, false, true): //It's main context and no main thread callback
-                saveMain({
-                    bgCaller()
+                saveMain({ (isSuccess: Bool) in
+                    bgCaller(isSuccess)
                 })
             case (false, true, false): //It's bg context and no main thread callback
-                bgCaller()
+                bgCaller(isDeleted)
             case (false, true, true): //It's bg context and no main thread callback
-                saveBG({
-                    bgCaller()
+                saveBG({ (isSuccess: Bool) in
+                    bgCaller(isSuccess)
                 })
             case (true, false, false): //It's main context and main thread callback
-                bgCaller()
+                bgCaller(isDeleted)
             case (true, false, true): //It's main context and main thread callback
-                saveMain({
-                    bgCaller()
+                saveMain({ (isSuccess: Bool) in
+                    bgCaller(isSuccess)
                 })
             case (true, true, false): //It's bg context and main thread callback
-                mainCaller()
+                mainCaller(isDeleted)
             case (true, true, true): //It's bg context and main thread callback
-                saveBG({
-                    mainCaller()
+                saveBG({ (isSuccess: Bool) in
+                    mainCaller(isSuccess)
                 })
             }
         }
@@ -513,12 +515,12 @@ extension CoreDataWrapper {
             }
             let saveMain = { (completion: @escaping (Bool) -> Void) in
                 self.saveMainContext(isSync: false, completion: { (isSuccess) in
-                    completion(isSuccess)
+                    completion(isSuccess && isUpdated)
                 })
             }
             let saveBG = { (completion: @escaping (Bool) -> Void) in
                 self.saveBGContext(context: innerContext, isSync: true, completion: { (isSuccess) in
-                    completion(isSuccess)
+                    completion(isSuccess && isUpdated)
                 })
             }
             let mainCaller = { (updateResult: Bool) in