Synchronization improvements (#553)

Author: erik-apple

CareKit/CareKit/Shared/Extensions/OCKAnyEvent+Extension.swift

@@ -40,10 +40,7 @@ extension OCKAnyEvent {
             !newOutcome.values.isEmpty else { return self }
 
         let sortedValues = newOutcome.values.sorted {
-            guard
-                let date1 = $0.updatedDate ?? $0.createdDate,
-                let date2 = $1.updatedDate ?? $0.createdDate else { return false }
-            return date1 > date2
+            $0.createdDate > $1.createdDate
         }
 
         newOutcome.values = sortedValues

CareKit/CareKit/Shared/Task/Controller/OCKTaskController.swift

@@ -363,10 +363,10 @@ open class OCKTaskController: ObservableObject {
     ///   - event: The event for which to create the outcome.
     ///   - values: The outcome values to attach to the outcome.
     open func makeOutcomeFor(event: OCKAnyEvent, withValues values: [OCKOutcomeValue]) throws -> OCKAnyOutcome {
-        guard
-            let task = event.task as? OCKAnyVersionableTask,
-            let taskID = task.uuid else { throw OCKTaskControllerError.cannotMakeOutcomeFor(event) }
-        return OCKOutcome(taskUUID: taskID, taskOccurrenceIndex: event.scheduleEvent.occurrence, values: values)
+        guard let task = event.task as? OCKAnyVersionableTask else {
+            throw OCKTaskControllerError.cannotMakeOutcomeFor(event)
+        }
+        return OCKOutcome(taskUUID: task.uuid, taskOccurrenceIndex: event.scheduleEvent.occurrence, values: values)
     }
 
     /// Return an event for a particular index path. Customize this method to define the index path behavior used by other functions in this class.
@@ -452,7 +452,7 @@ open class OCKTaskController: ObservableObject {
 
 private extension OCKSynchronizedStoreManager {
 
-    func fetchAnyTasksPublisher(query: OCKAnyTaskQuery) -> AnyPublisher<[OCKAnyTask], OCKStoreError> {
+    func fetchAnyTasksPublisher(query: OCKTaskQuery) -> AnyPublisher<[OCKAnyTask], OCKStoreError> {
         Future { [unowned self] completion in
             self.store.fetchAnyTasks(query: query, callbackQueue: .main, completion: completion)
         }

CareKit/CareKit/iOS/Contact/Controllers/OCKContactController.swift

@@ -83,7 +83,7 @@ open class OCKContactController: ObservableObject {
     ///   - query: Any contact query describing the contact to be fetched.
     ///
     /// - Note: If the query matches multiple contacts, the first one returned will be used.
-    open func fetchAndObserveContact(forQuery query: OCKAnyContactQuery) {
+    open func fetchAndObserveContact(forQuery query: OCKContactQuery) {
 
         // Fetch the contact to set as the view model value
         storeManager.store.fetchAnyContacts(query: query, callbackQueue: .main) { [weak self] result in

CareKit/CareKit/iOS/View Updaters/Task/OCKLogTaskView+Updatable.swift

@@ -47,7 +47,7 @@ private extension OCKLogTaskView {
             clearItems(animated: animated)
         } else {
             for (index, outcomeValue) in outcomeValues.enumerated() {
-                guard let date = outcomeValue.updatedDate ?? outcomeValue.createdDate else { continue }
+                let date = outcomeValue.createdDate
                 let dateString = OCKLogTaskView.timeFormatter.string(from: date).description
 
                 _ = index < items.count ?

CareKit/CareKitTests/Task/TestLabeledValueTaskViewModel.swift

@@ -121,7 +121,7 @@ private extension OCKTaskEvents {
         let outcome = underlyingValue.map { underlyingValue -> OCKOutcome in
             var outcomeValue = OCKOutcomeValue(underlyingValue)
             outcomeValue.units = units
-            return OCKOutcome(taskUUID: task.uuid!, taskOccurrenceIndex: 0, values: [outcomeValue])
+            return OCKOutcome(taskUUID: task.uuid, taskOccurrenceIndex: 0, values: [outcomeValue])
         }
 
         let scheduleEvent = task.schedule.event(forOccurrenceIndex: 0)!

CareKit/CareKitTests/Task/TestMockTaskEvents.swift

@@ -62,7 +62,7 @@ extension OCKTaskEvents {
             if eventsHaveOutcomes {
                 var outcomeValue = OCKOutcomeValue(true)
                 outcomeValue.createdDate = Date()
-                outcome = OCKOutcome(taskUUID: task.uuid!, taskOccurrenceIndex: $0, values: [outcomeValue])
+                outcome = OCKOutcome(taskUUID: task.uuid, taskOccurrenceIndex: $0, values: [outcomeValue])
             }
             let event = OCKAnyEvent(task: task, outcome: outcome, scheduleEvent: $1.event(forOccurrenceIndex: $0)!)
             taskEvents.append(event: event)

CareKit/CareKitTests/Task/TestNumericProgressTaskViewModel.swift

@@ -174,7 +174,7 @@ private extension OCKTaskEvents {
         task.instructions = "instructions"
 
         let scheduleEvent = task.schedule.event(forOccurrenceIndex: 0)!
-        let outcome = OCKOutcome(taskUUID: task.uuid!, taskOccurrenceIndex: 0, values: [.init(outcomeValue)])
+        let outcome = OCKOutcome(taskUUID: task.uuid, taskOccurrenceIndex: 0, values: [.init(outcomeValue)])
         let event = OCKAnyEvent(task: task, outcome: outcome, scheduleEvent: scheduleEvent)
         var taskEvents = OCKTaskEvents()
         taskEvents.append(event: event)

CareKit/CareKitTests/Task/TestTaskController.swift

@@ -43,7 +43,7 @@ class TestTaskController: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        store = OCKStore(name: "ockstore", type: .inMemory)
+        store = OCKStore(name: UUID().uuidString, type: .inMemory)
         manager = OCKSynchronizedStoreManager(wrapping: store)
         cancellables = []
     }
@@ -537,7 +537,7 @@ private extension OCKAnyEvent {
         task.uuid = taskUUID
 
         let outcome = hasOutcome ?
-            OCKOutcome(taskUUID: task.uuid!, taskOccurrenceIndex: occurrence, values: []) :
+            OCKOutcome(taskUUID: task.uuid, taskOccurrenceIndex: occurrence, values: []) :
             nil
 
         let event = OCKAnyEvent(task: task, outcome: outcome, scheduleEvent: schedule.event(forOccurrenceIndex: occurrence)!)
@@ -548,7 +548,7 @@ private extension OCKAnyEvent {
 private extension OCKEvent where Task == OCKTask, Outcome == OCKOutcome {
     func updatedWithOutcome() -> Self {
         var newEvent = self
-        newEvent.outcome = OCKOutcome(taskUUID: newEvent.task.uuid!, taskOccurrenceIndex: newEvent.scheduleEvent.occurrence, values: [])
+        newEvent.outcome = OCKOutcome(taskUUID: newEvent.task.uuid, taskOccurrenceIndex: newEvent.scheduleEvent.occurrence, values: [])
         return newEvent
     }
 }

CareKit/CareKitTests/Task/TestTaskEvents.swift

@@ -170,22 +170,6 @@ class TestTaskEvents: XCTestCase {
         }
     }
 
-    func testAppendForEventWithNoTaskIdentity() {
-        let events: [OCKAnyEvent] = [OCKAnyEvent.mock(taskUUID: nil, occurrence: 0)]
-        var taskEvents = OCKTaskEvents()
-        let results = events.map { taskEvents.append(event: $0) }
-
-        // Test the underlying data
-        XCTAssertTrue(taskEvents.isEmpty)
-
-        // Test the data returned from the function call
-        XCTAssertEqual(results.count, 1)
-        if let result = results.first {
-            XCTAssertNil(result.0?.id)
-            XCTAssertFalse(result.1)
-        }
-    }
-
     func testRemoveSucceeds() {
         let doxylamineUUID = UUID()
         let nauseauUUID = UUID()
@@ -251,15 +235,6 @@ class TestTaskEvents: XCTestCase {
         XCTAssertNotNil(updatedEvent?.outcome)
     }
 
-    func testUpdateFailsForEventWithNoTaskIdentity() {
-        let doxylamineUUID = UUID()
-        let event = OCKAnyEvent.mock(taskUUID: doxylamineUUID, occurrence: 0)
-        let newEvent = OCKAnyEvent.mock(taskUUID: nil, occurrence: 0)
-        var taskEvents = OCKTaskEvents(events: [event])
-        let updatedEvent = taskEvents.update(event: newEvent)
-        XCTAssertNil(updatedEvent)
-    }
-
     func testEventsForTaskReturnsEvents() {
         let doxylamineUUID = UUID()
         let nauseauUUID = UUID()
@@ -334,14 +309,14 @@ class TestTaskEvents: XCTestCase {
 
 private extension OCKAnyEvent {
 
-    static func mock(taskUUID: UUID?, occurrence: Int, hasOutcome: Bool = false) -> Self {
+    static func mock(taskUUID: UUID, occurrence: Int, hasOutcome: Bool = false) -> Self {
         let startOfDay = Calendar.current.startOfDay(for: Date())
         let schedule = OCKSchedule.dailyAtTime(hour: 1, minutes: 0, start: startOfDay, end: nil, text: nil)
-        var task = OCKTask(id: taskUUID?.uuidString ?? "", title: nil, carePlanUUID: nil, schedule: schedule)
+        var task = OCKTask(id: taskUUID.uuidString, title: nil, carePlanUUID: nil, schedule: schedule)
         task.uuid = taskUUID
 
         let outcome = hasOutcome ?
-            OCKOutcome(taskUUID: task.uuid!, taskOccurrenceIndex: occurrence, values: []) :
+            OCKOutcome(taskUUID: task.uuid, taskOccurrenceIndex: occurrence, values: []) :
             nil
 
         let event = OCKAnyEvent(task: task, outcome: outcome, scheduleEvent: schedule.event(forOccurrenceIndex: occurrence)!)