From a7a048c3aa3c6f45a65f98c2eec4b9daaf318776 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Mon, 18 Apr 2022 21:20:28 -0700
Subject: [PATCH] update highlight coredata model

---
 .../CoreDataModel.xcdatamodel/contents                    | 8 +++++---
 .../Sources/Models/DataModels/HighlightDep.swift          | 2 +-
 .../PersistableModels/CachedPDFHighlights.swift           | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
index c15b134f4..b3cb44951 100644
--- a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
+++ b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
@@ -2,10 +2,10 @@
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21A559" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Highlight" representedClassName="Highlight" syncable="YES" codeGenerationType="class">
         <attribute name="annotation" optional="YES" attributeType="String"/>
-        <attribute name="associatedItemId" attributeType="String"/>
         <attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="createdByMe" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="id" attributeType="String"/>
+        <attribute name="linkedItemId" attributeType="String"/>
         <attribute name="markedForDeletion" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="patch" attributeType="String"/>
         <attribute name="prefix" optional="YES" attributeType="String"/>
@@ -24,6 +24,7 @@
         <attribute name="contentReader" optional="YES" attributeType="String"/>
         <attribute name="createdAt" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="descriptionText" optional="YES" attributeType="String"/>
+        <attribute name="htmlContent" optional="YES" attributeType="String"/>
         <attribute name="id" attributeType="String"/>
         <attribute name="imageURLString" optional="YES" attributeType="String"/>
         <attribute name="isArchived" attributeType="Boolean" usesScalarValueType="YES"/>
@@ -36,6 +37,7 @@
         <attribute name="savedAt" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="slug" attributeType="String"/>
         <attribute name="title" attributeType="String"/>
+        <relationship name="highlights" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Highlight"/>
         <relationship name="labels" toMany="YES" deletionRule="Nullify" destinationEntity="LinkedItemLabel"/>
         <uniquenessConstraints>
             <uniquenessConstraint>
@@ -86,11 +88,11 @@
         </uniquenessConstraints>
     </entity>
     <elements>
+        <element name="Highlight" positionX="27" positionY="225" width="128" height="209"/>
+        <element name="LinkedItem" positionX="-18" positionY="63" width="128" height="314"/>
         <element name="LinkedItemLabel" positionX="-36" positionY="18" width="128" height="104"/>
         <element name="NewsletterEmail" positionX="0" positionY="180" width="128" height="74"/>
         <element name="PersistedArticleContent" positionX="9" positionY="108" width="128" height="59"/>
-        <element name="LinkedItem" positionX="-18" positionY="63" width="128" height="284"/>
-        <element name="Highlight" positionX="27" positionY="225" width="128" height="209"/>
         <element name="Viewer" positionX="45" positionY="234" width="128" height="89"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/apple/OmnivoreKit/Sources/Models/DataModels/HighlightDep.swift b/apple/OmnivoreKit/Sources/Models/DataModels/HighlightDep.swift
index affd5863b..67e73bfda 100644
--- a/apple/OmnivoreKit/Sources/Models/DataModels/HighlightDep.swift
+++ b/apple/OmnivoreKit/Sources/Models/DataModels/HighlightDep.swift
@@ -39,7 +39,7 @@ public struct HighlightDep: Identifiable, Hashable, Codable {
 
   public func toManagedObject(context: NSManagedObjectContext, associatedItemID: String) -> Highlight {
     let highlight = Highlight(context: context)
-    highlight.associatedItemId = associatedItemID
+    highlight.linkedItemId = associatedItemID
     highlight.markedForDeletion = false
     highlight.id = id
     highlight.shortId = shortId
diff --git a/apple/OmnivoreKit/Sources/Services/Persistence/PersistableModels/CachedPDFHighlights.swift b/apple/OmnivoreKit/Sources/Services/Persistence/PersistableModels/CachedPDFHighlights.swift
index f4b7ae9da..b036a6b8c 100644
--- a/apple/OmnivoreKit/Sources/Services/Persistence/PersistableModels/CachedPDFHighlights.swift
+++ b/apple/OmnivoreKit/Sources/Services/Persistence/PersistableModels/CachedPDFHighlights.swift
@@ -7,7 +7,7 @@ public extension DataService {
   func cachedHighlights(pdfID: String) -> [HighlightDep] {
     let fetchRequest: NSFetchRequest<Models.Highlight> = Highlight.fetchRequest()
     fetchRequest.predicate = NSPredicate(
-      format: "associatedItemId = %@ AND markedForDeletion = %@", pdfID, false
+      format: "linkedItemId = %@ AND markedForDeletion = %@", pdfID, false
     )
 
     let highlights = (try? persistentContainer.viewContext.fetch(fetchRequest)) ?? []