fixes

FreeAPS/Sources/APS/APSManager.swift

@@ -645,14 +645,13 @@ final class BaseAPSManager: APSManager, Injectable {
     }
 
     private func fetchDetermination() -> OrefDetermination? {
-        do {
-            let results = try viewContext.fetch(OrefDetermination.fetch(NSPredicate.predicateFor30MinAgoForDetermination))
-            debugPrint("APSManager: \(CoreDataStack.identifier) \(DebuggingIdentifiers.succeeded) saved determination")
-            return results.first
-        } catch {
-            debugPrint("APSManager: \(CoreDataStack.identifier) \(DebuggingIdentifiers.failed) failed to fetch determination")
-            return nil
-        }
+        CoreDataStack.shared.fetchEntities(
+            ofType: OrefDetermination.self,
+            predicate: NSPredicate.predicateFor30MinAgoForDetermination,
+            key: "deliverAt",
+            ascending: false,
+            fetchLimit: 1
+        ).first
     }
 
     private func enactDetermination() -> AnyPublisher<Void, Error> {
@@ -716,34 +715,46 @@ final class BaseAPSManager: APSManager, Injectable {
     }
 
     private func reportEnacted(received: Bool) {
-        if let determination = fetchDetermination(), determination.deliverAt != nil {
-            privateContext.perform {
-                determination.timestamp = Date()
-                determination.received = received
+        guard let determination = fetchDetermination(), determination.deliverAt != nil else {
+            return
+        }
 
-                do {
-                    try CoreDataStack.shared.backgroundContext.saveContext()
-                } catch {
-                    print(error.localizedDescription)
-                }
+        let objectID = determination.objectID
 
-                let saveLastLoop = LastLoop(context: self.privateContext)
-                saveLastLoop.iob = (determination.iob ?? 0) as NSDecimalNumber
-                saveLastLoop.cob = determination.cob as? NSDecimalNumber
-                saveLastLoop.timestamp = (determination.timestamp ?? .distantPast) as Date
+        privateContext.performAndWait {
+            if let determinationUpdated = self.privateContext.object(with: objectID) as? OrefDetermination {
+                determinationUpdated.timestamp = Date()
+                determinationUpdated.received = received
 
                 do {
                     try CoreDataStack.shared.backgroundContext.saveContext()
+                    debugPrint("Update successful in reportEnacted() \(DebuggingIdentifiers.succeeded)")
                 } catch {
-                    print(error.localizedDescription)
+                    debugPrint(
+                        "Failed  \(DebuggingIdentifiers.succeeded) to save context in reportEnacted(): \(error.localizedDescription)"
+                    )
                 }
+            } else {
+                debugPrint("Failed to update OrefDetermination in reportEnacted()")
+            }
+
+            // TODO: - replace this...
+            let saveLastLoop = LastLoop(context: self.privateContext)
+            saveLastLoop.iob = (determination.iob ?? 0) as NSDecimalNumber
+            saveLastLoop.cob = determination.cob as? NSDecimalNumber
+            saveLastLoop.timestamp = (determination.timestamp ?? .distantPast) as Date
 
-                debug(.apsManager, "Determination enacted. Received: \(received)")
+            do {
+                try CoreDataStack.shared.backgroundContext.saveContext()
+            } catch {
+                print(error.localizedDescription)
             }
 
-            nightscout.uploadStatus()
-            statistics()
+            debug(.apsManager, "Determination enacted. Received: \(received)")
         }
+
+        nightscout.uploadStatus()
+        statistics()
     }
 
     private func roundDecimal(_ decimal: Decimal, _ digits: Double) -> Decimal {

FreeAPS/Sources/Services/WatchManager/WatchManager.swift

@@ -55,14 +55,15 @@ final class BaseWatchManager: NSObject, WatchManager, Injectable {
 
     private func fetchLastDeterminationDate() -> Date? {
         let predicate = NSPredicate.enactedDetermination
-        return CoreDataStack.shared.fetchEntities(
+        let results = CoreDataStack.shared.fetchEntities(
             ofType: OrefDetermination.self,
             predicate: predicate,
             key: "deliverAt",
             ascending: false,
             fetchLimit: 1,
             propertiesToFetch: ["deliverAt"]
-        ).first?.deliverAt
+        )
+        return results.first?.deliverAt
     }
 
     func fetchAndProcessGlucose() -> (ids: [NSManagedObjectID], glucose: String, trend: String, delta: String, date: Date) {

Model/CoreDataStack.swift

@@ -56,7 +56,7 @@ class CoreDataStack: ObservableObject {
         }
         if let propertiesTofetch = propertiesToFetch {
             request.propertiesToFetch = propertiesTofetch
-            request.resultType = .dictionaryResultType
+            request.resultType = .managedObjectResultType
         } else {
             request.resultType = .managedObjectResultType
         }