From c799c80ae90bc48933877e3afe0e20cf2ed26e27 Mon Sep 17 00:00:00 2001
From: Pete Schwamb <pete@schwamb.net>
Date: Wed, 28 Jun 2017 01:13:10 -0500
Subject: [PATCH] foodtype and error logging

---
 Loop/Extensions/MealBolusNightscoutTreatment.swift |  2 +-
 Loop/Extensions/NightscoutUploader.swift           | 13 +++++++++----
 Loop/Managers/DeviceDataManager.swift              |  3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Loop/Extensions/MealBolusNightscoutTreatment.swift b/Loop/Extensions/MealBolusNightscoutTreatment.swift
index f83aaa09c2..dc7d940dd8 100644
--- a/Loop/Extensions/MealBolusNightscoutTreatment.swift
+++ b/Loop/Extensions/MealBolusNightscoutTreatment.swift
@@ -14,6 +14,6 @@ import HealthKit
 extension MealBolusNightscoutTreatment {
     public convenience init(carbEntry: CarbEntry) {
         let carbGrams = carbEntry.quantity.doubleValue(for: HKUnit.gram())
-        self.init(timestamp: carbEntry.startDate, enteredBy: "loop://\(UIDevice.current.name)", id: carbEntry.externalID, carbs: lround(carbGrams), absorptionTime: carbEntry.absorptionTime)
+        self.init(timestamp: carbEntry.startDate, enteredBy: "loop://\(UIDevice.current.name)", id: carbEntry.externalID, carbs: lround(carbGrams), absorptionTime: carbEntry.absorptionTime, foodType: carbEntry.foodType)
     }
 }
diff --git a/Loop/Extensions/NightscoutUploader.swift b/Loop/Extensions/NightscoutUploader.swift
index 6d4b660441..bc913138f3 100644
--- a/Loop/Extensions/NightscoutUploader.swift
+++ b/Loop/Extensions/NightscoutUploader.swift
@@ -13,6 +13,9 @@ import NightscoutUploadKit
 
 
 extension NightscoutUploader: CarbStoreSyncDelegate {
+    static let logger = DiagnosticLogger.shared!.forCategory("NightscoutUploader")
+    
+    
     public func carbStore(_ carbStore: CarbStore, hasEntriesNeedingUpload entries: [CarbEntry], completion: @escaping ([String]) -> Void) {
         let nsCarbEntries = entries.map({ MealBolusNightscoutTreatment(carbEntry: $0)})
 
@@ -21,7 +24,8 @@ extension NightscoutUploader: CarbStoreSyncDelegate {
             case .success(let ids):
                 // Pass new ids back
                 completion(ids)
-            case .failure:
+            case .failure(let error):
+                NightscoutUploader.logger.error(error)
                 completion([])
             }
         }
@@ -32,7 +36,8 @@ extension NightscoutUploader: CarbStoreSyncDelegate {
         let nsCarbEntries = entries.map({ MealBolusNightscoutTreatment(carbEntry: $0)})
 
         modifyTreatments(nsCarbEntries) { (error) in
-            if error != nil {
+            if let error = error {
+                NightscoutUploader.logger.error(error)
                 completion([])
             } else {
                 completion(entries.map { $0.externalID ?? "" } )
@@ -43,8 +48,8 @@ extension NightscoutUploader: CarbStoreSyncDelegate {
     public func carbStore(_ carbStore: CarbStore, hasDeletedEntries ids: [String], completion: @escaping ([String]) -> Void) {
 
         deleteTreatmentsById(ids) { (error) in
-            if error != nil {
-                completion([])
+            if let error = error {
+                NightscoutUploader.logger.error(error)
             } else {
                 completion(ids)
             }
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
index 28a8ab3bc1..241da6013e 100644
--- a/Loop/Managers/DeviceDataManager.swift
+++ b/Loop/Managers/DeviceDataManager.swift
@@ -685,7 +685,8 @@ extension DeviceDataManager: DoseStoreDelegate {
             case .success(let objects):
                 completionHandler(objects)
             case .failure(let error):
-                self.logger.addError(error, fromSource: "NightscoutUploadKit")
+                let logger = DiagnosticLogger.shared!.forCategory("NightscoutUploader")
+                logger.error(error)
                 completionHandler([])
             }
         }