Creating a wrapper type around a PumpEvent that holds its reconciled …

…Date value Also fixes #119
ps2 · Jun 16, 2016 · 4040519 · 4040519
1 parent e157b38
commit 4040519
Show file tree

Hide file tree

Showing 68 changed files with 235 additions and 225 deletions.
diff --git a/MinimedKit/Extensions/NSDateFormatter.swift b/MinimedKit/Extensions/NSDateFormatter.swift
@@ -0,0 +1,22 @@
+//
+//  NSDateFormatter.swift
+//  RileyLink
+//
+//  Created by Nate Racklyeft on 6/15/16.
+//  Copyright © 2016 Pete Schwamb. All rights reserved.
+//
+
+import Foundation
+
+
+extension NSDateFormatter {
+    class func ISO8601DateFormatter() -> Self {
+        let formatter = self.init()
+        formatter.calendar = NSCalendar(calendarIdentifier: NSCalendarIdentifierISO8601)
+        formatter.locale = NSLocale(localeIdentifier: "en_US_POSIX")
+        formatter.timeZone = NSTimeZone(forSecondsFromGMT: 0)
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssX"
+
+        return formatter
+    }
+}
diff --git a/MinimedKit/PumpEventType.swift b/MinimedKit/PumpEventType.swift
@@ -17,6 +17,7 @@ public enum PumpEventType: UInt8 {
     case CalBGForPH = 0x0a
     case AlarmSensor = 0x0b
     case ClearAlarm = 0x0c
+    case SelectBasalProfile = 0x14
     case TempBasalDuration = 0x16
     case ChangeTime = 0x17
     case JournalEntryPumpLowBattery = 0x19
@@ -176,6 +177,8 @@ public enum PumpEventType: UInt8 {
             return DeleteOtherDeviceIDPumpEvent.self
         case .ChangeCaptureEventEnable:
             return ChangeCaptureEventEnablePumpEvent.self
+        case .SelectBasalProfile:
+            return SelectBasalProfilePumpEvent.self
         }
     }
 }

diff --git a/MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift b/MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift
@@ -25,7 +25,6 @@ public struct AlarmClockReminderPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "AlarmClockReminder",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift b/MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift
@@ -25,7 +25,6 @@ public struct AlarmSensorPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "AlarmSensor",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/BGReceivedPumpEvent.swift b/MinimedKit/PumpEvents/BGReceivedPumpEvent.swift
@@ -33,7 +33,6 @@ public struct BGReceivedPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "BGReceivedPumpEvent",
-            "timestamp": TimeFormat.timestampStr(timestamp),
             "amount": amount,
             "meter": meter,
         ]

diff --git a/MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift b/MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift
@@ -36,7 +36,6 @@ public struct BasalProfileStartPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "BasalProfileStart",
-            "timestamp": TimeFormat.timestampStr(timestamp),
             "offset": offset,
             "rate": rate,
             "profileIndex": profileIndex,

diff --git a/MinimedKit/PumpEvents/BatteryPumpEvent.swift b/MinimedKit/PumpEvents/BatteryPumpEvent.swift
@@ -25,7 +25,6 @@ public struct BatteryPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "Battery",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/BolusNormalPumpEvent.swift b/MinimedKit/PumpEvents/BolusNormalPumpEvent.swift
@@ -66,7 +66,6 @@ public struct BolusNormalPumpEvent: TimestampedPumpEvent {
             "amount": amount,
             "programmed": programmed,
             "type": type.rawValue,
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
 
         if let unabsorbedInsulinRecord = unabsorbedInsulinRecord {

diff --git a/MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift b/MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift
@@ -84,7 +84,6 @@ public struct BolusWizardEstimatePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "BolusWizardBolusEstimate",
-            "timestamp": TimeFormat.timestampStr(timestamp),
             "bg": bloodGlucose,
             "bgTargetHigh": bgTargetHigh,
             "correctionEstimate": correctionEstimate,

diff --git a/MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift b/MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift
@@ -31,7 +31,6 @@ public struct CalBGForPHPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "CalBGForPH",
-            "timestamp": TimeFormat.timestampStr(timestamp),
             "amount": amount,
         ]
     }

diff --git a/MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeAlarmClockEnablePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeAlarmClockEnable",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeAlarmClockTimePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeAlarmClockTime",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeAlarmNotifyModePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeAlarmNotifyMode",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift b/MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeAudioBolusPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeAudioBolus",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeBGReminderEnablePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeBGReminderEnable",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift b/MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeBGReminderOffsetPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeBGReminderOffset",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift b/MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeBasalProfilePatternPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeBasalProfilePattern",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeBasalProfilePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeBasalProfile",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeBolusReminderEnablePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeBolusReminderEnable",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeBolusReminderTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusReminderTimePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeBolusReminderTimePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeBolusReminderTime",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeBolusScrollStepSizePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusScrollStepSizePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeBolusScrollStepSizePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeBolusScrollStepSize",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeBolusWizardSetupPumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusWizardSetupPumpEvent.swift
@@ -29,7 +29,6 @@ public struct ChangeBolusWizardSetupPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeBolusWizardSetup",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeCaptureEventEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeCaptureEventEnablePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeCaptureEventEnablePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeCaptureEventEnable",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeCarbUnitsPumpEvent.swift b/MinimedKit/PumpEvents/ChangeCarbUnitsPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeCarbUnitsPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeCarbUnits",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeChildBlockEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeChildBlockEnablePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeChildBlockEnablePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeChildBlockEnable",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeMaxBasalPumpEvent.swift b/MinimedKit/PumpEvents/ChangeMaxBasalPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeMaxBasalPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeMaxBasal",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeMaxBolusPumpEvent.swift b/MinimedKit/PumpEvents/ChangeMaxBolusPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeMaxBolusPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeMaxBolus",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeOtherDeviceIDPumpEvent.swift b/MinimedKit/PumpEvents/ChangeOtherDeviceIDPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeOtherDeviceIDPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeOtherDeviceID",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeParadigmLinkIDPumpEvent.swift b/MinimedKit/PumpEvents/ChangeParadigmLinkIDPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeParadigmLinkIDPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeParadigmLinkID",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeReservoirWarningTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeReservoirWarningTimePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeReservoirWarningTimePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeReservoirWarningTime",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeSensorRateOfChangeAlertSetupPumpEvent.swift b/MinimedKit/PumpEvents/ChangeSensorRateOfChangeAlertSetupPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeSensorRateOfChangeAlertSetupPumpEvent: TimestampedPumpEvent
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeSensorRateOfChangeAlertSetup",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeSensorSetup2PumpEvent.swift b/MinimedKit/PumpEvents/ChangeSensorSetup2PumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeSensorSetup2PumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeSensorSetup2",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeTempBasalTypePumpEvent.swift b/MinimedKit/PumpEvents/ChangeTempBasalTypePumpEvent.swift
@@ -32,7 +32,6 @@ public struct ChangeTempBasalTypePumpEvent: TimestampedPumpEvent {
         return [
             "_type": "TempBasal",
             "temp": basalType,
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeTimeFormatPumpEvent.swift b/MinimedKit/PumpEvents/ChangeTimeFormatPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeTimeFormatPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeTimeFormat",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeTimePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeTimePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeTime",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeVariableBolusPumpEvent.swift b/MinimedKit/PumpEvents/ChangeVariableBolusPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeVariableBolusPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeVariableBolus",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeWatchdogEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeWatchdogEnablePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeWatchdogEnablePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeWatchdogEnable",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ChangeWatchdogMarriageProfilePumpEvent.swift b/MinimedKit/PumpEvents/ChangeWatchdogMarriageProfilePumpEvent.swift
@@ -25,7 +25,6 @@ public struct ChangeWatchdogMarriageProfilePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ChangeWatchdogMarriageProfile",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/ClearAlarmPumpEvent.swift b/MinimedKit/PumpEvents/ClearAlarmPumpEvent.swift
@@ -25,7 +25,6 @@ public struct ClearAlarmPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "ClearAlarm",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/DeleteAlarmClockTimePumpEvent.swift b/MinimedKit/PumpEvents/DeleteAlarmClockTimePumpEvent.swift
@@ -25,7 +25,6 @@ public struct DeleteAlarmClockTimePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "DeleteAlarmClockTime",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/DeleteBolusReminderTimePumpEvent.swift b/MinimedKit/PumpEvents/DeleteBolusReminderTimePumpEvent.swift
@@ -25,7 +25,6 @@ public struct DeleteBolusReminderTimePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "DeleteBolusReminderTime",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/DeleteOtherDeviceIDPumpEvent.swift b/MinimedKit/PumpEvents/DeleteOtherDeviceIDPumpEvent.swift
@@ -25,7 +25,6 @@ public struct DeleteOtherDeviceIDPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "DeleteOtherDeviceID",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/EnableDisableRemotePumpEvent.swift b/MinimedKit/PumpEvents/EnableDisableRemotePumpEvent.swift
@@ -25,7 +25,6 @@ public struct EnableDisableRemotePumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "EnableDisableRemote",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/JournalEntryExerciseMarkerPumpEvent.swift b/MinimedKit/PumpEvents/JournalEntryExerciseMarkerPumpEvent.swift
@@ -25,7 +25,6 @@ public struct JournalEntryExerciseMarkerPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "JournalEntryExerciseMarker",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/JournalEntryPumpLowBatteryPumpEvent.swift b/MinimedKit/PumpEvents/JournalEntryPumpLowBatteryPumpEvent.swift
@@ -25,7 +25,6 @@ public struct JournalEntryPumpLowBatteryPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "JournalEntryPumpLowBattery",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }
diff --git a/MinimedKit/PumpEvents/JournalEntryPumpLowReservoirPumpEvent.swift b/MinimedKit/PumpEvents/JournalEntryPumpLowReservoirPumpEvent.swift
@@ -25,7 +25,6 @@ public struct JournalEntryPumpLowReservoirPumpEvent: TimestampedPumpEvent {
     public var dictionaryRepresentation: [String: AnyObject] {
         return [
             "_type": "JournalEntryPumpLowReservoir",
-            "timestamp": TimeFormat.timestampStr(timestamp),
         ]
     }
 }