wip

FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -92,6 +92,55 @@ final class OpenAPS {
         }
     }
 
+    // fetch glucose to pass it to the meal function and to determine basal
+
+    private func fetchGlucose() -> [GlucoseStored]? {
+        do {
+            return try context.fetch(GlucoseStored.fetch(ascending: false, fetchLimit: 5))
+        } catch {
+            print("failed")
+            return []
+        }
+    }
+
+//    private func fetchGlucose() -> GlucoseStored? {
+//        do {
+//            return try context.fetch(GlucoseStored.fetch(ascending: false, fetchLimit: 1)).first
+//        } catch {
+//            print("failed")
+//            return nil
+//        }
+//    }
+
+//    private func fetchGlucose() -> GlucoseStored? {
+//        do {
+//            debugPrint("OpenAPS: \(#function) \(DebuggingIdentifiers.succeeded) fetched glucose")
+//
+    ////            let fr = NSFetchRequest<GlucoseStored>(entityName: "GlucoseStored")
+//            let fr = GlucoseStored.fetchRequest()
+//            fr.resultType = .dictionaryResultType
+//            fr.fetchLimit = 1
+//            fr.predicate = NSPredicate.predicateFor30MinAgo
+//            fr.sortDescriptors = [NSSortDescriptor(keyPath: \GlucoseStored.date, ascending: false)]
+//            let last = try context.fetch(fr)
+//
+//            return last.first
+//        } catch {
+//            debugPrint("OpenAPS: \(#function) \(DebuggingIdentifiers.failed) failed to fetch glucose with error: \(error)")
+//            return nil
+//        }
+//    }
+
+    func convertDataToJSON(data: Data) -> Any? {
+        do {
+            let jsonObject = try JSONSerialization.jsonObject(with: data, options: [])
+            return jsonObject
+        } catch {
+            print("ich bin ein hurensohn")
+            return nil
+        }
+    }
+
     func determineBasal(currentTemp: TempBasal, clock: Date = Date()) -> Future<Determination?, Never> {
         Future { promise in
             self.processQueue.async {
@@ -106,85 +155,129 @@ final class OpenAPS {
                 // meal
                 let pumpHistory = self.loadFileFromStorage(name: OpenAPS.Monitor.pumpHistory)
                 let carbs = self.loadFileFromStorage(name: Monitor.carbHistory)
-                let glucose = self.loadFileFromStorage(name: Monitor.glucose)
-                let profile = self.loadFileFromStorage(name: Settings.profile)
-                let basalProfile = self.loadFileFromStorage(name: Settings.basalProfile)
-
-                let meal = self.meal(
-                    pumphistory: pumpHistory,
-                    profile: profile,
-                    basalProfile: basalProfile,
-                    clock: clock,
-                    carbs: carbs,
-                    glucose: glucose
-                )
-
-                self.storage.save(meal, as: Monitor.meal)
-
-                // iob
-                let autosens = self.loadFileFromStorage(name: Settings.autosense)
-                let iob = self.iob(
-                    pumphistory: pumpHistory,
-                    profile: profile,
-                    clock: clock,
-                    autosens: autosens.isEmpty ? .null : autosens
-                )
-
-                self.storage.save(iob, as: Monitor.iob)
-
-                // determine-basal
-                let reservoir = self.loadFileFromStorage(name: Monitor.reservoir)
-
-                let preferences = self.loadFileFromStorage(name: Settings.preferences)
-
-                // oref2
-                let oref2_variables = self.oref2()
-
-                let orefDetermination = self.determineBasal(
-                    glucose: glucose,
-                    currentTemp: tempBasal,
-                    iob: iob,
-                    profile: profile,
-                    autosens: autosens.isEmpty ? .null : autosens,
-                    meal: meal,
-                    microBolusAllowed: true,
-                    reservoir: reservoir,
-                    pumpHistory: pumpHistory,
-                    preferences: preferences,
-                    basalProfile: basalProfile,
-                    oref2_variables: oref2_variables
-                )
-                debug(.openAPS, "SUGGESTED: \(orefDetermination)")
-
-                if var determination = Determination(from: orefDetermination) {
-                    determination.timestamp = determination.deliverAt ?? clock
-                    self.storage.save(determination, as: Enact.suggested)
-
-                    // save to core data asynchronously
-                    self.processDetermination(determination)
-
-                    if determination.tdd ?? 0 > 0 {
-                        self.context.perform {
-                            let saveToTDD = TDD(context: self.context)
-
-                            saveToTDD.timestamp = determination.timestamp ?? Date()
-                            saveToTDD.tdd = (determination.tdd ?? 0) as NSDecimalNumber?
-                            if self.context.hasChanges {
-                                try? self.context.save()
-                            }
-
-                            let saveTarget = Target(context: self.context)
-                            saveTarget.current = (determination.current_target ?? 100) as NSDecimalNumber?
-                            if self.context.hasChanges {
-                                try? self.context.save()
+//                let glucose = self.loadFileFromStorage(name: Monitor.glucose)
+
+                /// get glucose from CD
+                do {
+                    let glucose = self.fetchGlucose()
+                    let encoder = JSONEncoder()
+                    encoder.keyEncodingStrategy = .useDefaultKeys
+                    let glucoseJSON = try encoder.encode(glucose) /// returns data
+                    ///
+
+//                    let json = try JSONSerialization.jsonObject(with: glucoseJSON, options: [])
+                    let string = String(data: glucoseJSON, encoding: .utf8)
+                    print("**************\(string)")
+//                    let glucoseJSON = try glucose.map { try JSONSerialization.data(withJSONObject: $0) }
+//                    let test = String(data: glucoseJSON!, encoding: .utf8)
+
+//                    let glucoseArray = glucose?.compactMap { try $0.encodeToJson() }
+
+//                    if let jsonObject = convertDataToJSON(data: glucoseArray) as? [String: Any] {}
+
+//                    let jsonData = try GlucoseStored.encodeToJson(glucose ?? GlucoseStored())
+//                    let jsonData = try glucose?.encodeToJson()
+
+//                    if let json = convertDataToJSON(data: jsonData) as? [String: Any] {
+//                        print
+//                    }
+//                    let jsonString = String(data: jsonData!, encoding: .utf8)
+//                    print(jsonString ?? "Invalid JSON")
+
+                    let profile = self.loadFileFromStorage(name: Settings.profile)
+                    let basalProfile = self.loadFileFromStorage(name: Settings.basalProfile)
+
+                    let meal = self.meal(
+                        pumphistory: pumpHistory,
+                        profile: profile,
+                        basalProfile: basalProfile,
+                        clock: clock,
+                        carbs: carbs,
+                        glucose: string ?? ""
+                    )
+
+                    self.storage.save(meal, as: Monitor.meal)
+
+                    // iob
+                    let autosens = self.loadFileFromStorage(name: Settings.autosense)
+                    let iob = self.iob(
+                        pumphistory: pumpHistory,
+                        profile: profile,
+                        clock: clock,
+                        autosens: autosens.isEmpty ? .null : autosens
+                    )
+
+                    self.storage.save(iob, as: Monitor.iob)
+
+                    // determine-basal
+                    let reservoir = self.loadFileFromStorage(name: Monitor.reservoir)
+
+                    let preferences = self.loadFileFromStorage(name: Settings.preferences)
+
+                    // oref2
+                    let oref2_variables = self.oref2()
+
+                    let orefDetermination = self.determineBasal(
+                        glucose: string ?? "",
+                        currentTemp: tempBasal,
+                        iob: iob,
+                        profile: profile,
+                        autosens: autosens.isEmpty ? .null : autosens,
+                        meal: meal,
+                        microBolusAllowed: true,
+                        reservoir: reservoir,
+                        pumpHistory: pumpHistory,
+                        preferences: preferences,
+                        basalProfile: basalProfile,
+                        oref2_variables: oref2_variables
+                    )
+                    debug(.openAPS, "Determinated: \(orefDetermination)")
+
+                    if var determination = Determination(from: orefDetermination) {
+                        determination.timestamp = determination.deliverAt ?? clock
+                        self.storage.save(determination, as: Enact.suggested)
+
+                        // save to core data asynchronously
+                        self.processDetermination(determination)
+
+                        if determination.tdd ?? 0 > 0 {
+                            self.context.perform {
+                                let saveToTDD = TDD(context: self.context)
+
+                                saveToTDD.timestamp = determination.timestamp ?? Date()
+                                saveToTDD.tdd = (determination.tdd ?? 0) as NSDecimalNumber?
+                                if self.context.hasChanges {
+                                    try? self.context.save()
+                                }
+
+                                let saveTarget = Target(context: self.context)
+                                saveTarget.current = (determination.current_target ?? 100) as NSDecimalNumber?
+                                if self.context.hasChanges {
+                                    try? self.context.save()
+                                }
                             }
                         }
-                    }
 
-                    promise(.success(determination))
-                } else {
-                    promise(.success(nil))
+                        promise(.success(determination))
+                    } else {
+                        promise(.success(nil))
+                    }
+                } catch {
+                    print("Encoding failed with error: \(error)")
                 }
+
+                /// convert glucoseStored to JSON
+
+//                    let glucoseValue: Decimal? = Decimal(glucoseRecord.glucose)
+
+//                    let glucoseStoredJSON = BloodGlucose(
+//                        date: Decimal(Int((glucoseStored.first?.date?.timeIntervalSince1970 ?? 0) * 1000)),
+//                        dateString: glucoseRecord.date ?? Date(),
+//                        unfiltered: glucoseValue,
+//                        filtered: glucoseValue,
+//                        noise: nil,
+//                        type: ""
+//                    )
             }
         }
     }

Model/Helper/GlucoseStored+helper.swift

@@ -50,3 +50,30 @@ extension NSPredicate {
 protocol GlucoseStoredObserver {
     func glucoseDidUpdate(_ glucose: [GlucoseStored])
 }
+
+extension GlucoseStored: Encodable {
+    enum CodingKeys: String, CodingKey {
+        case date
+        case sgv
+        case glucose
+        case direction
+        case id
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+
+//        let dateFormatter = ISO8601DateFormatter()
+//        let dateString = dateFormatter.string(from: date ?? Date())
+        let dateString = String(format: "%.0f", (date?.timeIntervalSince1970 ?? Date().timeIntervalSince1970) * 1000)
+        try container.encode(dateString, forKey: .date)
+        try container.encode(direction, forKey: .direction)
+        try container.encode(id, forKey: .id)
+
+        if isManual {
+            try container.encode(glucose, forKey: .glucose)
+        } else {
+            try container.encode(glucose, forKey: .sgv)
+        }
+    }
+}