Merge branch 'master' of https://github.com/NightscoutFoundation/xDrip

jamorham · jamorham · commit 0addc89a0922 · 2025-03-23T13:43:15.000Z
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java
@@ -11,6 +11,7 @@
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
+import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
@@ -1361,6 +1362,12 @@ public static synchronized void invalidateAllForSensor() {
         JoH.static_toast_long(msg);
     }
 
+    public static void deleteAll() {
+        new Delete()
+                .from(Calibration.class)
+                .execute();
+    }
+
 }
 
 abstract class SlopeParameters {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/models/Sensor.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Sensor.java
@@ -1,10 +1,13 @@
 package com.eveningoutpost.dexdrip.models;
 
+import static com.eveningoutpost.dexdrip.models.JoH.tsl;
+
 import android.provider.BaseColumns;
 
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
+import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
@@ -21,8 +24,12 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
+import lombok.Setter;
+import lombok.val;
+
 /**
  * Created by Emma Black on 10/29/14.
  */
@@ -52,22 +59,25 @@ public class Sensor extends Model {
   @Column(name = "sensor_location")
   public String sensor_location;
 
-    public synchronized static Sensor create(long started_at) {
-        Sensor sensor = new Sensor();
-        sensor.started_at = started_at;
-        sensor.uuid = UUID.randomUUID().toString();
 
-        sensor.save();
-        SensorSendQueue.addToQueue(sensor);
-        Log.d("SENSOR MODEL:", sensor.toString());
-        return sensor;
+  @Setter
+  private volatile static long unitTestStopTime;
+
+    public synchronized static Sensor create(long starting_at) {
+        stopSensor(true); // stop any existing sensor session clamping to the last reading
+        return create(starting_at, UUID.randomUUID().toString());
     }
 
-    public synchronized static Sensor create(long started_at, String uuid) {//KS
+    public synchronized static Sensor create(long starting_at, String uuid) {//KS
         Sensor sensor = new Sensor();
-        sensor.started_at = started_at;
+        val lastSensor = lastStopped(); // get the last sensor we stopped
+        // find the time it was stopped or 0 if there is no previous sensor
+        long lastStoppedTime = lastSensor != null ? lastSensor.stopped_at : 0;
+        sensor.started_at = Math.max(lastStoppedTime + 1, starting_at);
+        if (sensor.started_at > tsl()) {
+            UserError.Log.wtf(TAG, "Sensor create() called with future timestamp, this cannot be right. " + starting_at + " " + lastStoppedTime + " " + sensor.started_at);
+        }
         sensor.uuid = uuid;
-
         sensor.save();
         SensorSendQueue.addToQueue(sensor);
         Log.d("SENSOR MODEL:", sensor.toString());
@@ -77,19 +87,36 @@ public synchronized static Sensor create(long started_at, String uuid) {//KS
     public static Sensor createDefaultIfMissing() {
         final Sensor sensor = currentSensor();
         if (sensor == null) {
-            Sensor.create(JoH.tsl());
+            Sensor.create(tsl());
             UserError.Log.ueh(TAG, "Created new default sensor");
         }
         return currentSensor();
     }
 
     public synchronized static void stopSensor() {
+        stopSensor(false); // by default don't clamp to last reading
+    }
+
+
+    public synchronized static void stopSensor(final boolean clampToLastReading) {
         final Sensor sensor = currentSensor();
         if (sensor == null) {
             return;
         }
-        sensor.stopped_at = JoH.tsl();
-        UserError.Log.ueh("SENSOR", "Sensor stopped at " + JoH.dateTimeText(sensor.stopped_at));
+
+        // stop now or use specified unit testing stop time
+        sensor.stopped_at = (unitTestStopTime == 0) ? tsl() : unitTestStopTime;
+
+        if (clampToLastReading) {
+            val lastReading = BgReading.last(true);
+            if (lastReading != null) {
+                // if we have a last reading then set the stop time to that last reading so long as it
+                // was actually from this sensor
+                sensor.stopped_at = Math.max(sensor.started_at, lastReading.timestamp + 1);
+            }
+        }
+
+        UserError.Log.ueh("SENSOR", "Sensor stopped at value: " + JoH.dateTimeText(sensor.stopped_at));
         sensor.save();
         if (currentSensor() != null) {
             UserError.Log.wtf(TAG, "Failed to update sensor stop in database");
@@ -122,36 +149,31 @@ public static Sensor lastStopped() {
 
     public static boolean stoppedRecently() {
         final Sensor last = lastStopped();
-        return last != null && last.stopped_at < JoH.tsl() && (JoH.msSince(last.stopped_at) < (Constants.HOUR_IN_MS * 2));
+        return last != null && last.stopped_at < tsl() && (JoH.msSince(last.stopped_at) < (Constants.HOUR_IN_MS * 2));
     }
 
     public static Sensor currentSensor() {
         Sensor sensor = new Select()
                 .from(Sensor.class)
                 .where("started_at != 0")
-                .where("stopped_at = 0")
                 .orderBy("_ID desc")
                 .limit(1)
                 .executeSingle();
+
+        if (sensor != null) {
+            if (sensor.stopped_at != 0) {
+                // last sensor is stopped
+                return null;
+            }
+        }
         return sensor;
     }
 
     public static boolean isActive() {
-        Sensor sensor = new Select()
-                .from(Sensor.class)
-                .where("started_at != 0")
-                .where("stopped_at = 0")
-                .orderBy("_ID desc")
-                .limit(1)
-                .executeSingle();
-        if(sensor == null) {
-            return false;
-        } else {
-            return true;
-        }
+        return currentSensor() != null;
     }
 
-    public static Sensor getByTimestamp(double started_at) {
+    public static Sensor getByTimestamp(long started_at) {
         return new Select()
                 .from(Sensor.class)
                 .where("started_at = ?", started_at)
@@ -259,6 +281,14 @@ public static void upsertFromMaster(Sensor jsonSensor) {
         }
     }
 
+    public static void deleteAll() {
+        // will fail if bg readings not deleted first
+            SensorSendQueue.deleteAll();
+            new Delete()
+                    .from(Sensor.class)
+                    .execute();
+    }
+
     public String toJSON() {
         JSONObject jsonObject = new JSONObject();
         try {
@@ -273,6 +303,34 @@ public String toJSON() {
             return "";
         }
     }
+
+    @Override
+    public String toString() {
+        return "SENSOR: " + toJSON() + " started: " + JoH.dateTimeText(started_at) + ((stopped_at != 0) ? " stopped: " + JoH.dateTimeText(stopped_at) : "");
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) { // Check for reference equality
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) { // Check for null and class type
+            return false;
+        }
+        Sensor sensor = (Sensor) obj; // Typecast
+
+        return started_at == sensor.started_at
+             //   && stopped_at == sensor.stopped_at // Note: not checking stopped_at as this maybe transient
+                && latest_battery_level == sensor.latest_battery_level
+                && Objects.equals(uuid, sensor.uuid)
+                && Objects.equals(sensor_location, sensor.sensor_location);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(started_at, stopped_at, latest_battery_level, uuid, sensor_location);
+    }
     
     public static Sensor fromJSON(String json) {
         if (json.length()==0) {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorSendQueue.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorSendQueue.java
@@ -5,6 +5,7 @@
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
+import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
@@ -57,4 +58,10 @@ public static void SendToFollower(Sensor sensor) {
             GcmActivity.syncSensor(sensor, true);
         }
     }
+
+    public static void deleteAll() {
+        new Delete()
+                .from(SensorSendQueue.class)
+                .execute();
+    }
 }
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/evaluators/PersistentHighTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/evaluators/PersistentHighTest.java
@@ -1,11 +1,14 @@
 package com.eveningoutpost.dexdrip.evaluators;
 
 import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
 import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.models.Sensor;
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.robolectric.shadows.ShadowLog;
 
@@ -22,6 +25,22 @@ public class PersistentHighTest extends RobolectricTestWithConfig {
     private static long START_TIME = JoH.tsl() - Constants.HOUR_IN_MS * 4;
     private static final double HIGH_MARK = 170;
 
+    @Before
+    public void setUp() {
+        cleanEverything();
+    }
+
+    @After
+    public void tearDown() {
+        cleanEverything();
+    }
+
+    private void cleanEverything() {
+        BgReading.deleteALL();
+        Calibration.deleteAll();
+        Sensor.deleteAll();
+    }
+
     @Test
     public void dataQualityCheckTest() {
 
@@ -32,8 +51,9 @@ public void dataQualityCheckTest() {
         assertWithMessage("Predating sensor should fail").that(PersistentHigh.dataQualityCheck(1000, HIGH_MARK)).isFalse();
         assertWithMessage("Post sensor start no data should fail").that(PersistentHigh.dataQualityCheck(JoH.tsl(), HIGH_MARK)).isFalse();
 
-        BgReading.deleteALL();
-        Sensor.create(START_TIME);
+        cleanEverything();
+        Sensor created = Sensor.create(START_TIME);
+        assertWithMessage("Sensor started when we wanted").that(created.started_at).isEqualTo(START_TIME);
         // various all high time slices
         for (int i = 0; i < (12 * 4); i++) {
             final long timestamp = START_TIME + Constants.MINUTE_IN_MS * 5 * i;
@@ -44,8 +64,9 @@ public void dataQualityCheckTest() {
         }
 
         START_TIME++;
-        BgReading.deleteALL();
-        Sensor.create(START_TIME);
+        cleanEverything();
+        created = Sensor.create(START_TIME);
+        assertWithMessage("Sensor started when we wanted b").that(created.started_at).isEqualTo(START_TIME);
         // single dipped point in sequence after a point we might have succeeded
         for (int i = 0; i < (12 * 4); i++) {
             final long timestamp = START_TIME + Constants.MINUTE_IN_MS * 5 * i;
@@ -56,8 +77,9 @@ public void dataQualityCheckTest() {
         }
 
         START_TIME++;
-        BgReading.deleteALL();
-        Sensor.create(START_TIME);
+        cleanEverything();
+        created = Sensor.create(START_TIME);
+        assertWithMessage("Sensor started when we wanted c").that(created.started_at).isEqualTo(START_TIME);
         // single dipped point in sequence before we would succeed
         for (int i = 0; i < (12 * 4); i++) {
             final long timestamp = START_TIME + Constants.MINUTE_IN_MS * 5 * i;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/models/SensorTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/SensorTest.java

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import com.activeandroid.Model;`
`6`	`6`	`import com.activeandroid.annotation.Column;`
`7`	`7`	`import com.activeandroid.annotation.Table;`
	`8`	`+import com.activeandroid.query.Delete;`
`8`	`9`	`import com.activeandroid.query.Select;`
`9`	`10`	`import com.eveningoutpost.dexdrip.GcmActivity;`
`10`	`11`	`import com.eveningoutpost.dexdrip.Home;`
`@@ -57,4 +58,10 @@ public static void SendToFollower(Sensor sensor) {`
`57`	`58`	`GcmActivity.syncSensor(sensor, true);`
`58`	`59`	`}`
`59`	`60`	`}`
	`61`	`+`
	`62`	`+ public static void deleteAll() {`
	`63`	`+ new Delete()`
	`64`	`+ .from(SensorSendQueue.class)`
	`65`	`+ .execute();`
	`66`	`+ }`
`60`	`67`	`}`