Skip to content

Commit

Permalink
Merge pull request #121 from nightscout/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@bjornoleh
bjornoleh authored Apr 17, 2024
2 parents 135f8b1 + 5aaed39 commit 81d6b01
Show file tree
Hide file tree
Showing 14 changed files with 382 additions and 209 deletions.
8 changes: 4 additions & 4 deletions FreeAPS/Sources/APS/Storage/CarbsStorage.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ protocol CarbsStorage {
func storeCarbs(_ carbs: [CarbsEntry])
func syncDate() -> Date
func recent() -> [CarbsEntry]
func nightscoutTretmentsNotUploaded() -> [NigtscoutTreatment]
func nightscoutTretmentsNotUploaded() -> [NightscoutTreatment]
func deleteCarbs(at date: Date)
}

Expand Down Expand Up @@ -170,12 +170,12 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
}
}

func nightscoutTretmentsNotUploaded() -> [NigtscoutTreatment] {
let uploaded = storage.retrieve(OpenAPS.Nightscout.uploadedPumphistory, as: [NigtscoutTreatment].self) ?? []
func nightscoutTretmentsNotUploaded() -> [NightscoutTreatment] {
let uploaded = storage.retrieve(OpenAPS.Nightscout.uploadedPumphistory, as: [NightscoutTreatment].self) ?? []

let eventsManual = recent().filter { $0.enteredBy == CarbsEntry.manual }
let treatments = eventsManual.map {
NigtscoutTreatment(
NightscoutTreatment(
duration: nil,
rawDuration: nil,
rawRate: nil,
Expand Down
14 changes: 7 additions & 7 deletions FreeAPS/Sources/APS/Storage/GlucoseStorage.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protocol GlucoseStorage {
func isGlucoseFresh() -> Bool
func isGlucoseNotFlat() -> Bool
func nightscoutGlucoseNotUploaded() -> [BloodGlucose]
func nightscoutCGMStateNotUploaded() -> [NigtscoutTreatment]
func nightscoutCGMStateNotUploaded() -> [NightscoutTreatment]
var alarm: GlucoseAlarm? { get }
}

Expand Down Expand Up @@ -85,7 +85,7 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
debug(.deviceManager, "start storage cgmState")
self.storage.transaction { storage in
let file = OpenAPS.Monitor.cgmState
var treatments = storage.retrieve(file, as: [NigtscoutTreatment].self) ?? []
var treatments = storage.retrieve(file, as: [NightscoutTreatment].self) ?? []
var updated = false
for x in glucose {
debug(.deviceManager, "storeGlucose \(x)")
Expand All @@ -107,15 +107,15 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
if let a = x.activationDate {
notes = "\(notes) activated on \(a)"
}
let treatment = NigtscoutTreatment(
let treatment = NightscoutTreatment(
duration: nil,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsSensorChange,
createdAt: sessionStartDate,
enteredBy: NigtscoutTreatment.local,
enteredBy: NightscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: notes,
Expand Down Expand Up @@ -212,9 +212,9 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
return Array(Set(recentGlucose).subtracting(Set(uploaded)))
}

func nightscoutCGMStateNotUploaded() -> [NigtscoutTreatment] {
let uploaded = storage.retrieve(OpenAPS.Nightscout.uploadedCGMState, as: [NigtscoutTreatment].self) ?? []
let recent = storage.retrieve(OpenAPS.Monitor.cgmState, as: [NigtscoutTreatment].self) ?? []
func nightscoutCGMStateNotUploaded() -> [NightscoutTreatment] {
let uploaded = storage.retrieve(OpenAPS.Nightscout.uploadedCGMState, as: [NightscoutTreatment].self) ?? []
let recent = storage.retrieve(OpenAPS.Monitor.cgmState, as: [NightscoutTreatment].self) ?? []

return Array(Set(recent).subtracting(Set(uploaded)))
}
Expand Down
289 changes: 148 additions & 141 deletions FreeAPS/Sources/APS/Storage/PumpHistoryStorage.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protocol PumpHistoryStorage {
func storeEvents(_ events: [PumpHistoryEvent])
func storeJournalCarbs(_ carbs: Int)
func recent() -> [PumpHistoryEvent]
func nightscoutTretmentsNotUploaded() -> [NigtscoutTreatment]
func nightscoutTreatmentsNotUploaded() -> [NightscoutTreatment]
func saveCancelTempEvents()
func deleteInsulin(at date: Date)
}
Expand Down Expand Up @@ -44,7 +44,9 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
durationMin: nil,
rate: nil,
temp: nil,
carbInput: nil
carbInput: nil,
isSMB: dose.automatic,
isExternalInsulin: dose.manuallyEntered
)]
case .tempBasal:
guard let dose = event.dose else { return [] }
Expand Down Expand Up @@ -209,155 +211,30 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
}
}

func nightscoutTretmentsNotUploaded() -> [NigtscoutTreatment] {
func nightscoutTreatmentsNotUploaded() -> [NightscoutTreatment] {
let events = recent()
guard !events.isEmpty else { return [] }

let temps: [NigtscoutTreatment] = events.reduce([]) { result, event in
var result = result
switch event.type {
case .tempBasal:
result.append(NigtscoutTreatment(
duration: nil,
rawDuration: nil,
rawRate: event,
absolute: event.rate,
rate: event.rate,
eventType: .nsTempBasal,
createdAt: event.timestamp,
enteredBy: NigtscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: nil,
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
))
case .tempBasalDuration:
if var last = result.popLast(), last.eventType == .nsTempBasal, last.createdAt == event.timestamp {
last.duration = event.durationMin
last.rawDuration = event
result.append(last)
}
default: break
}
return result
}
var treatments: [NightscoutTreatment?] = []

let bolusesAndCarbs = events.compactMap { event -> NigtscoutTreatment? in
switch event.type {
case .bolus:
return NigtscoutTreatment(
duration: event.duration,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .bolus,
createdAt: event.timestamp,
enteredBy: NigtscoutTreatment.local,
bolus: event,
insulin: event.amount,
notes: nil,
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
case .journalCarbs:
return NigtscoutTreatment(
duration: nil,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsCarbCorrection,
createdAt: event.timestamp,
enteredBy: NigtscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: nil,
carbs: Decimal(event.carbInput ?? 0),
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
default: return nil
for i in 0 ..< events.count {
let event = events[i]
var nextEvent: PumpHistoryEvent?
if i + 1 < events.count {
nextEvent = events[i + 1]
}
}

let misc = events.compactMap { event -> NigtscoutTreatment? in
switch event.type {
case .prime:
return NigtscoutTreatment(
duration: event.duration,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsSiteChange,
createdAt: event.timestamp,
enteredBy: NigtscoutTreatment.local,
bolus: event,
insulin: nil,
notes: nil,
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
case .rewind:
return NigtscoutTreatment(
duration: nil,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsInsulinChange,
createdAt: event.timestamp,
enteredBy: NigtscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: nil,
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
case .pumpAlarm:
return NigtscoutTreatment(
duration: 30, // minutes
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsAnnouncement,
createdAt: event.timestamp,
enteredBy: NigtscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: "Alarm \(String(describing: event.note)) \(event.type)",
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
default: return nil
if event.type == .tempBasal, nextEvent?.type == .tempBasalDuration {
treatments.append(NightscoutTreatment(event: event, tempBasalDuration: nextEvent))
} else {
treatments.append(NightscoutTreatment(event: event))
}
}

let uploaded = storage.retrieve(OpenAPS.Nightscout.uploadedPumphistory, as: [NigtscoutTreatment].self) ?? []
let uploaded = storage.retrieve(OpenAPS.Nightscout.uploadedPumphistory, as: [NightscoutTreatment].self) ?? []

let treatments = Array(Set([bolusesAndCarbs, temps, misc].flatMap { $0 }).subtracting(Set(uploaded)))
let treatmentsToUpload = Set(treatments.compactMap { $0 }).subtracting(Set(uploaded))

return treatments.sorted { $0.createdAt! > $1.createdAt! }
return treatmentsToUpload.sorted { $0.createdAt! > $1.createdAt! }
}

func saveCancelTempEvents() {
Expand Down Expand Up @@ -392,3 +269,133 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
storeEvents(events)
}
}

extension NightscoutTreatment {
init?(event: PumpHistoryEvent, tempBasalDuration: PumpHistoryEvent? = nil) {
var basalDurationEvent: PumpHistoryEvent?
if tempBasalDuration != nil, tempBasalDuration?.timestamp == event.timestamp, event.type == .tempBasal,
tempBasalDuration?.type == .tempBasalDuration
{
basalDurationEvent = tempBasalDuration
}
switch event.type {
case .tempBasal:
self.init(
duration: basalDurationEvent?.durationMin,
rawDuration: basalDurationEvent,
rawRate: event,
absolute: event.rate,
rate: event.rate,
eventType: .nsTempBasal,
createdAt: event.timestamp,
enteredBy: NightscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: nil,
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
case .bolus:
let eventType = determineBolusEventType(for: event)
self.init(
duration: event.duration,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: eventType,
createdAt: event.timestamp,
enteredBy: NightscoutTreatment.local,
bolus: event,
insulin: event.amount,
notes: nil,
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
case .journalCarbs:
self.init(
duration: nil,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsCarbCorrection,
createdAt: event.timestamp,
enteredBy: NightscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: nil,
carbs: Decimal(event.carbInput ?? 0),
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
case .prime:
self.init(
duration: event.duration,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsSiteChange,
createdAt: event.timestamp,
enteredBy: NightscoutTreatment.local,
bolus: event,
insulin: nil,
notes: nil,
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
case .rewind:
self.init(
duration: nil,
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsInsulinChange,
createdAt: event.timestamp,
enteredBy: NightscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: nil,
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
case .pumpAlarm:
self.init(
duration: 30, // minutes
rawDuration: nil,
rawRate: nil,
absolute: nil,
rate: nil,
eventType: .nsAnnouncement,
createdAt: event.timestamp,
enteredBy: NightscoutTreatment.local,
bolus: nil,
insulin: nil,
notes: "Alarm \(String(describing: event.note)) \(event.type)",
carbs: nil,
fat: nil,
protein: nil,
targetTop: nil,
targetBottom: nil
)
default:
return nil
}
}
}
Loading

0 comments on commit 81d6b01

Please sign in to comment.