netreconlab · cbaker6 · May 2, 2023 · Apr 9, 2023 · Apr 9, 2023 · Apr 9, 2023
diff --git a/OCKSample.xcodeproj/project.pbxproj b/OCKSample.xcodeproj/project.pbxproj
diff --git a/OCKSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/OCKSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,17 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/cbaker6/CareKit.git",
       "state" : {
-        "revision" : "954185b307222431e50f656d2870019e9ec97c28",
-        "version" : "2.1.8"
+        "revision" : "698176a292e3077f7a30496c42f9e8392328930e",
+        "version" : "3.0.0-alpha.22"
       }
     },
     {
       "identity" : "carekitutilities",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/netreconlab/CareKitUtilities.git",
       "state" : {
-        "revision" : "ca65485fd95f40ae1bc27f61ee062b2688ad2554",
-        "version" : "0.0.1"
+        "revision" : "7c7be19c8f652589fe97692df92cd7ffb634c41c",
+        "version" : "1.0.0-alpha.2"
       }
     },
     {
@@ -32,17 +32,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/netreconlab/Parse-Swift.git",
       "state" : {
-        "revision" : "8c7d8dce114571052d07516e8f4aef90891960aa",
-        "version" : "5.3.3"
+        "revision" : "a746db0bf4e9a2b3b33bc0a7f9dbcaf79feb0c8b",
+        "version" : "5.4.2"
       }
     },
     {
       "identity" : "parsecarekit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/netreconlab/ParseCareKit.git",
       "state" : {
-        "revision" : "57aaabd1dfe0d038ffc40e95239b2445ed832d74",
-        "version" : "0.13.1"
+        "revision" : "566f68ef230e4285eb9e19a3d1045947d5a74eef",
+        "version" : "1.0.0-alpha.80"
+      }
+    },
+    {
+      "identity" : "swift-async-algorithms",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-async-algorithms",
+      "state" : {
+        "revision" : "9cfed92b026c524674ed869a4ff2dcfdeedf8a2a",
+        "version" : "0.1.0"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections.git",
+      "state" : {
+        "revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2",
+        "version" : "1.0.4"
       }
     }
   ],

diff --git a/OCKSample.xcodeproj/xcshareddata/xcschemes/OCKSample.xcscheme b/OCKSample.xcodeproj/xcshareddata/xcschemes/OCKSample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/OCKSample.xcodeproj/xcshareddata/xcschemes/OCKWatchSample (Notification).xcscheme b/OCKSample.xcodeproj/xcshareddata/xcschemes/OCKWatchSample (Notification).xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "91AD922624A4C42B00925D4D"
+               BuildableName = "OCKWatchSample.app"
+               BlueprintName = "OCKWatchSample"
+               ReferencedContainer = "container:OCKSample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E72B2C05226939E3009A9438"
+               BuildableName = "OCKSample.app"
+               BlueprintName = "OCKSample"
+               ReferencedContainer = "container:OCKSample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "8"
+      notificationPayloadFile = "OCKWatchSample Extension/Notifications/PushNotificationPayload.apns">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "91AD922624A4C42B00925D4D"
+            BuildableName = "OCKWatchSample.app"
+            BlueprintName = "OCKWatchSample"
+            ReferencedContainer = "container:OCKSample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      launchAutomaticallySubstyle = "8"
+      notificationPayloadFile = "OCKWatchSample Extension/Notifications/PushNotificationPayload.apns">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "91AD922624A4C42B00925D4D"
+            BuildableName = "OCKWatchSample.app"
+            BlueprintName = "OCKWatchSample"
+            ReferencedContainer = "container:OCKSample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/OCKSample.xcodeproj/xcshareddata/xcschemes/OCKWatchSample.xcscheme b/OCKSample.xcodeproj/xcshareddata/xcschemes/OCKWatchSample.xcscheme
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "91AD922624A4C42B00925D4D"
+               BuildableName = "OCKWatchSample.app"
+               BlueprintName = "OCKWatchSample"
+               ReferencedContainer = "container:OCKSample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E72B2C05226939E3009A9438"
+               BuildableName = "OCKSample.app"
+               BlueprintName = "OCKSample"
+               ReferencedContainer = "container:OCKSample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      notificationPayloadFile = "OCKWatchSample Extension/Notifications/PushNotificationPayload.apns">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "91AD922624A4C42B00925D4D"
+            BuildableName = "OCKWatchSample.app"
+            BlueprintName = "OCKWatchSample"
+            ReferencedContainer = "container:OCKSample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "91AD922624A4C42B00925D4D"
+            BuildableName = "OCKWatchSample.app"
+            BlueprintName = "OCKWatchSample"
+            ReferencedContainer = "container:OCKSample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/OCKSample/AppDelegate.swift b/OCKSample/AppDelegate.swift
@@ -38,91 +38,91 @@ import WatchConnectivity
 
 class AppDelegate: UIResponder, ObservableObject {
     // MARK: Public read/write properties
-    @Published var isFirstTimeLogin = false {
-        willSet {
-            DispatchQueue.main.async {
-                self.objectWillChange.send()
-            }
-        }
-    }
+
+    @Published var isFirstTimeLogin = false
 
     // MARK: Public read private write properties
-    // swiftlint:disable:next line_length
-    @Published private(set) var storeManager: OCKSynchronizedStoreManager = .init(wrapping: OCKStore(name: Constants.noCareStoreName,
-                                                                                                     type: .inMemory)) {
+
+    @Published private(set) var storeCoordinator: OCKStoreCoordinator = .init() {
         willSet {
-            StoreManagerKey.defaultValue = newValue
-            DispatchQueue.main.async {
-                self.objectWillChange.send()
-            }
+            StoreCoordinatorKey.defaultValue = newValue
+            self.objectWillChange.send()
         }
     }
-    private(set) var parseRemote: ParseRemote!
-    private(set) var store: OCKStore?
+    @Published private(set) var store: OCKStore! = .init(name: Constants.noCareStoreName, type: .inMemory)
     private(set) var healthKitStore: OCKHealthKitPassthroughStore!
+    private(set) var parseRemote: ParseRemote!
 
     // MARK: Private read/write properties
+
     private var sessionDelegate: SessionDelegate!
     private lazy var watchRemote = OCKWatchConnectivityPeer()
 
     // MARK: Helpers
+
+    @MainActor
     func resetAppToInitialState() {
         do {
-            try healthKitStore.reset()
+            try storeCoordinator.reset()
         } catch {
-            Logger.appDelegate.error("Error deleting HealthKit Store: \(error)")
+            Logger.appDelegate.error("Could not delete Coordinator Store: \(error)")
         }
+
         do {
-            try store?.delete() // Delete data in local OCKStore database
+            try self.store?.delete()
         } catch {
-            Logger.appDelegate.error("Error deleting OCKStore: \(error)")
+            Logger.utility.error("Could not delete local OCKStore because of error: \(error)")
         }
-        storeManager = .init(wrapping: OCKStore(name: Constants.noCareStoreName, type: .inMemory))
+
+        storeCoordinator = .init()
         healthKitStore = nil
         parseRemote = nil
-        store = nil
+
+        let store = OCKStore(name: Constants.noCareStoreName,
+                             type: .inMemory)
         sessionDelegate.store = store
+        self.store = store
+        PCKUtility.removeCache()
     }
 
+    @MainActor
     func setupRemotes(uuid: UUID? = nil) async throws {
         do {
-            if isSyncingWithCloud {
+            if isSyncingWithRemote {
                 guard let uuid = uuid else {
-                    Logger.appDelegate.error("Error in setupRemotes, uuid is nil")
+                    Logger.appDelegate.error("Could not setupRemotes, uuid is nil")
                     return
                 }
                 parseRemote = try await ParseRemote(uuid: uuid,
                                                     auto: false,
-                                                    subscribeToServerUpdates: true,
-                                                    defaultACL: try? ParseACL.defaultACL())
-                store = OCKStore(name: Constants.iOSParseCareStoreName,
-                                 type: .onDisk(),
-                                 remote: parseRemote)
+                                                    subscribeToRemoteUpdates: true,
+                                                    defaultACL: PCKUtility.getDefaultACL())
+                let store = OCKStore(name: Constants.iOSParseCareStoreName,
+                                     type: .onDisk(),
+                                     remote: parseRemote)
                 parseRemote?.parseRemoteDelegate = self
                 sessionDelegate = RemoteSessionDelegate(store: store)
+                self.store = store
             } else {
-                store = OCKStore(name: Constants.iOSLocalCareStoreName,
-                                 type: .onDisk(),
-                                 remote: watchRemote)
+                let store = OCKStore(name: Constants.iOSLocalCareStoreName,
+                                     type: .onDisk(),
+                                     remote: watchRemote)
                 watchRemote.delegate = self
                 sessionDelegate = LocalSessionDelegate(remote: watchRemote, store: store)
+                self.store = store
             }
 
             // Setup communication with watch
             WCSession.default.delegate = sessionDelegate
             WCSession.default.activate()
 
-            guard let currentStore = store else {
-                Logger.appDelegate.error("Should have OCKStore")
-                return
-            }
-            healthKitStore = OCKHealthKitPassthroughStore(store: currentStore)
-            let coordinator = OCKStoreCoordinator()
-            coordinator.attach(store: currentStore)
-            coordinator.attach(eventStore: healthKitStore)
-            storeManager = OCKSynchronizedStoreManager(wrapping: coordinator)
+            healthKitStore = OCKHealthKitPassthroughStore(store: store)
+            let storeCoordinator = OCKStoreCoordinator()
+            storeCoordinator.attach(store: store)
+            storeCoordinator.attach(eventStore: healthKitStore)
+            self.storeCoordinator = storeCoordinator
         } catch {
-            Logger.appDelegate.error("Error setting up remote: \(error)")
+            Logger.appDelegate.error("Could not setup remote: \(error)")
             throw error
         }
     }