caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #14 from 0pen-dash/adrian/history-persistance

Browse source 
db create a bit more readable
This commit is contained in:
bartsopers 2021-02-28 18:28:08 +01:00 committed by GitHub
commit 67be27ac60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
View file

@ -39,15 +39,12 @@ class DashHistory @Inject constructor(
when { when {
commandType == SET_BOLUS && bolusRecord == null -> commandType == SET_BOLUS && bolusRecord == null ->
Single.error(IllegalArgumentException("bolusRecord missing on SET_BOLUS")) return Single.error(IllegalArgumentException("bolusRecord missing on SET_BOLUS"))
commandType == SET_TEMPORARY_BASAL && tempBasalRecord == null -> commandType == SET_TEMPORARY_BASAL && tempBasalRecord == null ->
Single.error<String>(IllegalArgumentException("tempBasalRecord missing on SET_TEMPORARY_BASAL")) return Single.error(IllegalArgumentException("tempBasalRecord missing on SET_TEMPORARY_BASAL"))
else -> null }
}?.let { return it }
return dao.save(HistoryRecordEntity(
return dao.save(
HistoryRecordEntity(
id = id, id = id,
date = date, date = date,
createdAt = currentTimeMillis(), createdAt = currentTimeMillis(),
@ -56,8 +53,7 @@ class DashHistory @Inject constructor(
bolusRecord = bolusRecord, bolusRecord = bolusRecord,
initialResult = initialResult, initialResult = initialResult,
resolvedResult = resolveResult, resolvedResult = resolveResult,
resolvedAt = resolvedAt, resolvedAt = resolvedAt)
)
).toSingle { id } ).toSingle { id }
} }