From 4b6eab6aa405b6906d7eb15fa1458759ab9dc3df Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 8 Jan 2023 17:18:23 +0100
Subject: [PATCH] Fix loading bucketed data

---
 .../iob/iobCobCalculator/IobCobCalculatorPlugin.kt        | 4 ++++
 .../iob/iobCobCalculator/data/AutosensDataStoreObject.kt  | 8 +++++---
 .../java/info/nightscout/workflow/PrepareBgDataWorker.kt  | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
index 68bb0df2fc..b4203116fc 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
@@ -389,6 +389,10 @@ class IobCobCalculatorPlugin @Inject constructor(
             // cancel waiting task to prevent sending multiple posts
             scheduledHistoryPost?.cancel(false)
             // prepare task for execution in 1 sec
+            scheduledEvent?.let {
+                // set reload bg data if was not set
+                if (!event.reloadBgData) event.reloadBgData = it.reloadBgData
+            }
             scheduledEvent = event
             scheduledHistoryPost = historyWorker.schedule(
                 {
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt
index 3718cb934f..fedde87154 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt
@@ -315,9 +315,11 @@ class AutosensDataStoreObject : AutosensDataStore {
             val previous = bData[i + 1]
             val mSecDiff = current.timestamp - previous.timestamp
             val adjusted = (mSecDiff - T.mins(5).msecs()) / 1000
-            aapsLogger.debug(LTag.AUTOSENS) { "Adjusting bucketed data time. Current: ${dateUtil.dateAndTimeAndSecondsString(current.timestamp)} to: ${dateUtil.dateAndTimeAndSecondsString(previous.timestamp + T.mins(
-                5
-            ).msecs())} by $adjusted sec" }
+            aapsLogger.debug(LTag.AUTOSENS) {
+                "Adjusting bucketed data time. Current: ${dateUtil.dateAndTimeAndSecondsString(current.timestamp)} to: ${
+                    dateUtil.dateAndTimeAndSecondsString(previous.timestamp + T.mins(5).msecs())
+                } by $adjusted sec"
+            }
             if (abs(adjusted) > 90) {
                 // too big adjustment, fallback to non 5 min data
                 aapsLogger.debug(LTag.AUTOSENS, "Fallback to non 5 min data")
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt
index e386f9c223..4af5a066e7 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt
@@ -43,7 +43,7 @@ class PrepareBgDataWorker(
         val toTime = data.overviewData.toTime
         val fromTime = data.overviewData.fromTime
         data.overviewData.maxBgValue = Double.MIN_VALUE
-        data.overviewData.bgReadingsArray = repository.compatGetBgReadingsDataFromTime(data.overviewData.fromTime, data.overviewData.toTime, false).blockingGet()
+        data.overviewData.bgReadingsArray = repository.compatGetBgReadingsDataFromTime(fromTime, toTime, false).blockingGet()
         val bgListArray: MutableList<DataPointWithLabelInterface> = ArrayList()
         for (bg in data.overviewData.bgReadingsArray) {
             if (bg.timestamp < fromTime || bg.timestamp > toTime) continue