store carbs in history

FreeAPS/Sources/APS/BaseAPSManager.swift

@@ -5,6 +5,7 @@ import Swinject
 
 final class BaseAPSManager: APSManager, Injectable {
     @Injected() private var storage: FileStorage!
+    @Injected() private var pumpHistory: PumpHistoryStorage!
     @Injected() private var keychain: Keychain!
     @Injected() private var deviceDataManager: DeviceDataManager!
     private var openAPS: OpenAPS!

FreeAPS/Sources/APS/PumpHistoryStorage.swift

@@ -5,7 +5,7 @@ import Swinject
 
 protocol PumpHistoryStorage {
     func storePumpEvents(_ events: [NewPumpEvent])
-    func storeBolusWizardCarbs(_ carbs: Int)
+    func storeJournalCarbs(_ carbs: Int)
 }
 
 final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
@@ -135,12 +135,12 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
         }
     }
 
-    func storeBolusWizardCarbs(_ carbs: Int) {
+    func storeJournalCarbs(_ carbs: Int) {
         processQueue.async {
             let eventsToStore = [
                 PumpHistoryEvent(
                     id: UUID().uuidString,
-                    type: .bolusWizard,
+                    type: .journalCarbs,
                     timestamp: Date(),
                     amount: nil,
                     duration: nil,

FreeAPS/Sources/Models/PumpHistoryEvent.swift

@@ -24,6 +24,7 @@ enum PumpHistoryEventType: String, JSON {
     case pumpResume = "PumpResume"
     case rewind = "Rewind"
     case prime = "Prime"
+    case journalCarbs = "JournalEntryMealMarker"
 }
 
 enum PumpHistoryTempType: String, JSON {