Better TDD handling

nightscout · Jan 29, 2025 · afad1ac · afad1ac
1 parent 964921b
commit afad1ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...in/kotlin/app/aaps/database/transactions/InsertOrUpdateCachedTotalDailyDoseTransaction.kt b/...in/kotlin/app/aaps/database/transactions/InsertOrUpdateCachedTotalDailyDoseTransaction.kt
@@ -18,13 +18,20 @@ class InsertOrUpdateCachedTotalDailyDoseTransaction(
         if (current == null) {
             database.totalDailyDoseDao.insertNewEntry(tdd)
             result.inserted.add(tdd)
-        } else {
+        } else if (
+            current.basalAmount != tdd.basalAmount ||
+            current.bolusAmount != tdd.bolusAmount ||
+            current.totalAmount != tdd.totalAmount ||
+            current.carbs != tdd.carbs
+        ){
             current.basalAmount = tdd.basalAmount
             current.bolusAmount = tdd.bolusAmount
             current.totalAmount = tdd.totalAmount
             current.carbs = tdd.carbs
             database.totalDailyDoseDao.updateExistingEntry(current)
             result.updated.add(current)
+        } else {
+            result.notUpdated.add(current)
         }
 
         return result
@@ -34,5 +41,6 @@ class InsertOrUpdateCachedTotalDailyDoseTransaction(
 
         val inserted = mutableListOf<TotalDailyDose>()
         val updated = mutableListOf<TotalDailyDose>()
+        val notUpdated = mutableListOf<TotalDailyDose>()
     }
 }
diff --git a/database/persistence/src/main/kotlin/app/aaps/database/persistence/PersistenceLayerImpl.kt b/database/persistence/src/main/kotlin/app/aaps/database/persistence/PersistenceLayerImpl.kt
@@ -1723,6 +1723,10 @@ class PersistenceLayerImpl @Inject constructor(
                     aapsLogger.debug(LTag.DATABASE, "Updated TotalDailyDose ${dateUtil.dateString(it.timestamp)} $it")
                     transactionResult.updated.add(it.fromDb())
                 }
+                result.notUpdated.forEach {
+                    aapsLogger.debug(LTag.DATABASE, "Not updated TotalDailyDose ${dateUtil.dateString(it.timestamp)} $it")
+                    transactionResult.updated.add(it.fromDb())
+                }
                 transactionResult
             }