Upload cgm changes to Nightscout

(cherry picked from commit 4e7f25773a5da679e2cfd84435e381f646873030)

FreeAPS/Sources/APS/Storage/GlucoseStorage.swift

@@ -1,5 +1,7 @@
+import AVFAudio
 import Foundation
 import SwiftDate
+import SwiftUI
 import Swinject
 
 protocol GlucoseStorage {
@@ -12,6 +14,7 @@ protocol GlucoseStorage {
     func isGlucoseFresh() -> Bool
     func isGlucoseNotFlat() -> Bool
     func nightscoutGlucoseNotUploaded() -> [BloodGlucose]
+    func nightscoutCGMStateNotUploaded() -> [NigtscoutTreatment]
     var alarm: GlucoseAlarm? { get }
 }
 
@@ -46,6 +49,52 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
                     }
                 }
             }
+
+            self.storage.transaction { storage in
+                let file = OpenAPS.Monitor.cgmState
+                var treatments = storage.retrieve(file, as: [NigtscoutTreatment].self) ?? []
+                NSLog("CGM Treatments \(treatments)")
+                for x in glucose {
+                    guard let sessionStartDate = x.sessionStartDate else {
+                        continue
+                    }
+                    NSLog("CGM start \(sessionStartDate) lastTreatment \(String(describing: treatments.last))")
+                    if let lastTreatment = treatments.last, lastTreatment.createdAt == sessionStartDate {
+                        continue
+                    }
+                    var notes = ""
+                    if let t = x.transmitterID {
+                        notes = t
+                    }
+                    if let a = x.activationDate {
+                        notes = "\(notes) activated on \(a)"
+                    }
+                    let treatment = NigtscoutTreatment(
+                        duration: nil,
+                        rawDuration: nil,
+                        rawRate: nil,
+                        absolute: nil,
+                        rate: nil,
+                        eventType: .nsSensorChange,
+                        createdAt: sessionStartDate,
+                        enteredBy: NigtscoutTreatment.local,
+                        bolus: nil,
+                        insulin: nil,
+                        notes: notes,
+                        carbs: nil,
+                        targetTop: nil,
+                        targetBottom: nil
+                    )
+                    NSLog("CGM sensor change \(treatment)")
+                    treatments.append(treatment)
+                }
+                // We have to keep quite a bit of history as sensors start only every 10 days.
+                storage.save(
+                    treatments.filter
+                        { $0.createdAt != nil && $0.createdAt!.addingTimeInterval(30.days.timeInterval) > Date() },
+                    as: file
+                )
+            }
         }
     }
 
@@ -119,6 +168,13 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
         return Array(Set(recentGlucose).subtracting(Set(uploaded)))
     }
 
+    func nightscoutCGMStateNotUploaded() -> [NigtscoutTreatment] {
+        let uploaded = storage.retrieve(OpenAPS.Nightscout.uploadedCGMState, as: [NigtscoutTreatment].self) ?? []
+        let recent = storage.retrieve(OpenAPS.Monitor.cgmState, as: [NigtscoutTreatment].self) ?? []
+
+        return Array(Set(recent).subtracting(Set(uploaded)))
+    }
+
     var alarm: GlucoseAlarm? {
         guard let glucose = recent().last, glucose.dateString.addingTimeInterval(20.minutes.timeInterval) > Date(),
               let glucoseValue = glucose.glucose else { return nil }

FreeAPS/Sources/Services/Network/NightscoutManager.swift

@@ -240,6 +240,8 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
 
     func uploadGlucose() {
         uploadGlucose(glucoseStorage.nightscoutGlucoseNotUploaded(), fileToSave: OpenAPS.Nightscout.uploadedGlucose)
+
+        uploadTreatments(glucoseStorage.nightscoutCGMStateNotUploaded(), fileToSave: OpenAPS.Nightscout.uploadedCGMState)
     }
 
     private func uploadPumpHistory() {