Backfill up to 6 values (30 minutes) of glucose from Share

Fixes #21

Author: loudnate

Cartfile

@@ -1,4 +1,4 @@
-github "loudnate/LoopKit" ~> 0.3.3
+github "loudnate/LoopKit" "dev"
 github "loudnate/xDripG5" ~> 0.5.0
 github "loudnate/SwiftCharts" "loudnate/naterade"
 github "mddub/dexcom-share-client-swift" ~> 0.1

Cartfile.resolved

@@ -1,6 +1,6 @@
 github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7"
 github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3"
-github "loudnate/LoopKit" "v0.3.3"
+github "loudnate/LoopKit" "16e5c9a82a360c163c14d2d958aa662cb3ab9fc4"
 github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
 github "mddub/dexcom-share-client-swift" "v0.1.3"
 github "loudnate/xDripG5" "0.5.0"

Loop/Managers/DeviceDataManager.swift

@@ -483,23 +483,21 @@ class DeviceDataManager: CarbStoreDelegate, TransmitterDelegate {
             return
         }
 
-        shareClient.fetchLast(1) { (error, glucose) in
-            if let error = error {
-                self.logger.addError(error, fromSource: "ShareClient")
-            }
+        shareClient.fetchLast(6) { (error, glucose) in
+            guard let glucose = glucose else {
+                if let error = error {
+                    self.logger.addError(error, fromSource: "ShareClient")
+                }
 
-            guard let glucose = glucose?.first else {
-                completion?()
                 return
             }
 
-            // Ignore glucose values that are less than a minute newer than our previous value
-            if let latestGlucose = glucoseStore.latestGlucose where latestGlucose.startDate.timeIntervalSinceDate(glucose.startDate) > -NSTimeInterval(minutes: 1)  {
-                completion?()
-                return
+            // Ignore glucose values that are up to a minute newer than our previous value, to account for possible time shifting in Share data
+            let newGlucose = glucose.filterDateRange(glucoseStore.latestGlucose?.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 1)), nil).map {
+                return (quantity: $0.quantity, date: $0.startDate, displayOnly: false)
             }
 
-            glucoseStore.addGlucose(glucose.quantity, date: glucose.startDate, displayOnly: false, device: nil) { (_, value, error) -> Void in
+            glucoseStore.addGlucoseValues(newGlucose, device: nil) { (_, _, error) -> Void in
                 if let error = error {
                     self.logger.addError(error, fromSource: "GlucoseStore")
                 }