From ac62217984ccaf8ec3a090b97fe2b4a3987bc2af Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 29 Nov 2021 19:06:04 +0100
Subject: [PATCH] allow bolus update in NSC mode

---
 .../general/nsclient/NSClientAddUpdateWorker.kt       |  5 ++++-
 .../database/transactions/SyncNsBolusTransaction.kt   | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
index 209102ce2f..e6ff56ddf7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
@@ -98,7 +98,10 @@ class NSClientAddUpdateWorker(
                                     aapsLogger.debug(LTag.DATABASE, "Invalidated bolus $it")
                                 }
                                 result.updatedNsId.forEach {
-                                    aapsLogger.debug(LTag.DATABASE, "Updated nsId bolus $it")
+                                    aapsLogger.debug(LTag.DATABASE, "Updated nsId of bolus $it")
+                                }
+                                result.updated.forEach {
+                                    aapsLogger.debug(LTag.DATABASE, "Updated amount of bolus $it")
                                 }
                             }
                     } ?: aapsLogger.error("Error parsing bolus json $json")
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusTransaction.kt
index 5c453a3673..9457f2d802 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusTransaction.kt
@@ -16,21 +16,27 @@ class SyncNsBolusTransaction(private val bolus: Bolus) : Transaction<SyncNsBolus
             }
 
         if (current != null) {
-            // nsId exists, allow only invalidation
+            // nsId exists, allow only invalidation or amount update (for drivers setting full amount upfront)
             if (current.isValid && !bolus.isValid) {
                 current.isValid = false
                 database.bolusDao.updateExistingEntry(current)
                 result.invalidated.add(current)
             }
+            if (current.amount != bolus.amount) {
+                current.amount = bolus.amount
+                database.bolusDao.updateExistingEntry(current)
+                result.updated.add(current)
+            }
             return result
         }
 
         // not known nsId
         val existing = database.bolusDao.findByTimestamp(bolus.timestamp)
         if (existing != null && existing.interfaceIDs.nightscoutId == null) {
-            // the same record, update nsId only
+            // the same record, update nsId only and amount
             existing.interfaceIDs.nightscoutId = bolus.interfaceIDs.nightscoutId
             existing.isValid = bolus.isValid
+            existing.amount = bolus.amount
             database.bolusDao.updateExistingEntry(existing)
             result.updatedNsId.add(existing)
         } else {
@@ -46,5 +52,6 @@ class SyncNsBolusTransaction(private val bolus: Bolus) : Transaction<SyncNsBolus
         val updatedNsId = mutableListOf<Bolus>()
         val inserted = mutableListOf<Bolus>()
         val invalidated = mutableListOf<Bolus>()
+        val updated = mutableListOf<Bolus>()
     }
 }
\ No newline at end of file