Add ParseLiveQuery and add missing OCK fields (#67)

cbaker6 · web-flow · commit f943a8f13fbb · 2020-11-12T17:06:18.000-05:00
* Add missing fields

* Add LiveQuery

* Update podspec

* Switch to canImport

* Use if not watchOS

* Add delegate for descriptions

* Update
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ xcuserdata/
 ## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 build/
 DerivedData/
+.DS_Store
 *.moved-aside
 *.pbxuser
 !default.pbxuser
diff --git a/ParseCareKit/PCKObjects/CarePlan.swift b/ParseCareKit/PCKObjects/CarePlan.swift
@@ -148,7 +148,7 @@ open class CarePlan: PCKVersionedObject, PCKRemoteSynchronized {
         completion(true,nil)
     }
     
-    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){
+    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {
         
         let query = CarePlan.query()!
         query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)
@@ -177,6 +177,7 @@ open class CarePlan: PCKVersionedObject, PCKRemoteSynchronized {
             let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)
             mergeRevision(revision)
         }
+        return query
     }
     
     public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){
diff --git a/ParseCareKit/PCKObjects/Contact.swift b/ParseCareKit/PCKObjects/Contact.swift
@@ -234,7 +234,7 @@ open class Contact: PCKVersionedObject, PCKRemoteSynchronized {
         completion(true,nil)
     }
     
-    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){
+    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {
         
         let query = Contact.query()!
         query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)
@@ -263,6 +263,7 @@ open class Contact: PCKVersionedObject, PCKRemoteSynchronized {
             let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)
             mergeRevision(revision)
         }
+        return query
     }
     
     public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){
diff --git a/ParseCareKit/PCKObjects/Outcome.swift b/ParseCareKit/PCKObjects/Outcome.swift
@@ -140,7 +140,7 @@ open class Outcome: PCKObject, PCKRemoteSynchronized {
         completion(true,nil)
     }
     
-    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){
+    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {
         
         let query = Outcome.query()!
         query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)
@@ -169,6 +169,7 @@ open class Outcome: PCKObject, PCKRemoteSynchronized {
             let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)
             mergeRevision(revision)
         }
+        return query
     }
     
     public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){
diff --git a/ParseCareKit/PCKObjects/OutcomeValue.swift b/ParseCareKit/PCKObjects/OutcomeValue.swift
@@ -140,15 +140,15 @@ open class OutcomeValue: PCKObject, PFSubclassing {
         self.value = outcomeValue.value
         self.units = outcomeValue.units
         
+        self.asset = outcomeValue.asset
         self.groupIdentifier = outcomeValue.groupIdentifier
         self.tags = outcomeValue.tags
         self.source = outcomeValue.source
         self.updatedDate = outcomeValue.updatedDate
         self.remoteID = outcomeValue.remoteID
         self.createdDate = outcomeValue.createdDate
         self.notes = outcomeValue.notes?.compactMap{Note(careKitEntity: $0)}
-        
-        
+
         return self
     }
     
diff --git a/ParseCareKit/PCKObjects/PCKObject.swift b/ParseCareKit/PCKObjects/PCKObject.swift
@@ -43,6 +43,11 @@ open class PCKObject: PFObject {
         self.createdDate = other.createdDate
         self.notes = other.notes
         self.logicalClock = other.logicalClock
+        self.asset = other.asset
+        self.tags = other.tags
+        self.schemaVersion = other.schemaVersion
+        self.groupIdentifier = other.groupIdentifier
+        self.source = other.source
     }
     
     open func copyRelationalEntities(_ parse: PCKObject){
diff --git a/ParseCareKit/PCKObjects/Patient.swift b/ParseCareKit/PCKObjects/Patient.swift
@@ -125,7 +125,7 @@ open class Patient: PCKVersionedObject, PCKRemoteSynchronized {
         completion(true,nil)
     }
     
-    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){
+    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {
         
         let query = Patient.query()!
         query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)
@@ -154,6 +154,7 @@ open class Patient: PCKVersionedObject, PCKRemoteSynchronized {
             let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)
             mergeRevision(revision)
         }
+        return query
     }
     
     public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){
diff --git a/ParseCareKit/PCKObjects/Task.swift b/ParseCareKit/PCKObjects/Task.swift
@@ -152,7 +152,7 @@ open class Task: PCKVersionedObject, PCKRemoteSynchronized {
         completion(true,nil)
     }
     
-    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){
+    public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {
         
         let query = Task.query()!
         query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)
@@ -181,6 +181,7 @@ open class Task: PCKVersionedObject, PCKRemoteSynchronized {
             let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)
             mergeRevision(revision)
         }
+        return query
     }
     
     public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){
diff --git a/ParseCareKit/ParseRemoteSynchronizationManager.swift b/ParseCareKit/ParseRemoteSynchronizationManager.swift
@@ -21,6 +21,7 @@ public protocol ParseRemoteSynchronizationDelegate: OCKRemoteSynchronizationDele
     func storeUpdatedPatient(_ patient: OCKPatient)
     func storeUpdatedTask(_ task: OCKTask)
     func successfullyPushedDataToCloud()
+    func subscribe(_ query: PFQuery<PFObject>)
 }
 
 open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable {
@@ -107,7 +108,7 @@ open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable
         }
         
         var currentError = previousError
-        newConcreteClass.pullRevisions(localClock, cloudClock: cloudClock){
+        let query = newConcreteClass.pullRevisions(localClock, cloudClock: cloudClock){
             customRevision in
             mergeRevision(customRevision){
                 error in
@@ -120,6 +121,7 @@ open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable
                 
             }
         }
+        self.parseDelegate?.subscribe(query)
     }
     
     func pullRevisionsForCustomClasses(customClassesAlreadyPulled:Int=0, previousError: Error?, localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord, @escaping (Error?) -> Void) -> Void, completion: @escaping (Error?) -> Void){
@@ -134,7 +136,7 @@ open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable
                     return
             }
             var currentError = previousError
-            newCustomClass.pullRevisions(localClock, cloudClock: cloudClock){
+            let query = newCustomClass.pullRevisions(localClock, cloudClock: cloudClock){
                 customRevision in
                 mergeRevision(customRevision){
                     error in
@@ -146,6 +148,7 @@ open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable
                     self.pullRevisionsForCustomClasses(customClassesAlreadyPulled: customClassesAlreadyPulled+1, previousError: currentError, localClock: localClock, cloudClock: cloudClock, mergeRevision: mergeRevision, completion: completion)
                 }
             }
+            self.parseDelegate?.subscribe(query)
         }else{
             completion(previousError)
         }
diff --git a/ParseCareKit/Protocols/PCKSynchronized.swift b/ParseCareKit/Protocols/PCKSynchronized.swift
@@ -25,6 +25,6 @@ public protocol PCKSynchronized: PFObject, PFSubclassing {
  Protocol that defines the properties and methods for parse carekit entities that are synchronized using a knowledge vector.
  */
 public protocol PCKRemoteSynchronized: PCKSynchronized {
-    func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void)
+    func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject>
     func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void)
 }
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ open class CarePlan: PCKVersionedObject, PCKRemoteSynchronized {`
`148`	`148`	`completion(true,nil)`
`149`	`149`	`}`
`150`	`150`
`151`		`- public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){`
	`151`	`+ public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {`
`152`	`152`
`153`	`153`	`let query = CarePlan.query()!`
`154`	`154`	`query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)`
`@@ -177,6 +177,7 @@ open class CarePlan: PCKVersionedObject, PCKRemoteSynchronized {`
`177`	`177`	`let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)`
`178`	`178`	`mergeRevision(revision)`
`179`	`179`	`}`
	`180`	`+ return query`
`180`	`181`	`}`
`181`	`182`
`182`	`183`	`public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ open class Contact: PCKVersionedObject, PCKRemoteSynchronized {`
`234`	`234`	`completion(true,nil)`
`235`	`235`	`}`
`236`	`236`
`237`		`- public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){`
	`237`	`+ public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {`
`238`	`238`
`239`	`239`	`let query = Contact.query()!`
`240`	`240`	`query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)`
`@@ -263,6 +263,7 @@ open class Contact: PCKVersionedObject, PCKRemoteSynchronized {`
`263`	`263`	`let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)`
`264`	`264`	`mergeRevision(revision)`
`265`	`265`	`}`
	`266`	`+ return query`
`266`	`267`	`}`
`267`	`268`
`268`	`269`	`public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ open class Outcome: PCKObject, PCKRemoteSynchronized {`
`140`	`140`	`completion(true,nil)`
`141`	`141`	`}`
`142`	`142`
`143`		`- public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){`
	`143`	`+ public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {`
`144`	`144`
`145`	`145`	`let query = Outcome.query()!`
`146`	`146`	`query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)`
`@@ -169,6 +169,7 @@ open class Outcome: PCKObject, PCKRemoteSynchronized {`
`169`	`169`	`let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)`
`170`	`170`	`mergeRevision(revision)`
`171`	`171`	`}`
	`172`	`+ return query`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ open class Patient: PCKVersionedObject, PCKRemoteSynchronized {`
`125`	`125`	`completion(true,nil)`
`126`	`126`	`}`
`127`	`127`
`128`		`- public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){`
	`128`	`+ public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {`
`129`	`129`
`130`	`130`	`let query = Patient.query()!`
`131`	`131`	`query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)`
`@@ -154,6 +154,7 @@ open class Patient: PCKVersionedObject, PCKRemoteSynchronized {`
`154`	`154`	`let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)`
`155`	`155`	`mergeRevision(revision)`
`156`	`156`	`}`
	`157`	`+ return query`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ open class Task: PCKVersionedObject, PCKRemoteSynchronized {`
`152`	`152`	`completion(true,nil)`
`153`	`153`	`}`
`154`	`154`
`155`		`- public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void){`
	`155`	`+ public func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject> {`
`156`	`156`
`157`	`157`	`let query = Task.query()!`
`158`	`158`	`query.whereKey(kPCKObjectClockKey, greaterThanOrEqualTo: localClock)`
`@@ -181,6 +181,7 @@ open class Task: PCKVersionedObject, PCKRemoteSynchronized {`
`181`	`181`	`let revision = OCKRevisionRecord(entities: entities, knowledgeVector: cloudClock)`
`182`	`182`	`mergeRevision(revision)`
`183`	`183`	`}`
	`184`	`+ return query`
`184`	`185`	`}`
`185`	`186`
`186`	`187`	`public func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void){`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public protocol ParseRemoteSynchronizationDelegate: OCKRemoteSynchronizationDele`
`21`	`21`	`func storeUpdatedPatient(_ patient: OCKPatient)`
`22`	`22`	`func storeUpdatedTask(_ task: OCKTask)`
`23`	`23`	`func successfullyPushedDataToCloud()`
	`24`	`+ func subscribe(_ query: PFQuery<PFObject>)`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable {`
`@@ -107,7 +108,7 @@ open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`var currentError = previousError`
`110`		`- newConcreteClass.pullRevisions(localClock, cloudClock: cloudClock){`
	`111`	`+ let query = newConcreteClass.pullRevisions(localClock, cloudClock: cloudClock){`
`111`	`112`	`customRevision in`
`112`	`113`	`mergeRevision(customRevision){`
`113`	`114`	`error in`
`@@ -120,6 +121,7 @@ open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable`
`120`	`121`
`121`	`122`	`}`
`122`	`123`	`}`
	`124`	`+ self.parseDelegate?.subscribe(query)`
`123`	`125`	`}`
`124`	`126`
`125`	`127`	`func pullRevisionsForCustomClasses(customClassesAlreadyPulled:Int=0, previousError: Error?, localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord, @escaping (Error?) -> Void) -> Void, completion: @escaping (Error?) -> Void){`
`@@ -134,7 +136,7 @@ open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable`
`134`	`136`	`return`
`135`	`137`	`}`
`136`	`138`	`var currentError = previousError`
`137`		`- newCustomClass.pullRevisions(localClock, cloudClock: cloudClock){`
	`139`	`+ let query = newCustomClass.pullRevisions(localClock, cloudClock: cloudClock){`
`138`	`140`	`customRevision in`
`139`	`141`	`mergeRevision(customRevision){`
`140`	`142`	`error in`
`@@ -146,6 +148,7 @@ open class ParseRemoteSynchronizationManager: NSObject, OCKRemoteSynchronizable`
`146`	`148`	`self.pullRevisionsForCustomClasses(customClassesAlreadyPulled: customClassesAlreadyPulled+1, previousError: currentError, localClock: localClock, cloudClock: cloudClock, mergeRevision: mergeRevision, completion: completion)`
`147`	`149`	`}`
`148`	`150`	`}`
	`151`	`+ self.parseDelegate?.subscribe(query)`
`149`	`152`	`}else{`
`150`	`153`	`completion(previousError)`
`151`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ public protocol PCKSynchronized: PFObject, PFSubclassing {`
`25`	`25`	`Protocol that defines the properties and methods for parse carekit entities that are synchronized using a knowledge vector.`
`26`	`26`	`*/`
`27`	`27`	`public protocol PCKRemoteSynchronized: PCKSynchronized {`
`28`		`- func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void)`
	`28`	`+ func pullRevisions(_ localClock: Int, cloudClock: OCKRevisionRecord.KnowledgeVector, mergeRevision: @escaping (OCKRevisionRecord) -> Void) -> PFQuery<PFObject>`
`29`	`29`	`func pushRevision(_ overwriteRemote: Bool, cloudClock: Int, completion: @escaping (Error?) -> Void)`
`30`	`30`	`}`