diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/DeleteHighlight.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/DeleteHighlight.swift index 98f5bf032..a491ec1b8 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/DeleteHighlight.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/DeleteHighlight.swift @@ -59,14 +59,14 @@ public extension DataService { highlight.remove(inContext: context) } else { highlight.serverSyncStatus = Int64(ServerSyncStatus.needsDeletion.rawValue) - } - do { - try context.save() - logger.debug("Highlight deleted succesfully") - } catch { - context.rollback() - logger.debug("Failed to delete Highlight: \(error.localizedDescription)") + do { + try context.save() + logger.debug("Highlight deleted succesfully") + } catch { + context.rollback() + logger.debug("Failed to delete Highlight: \(error.localizedDescription)") + } } } } diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/MergeHighlight.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/MergeHighlight.swift index ba3506d40..eac2839a7 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/MergeHighlight.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/MergeHighlight.swift @@ -100,6 +100,7 @@ extension DataService { if let highlightObject = (try? context.fetch(fetchRequest))?.first { if isSyncSuccess { highlightObject.remove(inContext: context) + return } else { highlightObject.serverSyncStatus = Int64(ServerSyncStatus.needsDeletion.rawValue) } diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLabelPublisher.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLabelPublisher.swift index 9df043f40..ea0afc9bb 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLabelPublisher.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLabelPublisher.swift @@ -57,14 +57,14 @@ extension DataService { label.remove(inContext: context) } else { label.serverSyncStatus = Int64(ServerSyncStatus.needsDeletion.rawValue) - } - do { - try context.save() - logger.debug("LinkedItem deleted succesfully") - } catch { - context.rollback() - logger.debug("Failed to delete LinkedItem: \(error.localizedDescription)") + do { + try context.save() + logger.debug("LinkedItem deleted succesfully") + } catch { + context.rollback() + logger.debug("Failed to delete LinkedItem: \(error.localizedDescription)") + } } } } diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLink.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLink.swift index 24fa18ebe..21db23055 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLink.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLink.swift @@ -67,14 +67,14 @@ public extension DataService { linkedItem.remove(inContext: context) } else { linkedItem.serverSyncStatus = Int64(ServerSyncStatus.needsDeletion.rawValue) - } - do { - try context.save() - logger.debug("LinkedItem deleted succesfully") - } catch { - context.rollback() - logger.debug("Failed to delete LinkedItem: \(error.localizedDescription)") + do { + try context.save() + logger.debug("LinkedItem deleted succesfully") + } catch { + context.rollback() + logger.debug("Failed to delete LinkedItem: \(error.localizedDescription)") + } } } }