From 73ab2136313a9b5eea23759ab4995c16c03607e1 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sat, 14 Jan 2023 12:39:36 -0500
Subject: [PATCH] Fix sync errors due to local conflicts and all items from a
 feed being deleted

---
 .../Persistence/PersistentContainer.swift     |  2 +
 .../Reader.xcdatamodeld/.xccurrentversion     |  2 +-
 .../Reader 2.xcdatamodel/contents             |  2 +-
 .../Reader 3.xcdatamodel/contents             | 39 +++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader 3.xcdatamodel/contents

diff --git a/Persistence/Sources/Persistence/PersistentContainer.swift b/Persistence/Sources/Persistence/PersistentContainer.swift
index a0094a8..1e3f53a 100644
--- a/Persistence/Sources/Persistence/PersistentContainer.swift
+++ b/Persistence/Sources/Persistence/PersistentContainer.swift
@@ -23,6 +23,7 @@ public class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
         // if it's parented to the viewContext, it blocks the viewContext (and potentially the main thread) when it needs to look things up
         context.persistentStoreCoordinator = self.persistentStoreCoordinator
         context.automaticallyMergesChangesFromParent = true
+        context.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
         return context
     }()
     
@@ -65,6 +66,7 @@ public class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
         }
         
         viewContext.automaticallyMergesChangesFromParent = true
+        viewContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
     }
     
     @MainActor
diff --git a/Persistence/Sources/Persistence/Reader.xcdatamodeld/.xccurrentversion b/Persistence/Sources/Persistence/Reader.xcdatamodeld/.xccurrentversion
index df1af3e..a193a52 100644
--- a/Persistence/Sources/Persistence/Reader.xcdatamodeld/.xccurrentversion
+++ b/Persistence/Sources/Persistence/Reader.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Reader 2.xcdatamodel</string>
+	<string>Reader 3.xcdatamodel</string>
 </dict>
 </plist>
diff --git a/Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader 2.xcdatamodel/contents b/Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader 2.xcdatamodel/contents
index 85b33d3..cf611f1 100644
--- a/Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader 2.xcdatamodel/contents	
+++ b/Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader 2.xcdatamodel/contents	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21279" systemVersion="22A5331f" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21513" systemVersion="22C65" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Feed" representedClassName="Feed" syncable="YES">
         <attribute name="id" attributeType="String"/>
         <attribute name="lastUpdated" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
diff --git a/Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader 3.xcdatamodel/contents b/Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader 3.xcdatamodel/contents
new file mode 100644
index 0000000..e5ff54c
--- /dev/null
+++ b/Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader 3.xcdatamodel/contents	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21513" systemVersion="22C65" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Feed" representedClassName="Feed" syncable="YES">
+        <attribute name="id" attributeType="String"/>
+        <attribute name="lastUpdated" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="title" attributeType="String"/>
+        <attribute name="url" optional="YES" attributeType="URI"/>
+        <relationship name="groups" toMany="YES" deletionRule="Nullify" destinationEntity="Group" inverseName="feeds" inverseEntity="Group"/>
+        <relationship name="items" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Item" inverseName="feed" inverseEntity="Item"/>
+    </entity>
+    <entity name="Group" representedClassName="Group" syncable="YES">
+        <attribute name="id" attributeType="String"/>
+        <attribute name="title" attributeType="String"/>
+        <relationship name="feeds" toMany="YES" deletionRule="Nullify" destinationEntity="Feed" inverseName="groups" inverseEntity="Feed"/>
+    </entity>
+    <entity name="Item" representedClassName="Item" versionHashModifier="5" syncable="YES">
+        <attribute name="author" optional="YES" attributeType="String"/>
+        <attribute name="content" optional="YES" attributeType="String"/>
+        <attribute name="excerpt" optional="YES" attributeType="String"/>
+        <attribute name="generatedExcerpt" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="id" attributeType="String"/>
+        <attribute name="needsReadStateSync" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="published" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="read" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="title" optional="YES" attributeType="String"/>
+        <attribute name="url" optional="YES" attributeType="URI"/>
+        <relationship name="feed" maxCount="1" deletionRule="Nullify" destinationEntity="Feed" inverseName="items" inverseEntity="Feed"/>
+        <fetchIndex name="byID">
+            <fetchIndexElement property="id" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byRead">
+            <fetchIndexElement property="read" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="SyncState" representedClassName="SyncState" syncable="YES" codeGenerationType="class">
+        <attribute name="lastSync" attributeType="Date" usesScalarValueType="NO"/>
+    </entity>
+    <fetchRequest name="FetchRequest" entity="Item" predicateString="TRUEPREDICATE"/>
+</model>
\ No newline at end of file