[CPA-62] Remove trendRateUnit from Glucose Store

walker0 · Jul 17, 2023 · b81f889 · b81f889
1 parent 6f3a067
commit b81f889
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Common/Models/StatusExtensionContext.swift b/Common/Models/StatusExtensionContext.swift
@@ -160,8 +160,8 @@ extension GlucoseDisplayableContext: RawRepresentable {
             trendType = nil
         }
 
-        if let trendRateUnit = rawValue["trendRateUnit"] as? String, let trendRateValue = rawValue["trendRateValue"] as? Double {
-            trendRate = HKQuantity(unit: HKUnit(from: trendRateUnit), doubleValue: trendRateValue)
+        if let trendRateValue = rawValue["trendRateValue"] as? Double {
+            trendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: trendRateValue)
         } else {
             trendRate = nil
         }
@@ -181,7 +181,6 @@ extension GlucoseDisplayableContext: RawRepresentable {
         ]
         raw["trendType"] = trendType?.rawValue
         if let trendRate = trendRate {
-            raw["trendRateUnit"] = HKUnit.milligramsPerDeciliterPerMinute.unitString
             raw["trendRateValue"] = trendRate.doubleValue(for: HKUnit.milligramsPerDeciliterPerMinute)
         }
         raw["glucoseRangeCategory"] = glucoseRangeCategory?.rawValue

diff --git a/Common/Models/WatchContext.swift b/Common/Models/WatchContext.swift
@@ -75,8 +75,8 @@ final class WatchContext: RawRepresentable {
         if let rawGlucoseTrend = rawValue["gt"] as? GlucoseTrend.RawValue {
             glucoseTrend = GlucoseTrend(rawValue: rawGlucoseTrend)
         }
-        if let glucoseTrendRateUnitString = rawValue["gtru"] as? String, let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
-            glucoseTrendRate = HKQuantity(unit: HKUnit(from: glucoseTrendRateUnitString), doubleValue: glucoseTrendRateValue)
+        if let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
+            glucoseTrendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: glucoseTrendRateValue)
         }
         glucoseDate = rawValue["gd"] as? Date
         glucoseIsDisplayOnly = rawValue["gdo"] as? Bool