From 394883165d2f6603286d7bb56f6312d8b742c3b8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 29 Aug 2023 21:44:22 +0200
Subject: [PATCH] NSC: do not sync records with tempId

---
 .../main/java/info/nightscout/database/impl/daos/BolusDao.kt  | 4 ++--
 .../info/nightscout/database/impl/daos/TemporaryBasalDao.kt   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt
index cb91fed85b..fd1c106776 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt
@@ -63,11 +63,11 @@ internal interface BolusDao : TraceableDao<Bolus> {
     fun getBolusesIncludingInvalidFromTimeToTime(from: Long, to: Long): Single<List<Bolus>>
 
     // This query will be used with v3 to get all changed records
-    @Query("SELECT * FROM $TABLE_BOLUSES WHERE id > :id AND type <> :exclude AND referenceId IS NULL OR id IN (SELECT DISTINCT referenceId FROM $TABLE_BOLUSES WHERE id > :id) ORDER BY id ASC")
+    @Query("SELECT * FROM $TABLE_BOLUSES WHERE id > :id AND pumpId IS NOT NULL AND type <> :exclude AND referenceId IS NULL OR id IN (SELECT DISTINCT referenceId FROM $TABLE_BOLUSES WHERE id > :id) ORDER BY id ASC")
     fun getModifiedFrom(id: Long, exclude: Bolus.Type = Bolus.Type.PRIMING): Single<List<Bolus>>
 
     // for WS we need 1 record only
-    @Query("SELECT * FROM $TABLE_BOLUSES WHERE id > :id AND type <> :exclude ORDER BY id ASC limit 1")
+    @Query("SELECT * FROM $TABLE_BOLUSES WHERE id > :id AND pumpId IS NOT NULL AND type <> :exclude ORDER BY id ASC limit 1")
     fun getNextModifiedOrNewAfterExclude(id: Long, exclude: Bolus.Type = Bolus.Type.PRIMING): Maybe<Bolus>
 
     @Query("SELECT * FROM $TABLE_BOLUSES WHERE id = :referenceId")
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt
index 0a89476e45..373851489b 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt
@@ -72,11 +72,11 @@ internal interface TemporaryBasalDao : TraceableDao<TemporaryBasal> {
     fun getLastHistoryRecord(id: Long): TemporaryBasal?
 
     // This query will be used with v3 to get all changed records
-    @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE id > :id AND referenceId IS NULL OR id IN (SELECT DISTINCT referenceId FROM $TABLE_TEMPORARY_BASALS WHERE id > :id) ORDER BY id ASC")
+    @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE id > :id AND pumpId IS NOT NULL AND referenceId IS NULL OR id IN (SELECT DISTINCT referenceId FROM $TABLE_TEMPORARY_BASALS WHERE id > :id) ORDER BY id ASC")
     fun getModifiedFrom(id: Long): Single<List<TemporaryBasal>>
 
     // for WS we need 1 record only
-    @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE id > :id ORDER BY id ASC limit 1")
+    @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE id > :id AND pumpId IS NOT NULL ORDER BY id ASC limit 1")
     fun getNextModifiedOrNewAfter(id: Long): Maybe<TemporaryBasal>
 
     @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE id = :referenceId")