Updates to upload trend/trendRate/mbg (#18)

* Updates to upload trend/trendRate/mbg * Use actual device info for NS device string * Fix build warnings
ps2 · Apr 3, 2022 · 4edd730 · 4edd730
1 parent 31e5853
commit 4edd730
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/NightscoutService.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme b/NightscoutService.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/NightscoutServiceKit/Extensions/HKUnit.swift b/NightscoutServiceKit/Extensions/HKUnit.swift
@@ -17,5 +17,9 @@ extension HKUnit {
     static let millimolesPerLiter: HKUnit = {
         return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: .liter())
     }()
-
+
+    static let milligramsPerDeciliterPerMinute: HKUnit = {
+        return HKUnit.milligramsPerDeciliter.unitDivided(by: .minute())
+    }()
+
 }
diff --git a/NightscoutServiceKit/Extensions/NightscoutUploader.swift b/NightscoutServiceKit/Extensions/NightscoutUploader.swift
@@ -82,7 +82,7 @@ extension NightscoutUploader {
             return
         }
 
-        uploadEntries(samples.compactMap { $0.nightscoutEntry }) { result in
+        uploadEntries(samples.compactMap { $0.glucoseEntry }) { result in
             switch result {
             case .failure(let error):
                 completion(.failure(error))

diff --git a/NightscoutServiceKit/Extensions/StoredGlucoseSample.swift b/NightscoutServiceKit/Extensions/StoredGlucoseSample.swift
@@ -11,12 +11,30 @@ import NightscoutUploadKit
 
 extension StoredGlucoseSample {
 
-    var nightscoutEntry: NightscoutEntry {
-        return NightscoutEntry(
-            glucose: Int(quantity.doubleValue(for: .milligramsPerDeciliter)),
-            timestamp: startDate,
-            device: "loop://\(UIDevice.current.name)",
-            glucoseType: .Sensor
+    var glucoseEntry: GlucoseEntry {
+        let glucoseTrend: GlucoseEntry.GlucoseTrend?
+        if let trend = trend {
+            glucoseTrend = GlucoseEntry.GlucoseTrend(rawValue: trend.rawValue)
+        } else {
+            glucoseTrend = nil
+        }
+
+        let deviceString: String
+
+        if let device = device, let manufacturer = device.manufacturer, let model = device.model, let software = device.softwareVersion {
+            deviceString = "loop://\(manufacturer)/\(model)/\(software)"
+        } else {
+            deviceString = "loop://\(UIDevice.current.name)"
+        }
+
+        return GlucoseEntry(
+            glucose: quantity.doubleValue(for: .milligramsPerDeciliter),
+            date: startDate,
+            device: deviceString,
+            glucoseType: wasUserEntered ? .meter : .sensor,
+            trend: glucoseTrend,
+            changeRate: trendRate?.doubleValue(for: .milligramsPerDeciliterPerMinute),
+            isCalibration: isDisplayOnly
         )
     }
 

diff --git a/NightscoutServiceKitUI/Extensions/IdentifiableClass.swift b/NightscoutServiceKitUI/Extensions/IdentifiableClass.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-protocol IdentifiableClass: class {
+protocol IdentifiableClass: AnyObject {
 
     static var className: String { get }