caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Better log TBR

Browse source
This commit is contained in:
Milos Kozak 2022-04-29 19:07:36 +02:00
parent 3f1df34469
commit 2d653c67ef
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
View file

@ -271,7 +271,7 @@ class PumpSyncImplementation @Inject constructor(
.blockingGet() .blockingGet()
.also { result -> .also { result ->
result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted TemporaryBasal $it") } result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted TemporaryBasal $it") }
result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated TemporaryBasal $it") } result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated ${it.first} TemporaryBasal ${it.second}") }
return result.inserted.size > 0 return result.inserted.size > 0
} }
} }

9
database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt
View file

@ -29,7 +29,7 @@ class SyncPumpTemporaryBasalTransaction(
existing.duration = temporaryBasal.duration existing.duration = temporaryBasal.duration
existing.type = type ?: existing.type existing.type = type ?: existing.type
database.temporaryBasalDao.updateExistingEntry(existing) database.temporaryBasalDao.updateExistingEntry(existing)
result.updated.add(existing) result.updated.add(Pair(Reason.EXISTING_ID, existing))
} }
} else { } else {
val running = database.temporaryBasalDao.getTemporaryBasalActiveAt(temporaryBasal.timestamp).blockingGet() val running = database.temporaryBasalDao.getTemporaryBasalActiveAt(temporaryBasal.timestamp).blockingGet()
@ -37,7 +37,7 @@ class SyncPumpTemporaryBasalTransaction(
running.end = temporaryBasal.timestamp running.end = temporaryBasal.timestamp
running.interfaceIDs.endId = temporaryBasal.interfaceIDs.pumpId running.interfaceIDs.endId = temporaryBasal.interfaceIDs.pumpId
database.temporaryBasalDao.updateExistingEntry(running) database.temporaryBasalDao.updateExistingEntry(running)
result.updated.add(running) result.updated.add(Pair(Reason.ACTIVE, running))
} }
database.temporaryBasalDao.insertNewEntry(temporaryBasal) database.temporaryBasalDao.insertNewEntry(temporaryBasal)
result.inserted.add(temporaryBasal) result.inserted.add(temporaryBasal)
@ -45,9 +45,12 @@ class SyncPumpTemporaryBasalTransaction(
return result return result
} }
enum class Reason {
EXISTING_ID, ACTIVE
}
class TransactionResult { class TransactionResult {
val inserted = mutableListOf<TemporaryBasal>() val inserted = mutableListOf<TemporaryBasal>()
val updated = mutableListOf<TemporaryBasal>() val updated = mutableListOf<Pair<Reason,TemporaryBasal>>()
} }
} }