From 261fbbc7596909b772303a9ba390099a0d66e325 Mon Sep 17 00:00:00 2001 From: Philoul Date: Tue, 4 May 2021 18:41:11 +0200 Subject: [PATCH 01/16] Replace Hardcoded key by string --- .../pump/insight/LocalInsightPlugin.java | 18 +++++++------- .../InsightConnectionService.java | 7 +++--- insight/src/main/res/values/strings.xml | 14 +++++++++-- .../main/res/xml/pref_insight_local_full.xml | 24 +++++++++---------- .../xml/pref_insight_local_pumpcontrol.xml | 22 ++++++++--------- 5 files changed, 48 insertions(+), 37 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index 5626f4cdb1..6f230dee15 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -579,7 +579,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusMessage.setDuration(0); bolusMessage.setExtendedAmount(0); bolusMessage.setImmediateAmount(insulin); - bolusMessage.setVibration(sp.getBoolean(detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB ? R.string.key_disable_vibration_auto : R.string.key_disable_vibration, false)); + bolusMessage.setVibration(sp.getBoolean(detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB ? R.string.key_insight_disable_vibration_auto : R.string.key_insight_disable_vibration, false)); bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId(); bolusCancelled = false; } @@ -701,7 +701,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai if (cancelTBRResult.getSuccess()) { PumpEnactResult ebResult = setExtendedBolusOnly((absoluteRate - getBaseBasalRate()) / 60D * ((double) durationInMinutes), durationInMinutes, - sp.getBoolean(R.string.key_disable_vibration_auto, false)); + sp.getBoolean(R.string.key_insight_disable_vibration_auto, false)); if (ebResult.getSuccess()) { result.success(true) .enacted(true) @@ -780,7 +780,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai public PumpEnactResult setExtendedBolus(double insulin, int durationInMinutes) { PumpEnactResult result = cancelExtendedBolusOnly(); if (result.getSuccess()) - result = setExtendedBolusOnly(insulin, durationInMinutes, sp.getBoolean(R.string.key_disable_vibration, false)); + result = setExtendedBolusOnly(insulin, durationInMinutes, sp.getBoolean(R.string.key_insight_disable_vibration, false)); try { fetchStatus(); readHistory(); @@ -1130,7 +1130,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai @Override public boolean isFakingTempsByExtendedBoluses() { - return sp.getBoolean("insight_enable_tbr_emulation", false); + return sp.getBoolean(R.string.key_insight_enable_tbr_emulation, false); } @NonNull @Override @@ -1254,7 +1254,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai } private void processCannulaFilledEvent(CannulaFilledEvent event) { - if (!sp.getBoolean("insight_log_site_changes", false)) return; + if (!sp.getBoolean(R.string.key_insight_log_site_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.CANNULA_CHANGE); @@ -1278,21 +1278,21 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai } private void processTubeFilledEvent(TubeFilledEvent event) { - if (!sp.getBoolean("insight_log_tube_changes", false)) return; + if (!sp.getBoolean(R.string.key_insight_log_tube_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; logNote(timestamp, resourceHelper.gs(R.string.tube_changed)); } private void processSniffingDoneEvent(SniffingDoneEvent event) { - if (!sp.getBoolean("insight_log_reservoir_changes", false)) return; + if (!sp.getBoolean(R.string.key_insight_log_reservoir_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.INSULIN_CHANGE); } private void processPowerUpEvent(PowerUpEvent event) { - if (!sp.getBoolean("insight_log_battery_changes", false)) return; + if (!sp.getBoolean(R.string.key_insight_log_battery_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE); @@ -1446,7 +1446,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai } private void processOccurrenceOfAlertEvent(OccurrenceOfAlertEvent event) { - if (!sp.getBoolean("insight_log_alerts", false)) return; + if (!sp.getBoolean(R.string.key_insight_log_alerts, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; Integer code = null; diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java index cddceb1ddd..40edeebc7b 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java @@ -20,6 +20,7 @@ import java.util.List; import javax.inject.Inject; import dagger.android.DaggerService; +import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.logging.LTag; import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage; @@ -141,10 +142,10 @@ public class InsightConnectionService extends DaggerService implements Connectio } private void increaseRecoveryDuration() { - long maxRecoveryDuration = sp.getInt("insight_max_recovery_duration", 20); + long maxRecoveryDuration = sp.getInt(R.string.key_insight_max_recovery_duration, 20); maxRecoveryDuration = Math.min(maxRecoveryDuration, 20); maxRecoveryDuration = Math.max(maxRecoveryDuration, 0); - long minRecoveryDuration = sp.getInt("insight_min_recovery_duration", 5); + long minRecoveryDuration = sp.getInt(R.string.key_insight_min_recovery_duration, 5); minRecoveryDuration = Math.min(minRecoveryDuration, 20); minRecoveryDuration = Math.max(minRecoveryDuration, 0); recoveryDuration += 1000; @@ -295,7 +296,7 @@ public class InsightConnectionService extends DaggerService implements Connectio setState(InsightState.DISCONNECTED); cleanup(true); } else if (state != InsightState.DISCONNECTED) { - long disconnectTimeout = sp.getInt("insight_disconnect_delay", 5); + long disconnectTimeout = sp.getInt(R.string.key_insight_disconnect_delay, 5); disconnectTimeout = Math.min(disconnectTimeout, 15); disconnectTimeout = Math.max(disconnectTimeout, 0); aapsLogger.info(LTag.PUMP, "Last connection lock released, will disconnect in " + disconnectTimeout + " seconds"); diff --git a/insight/src/main/res/values/strings.xml b/insight/src/main/res/values/strings.xml index 8b235730bc..dd12e644a3 100644 --- a/insight/src/main/res/values/strings.xml +++ b/insight/src/main/res/values/strings.xml @@ -31,10 +31,20 @@ Tube changed Sight Insight Pump Alerts - insight_disable_vibration Disable vibrations on manual bolus delivery For bolus and extended bolus (only available with Insight firmware 3.x) - insight_disable_vibration_auto + insight_disable_vibration + insight_disable_vibration_auto + insight_enable_tbr_emulation + insight_log_site_changes + insight_log_tube_changes + insight_log_reservoir_changes + insight_log_battery_changes + insight_log_operating_mode_changes + insight_log_alerts + insight_min_recovery_duration + insight_max_recovery_duration + insight_disconnect_delay Disable vibrations on automated bolus delivery For SMB and Temp Basal with TBR emulation (only available with Insight firmware 3.x) Timeout during handshake - reset bluetooth diff --git a/insight/src/main/res/xml/pref_insight_local_full.xml b/insight/src/main/res/xml/pref_insight_local_full.xml index 1329db7de3..69fbec43a0 100644 --- a/insight/src/main/res/xml/pref_insight_local_full.xml +++ b/insight/src/main/res/xml/pref_insight_local_full.xml @@ -15,68 +15,68 @@ diff --git a/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml b/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml index b73c01f1f7..ca7743ec3a 100644 --- a/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml +++ b/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml @@ -15,62 +15,62 @@ From 8592ed3249b24f7eb6f2c9d6323274254d6183a2 Mon Sep 17 00:00:00 2001 From: Philoul Date: Tue, 4 May 2021 22:40:00 +0200 Subject: [PATCH 02/16] Update driver with pumpSync for boluses and TBR --- .../pump/insight/LocalInsightPlugin.java | 269 +++++++++++------- 1 file changed, 166 insertions(+), 103 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index 6f230dee15..ad06a368f0 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -33,12 +33,9 @@ import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.data.PumpEnactResult; -import info.nightscout.androidaps.db.ExtendedBolus; import info.nightscout.androidaps.db.InsightBolusID; import info.nightscout.androidaps.db.InsightHistoryOffset; import info.nightscout.androidaps.db.InsightPumpID; -import info.nightscout.androidaps.db.Source; -import info.nightscout.androidaps.db.TemporaryBasal; import info.nightscout.androidaps.events.EventInitializationChanged; import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.insight.R; @@ -54,7 +51,7 @@ import info.nightscout.androidaps.interfaces.Pump; import info.nightscout.androidaps.interfaces.PumpDescription; import info.nightscout.androidaps.interfaces.PumpPluginBase; import info.nightscout.androidaps.interfaces.PumpSync; -import info.nightscout.androidaps.interfaces.TreatmentsInterface; +import info.nightscout.androidaps.interfaces.PumpSync.PumpState.TemporaryBasal; import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.logging.LTag; import info.nightscout.androidaps.plugins.bus.RxBusWrapper; @@ -131,6 +128,7 @@ import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_erro import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator; import info.nightscout.androidaps.plugins.pump.insight.utils.ParameterBlockUtil; import info.nightscout.androidaps.utils.DateUtil; +import info.nightscout.androidaps.utils.T; import info.nightscout.androidaps.utils.resources.ResourceHelper; import info.nightscout.androidaps.utils.sharedPreferences.SP; @@ -140,7 +138,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private final AAPSLogger aapsLogger; private final RxBusWrapper rxBus; private final ResourceHelper resourceHelper; - private final TreatmentsInterface treatmentsPlugin; private final SP sp; private final CommandQueueProvider commandQueue; private final ProfileFunction profileFunction; @@ -199,7 +196,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai AAPSLogger aapsLogger, RxBusWrapper rxBus, ResourceHelper resourceHelper, - TreatmentsInterface treatmentsPlugin, SP sp, CommandQueueProvider commandQueue, ProfileFunction profileFunction, @@ -223,7 +219,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai this.aapsLogger = aapsLogger; this.rxBus = rxBus; this.resourceHelper = resourceHelper; - this.treatmentsPlugin = treatmentsPlugin; this.sp = sp; this.commandQueue = commandQueue; this.profileFunction = profileFunction; @@ -376,7 +371,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai calendar.set(Calendar.HOUR_OF_DAY, pumpTime.getHour()); calendar.set(Calendar.MINUTE, pumpTime.getMinute()); calendar.set(Calendar.SECOND, pumpTime.getSecond()); - if (calendar.get(Calendar.HOUR_OF_DAY) != pumpTime.getHour() || Math.abs(calendar.getTimeInMillis() - System.currentTimeMillis()) > 10000) { + if (calendar.get(Calendar.HOUR_OF_DAY) != pumpTime.getHour() || Math.abs(calendar.getTimeInMillis() - dateUtil.now()) > 10000) { calendar.setTime(new Date()); pumpTime.setYear(calendar.get(Calendar.YEAR)); pumpTime.setMonth(calendar.get(Calendar.MONTH) + 1); @@ -544,7 +539,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai @Override public long lastDataTime() { - if (connectionService == null || alertService == null) return System.currentTimeMillis(); + if (connectionService == null || alertService == null) return dateUtil.now(); return connectionService.getLastDataTime(); } @@ -569,6 +564,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai @NonNull @Override public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) { + if (detailedBolusInfo.insulin == 0 || detailedBolusInfo.carbs > 0) { + throw new IllegalArgumentException(detailedBolusInfo.toString(), new Exception()); + } PumpEnactResult result = new PumpEnactResult(getInjector()); double insulin = Math.round(detailedBolusInfo.insulin / 0.01) * 0.01; if (insulin > 0) { @@ -591,25 +589,21 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusingEvent.setPercent(0); rxBus.send(bolusingEvent); int trials = 0; + // Move to Insight room database InsightBolusID insightBolusID = new InsightBolusID(); insightBolusID.bolusID = bolusID; insightBolusID.timestamp = System.currentTimeMillis(); insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); databaseHelper.createOrUpdate(insightBolusID); + aapsLogger.debug(LTag.PUMP, "XXXX set Bolus: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " amount: " + insulin); + /* detailedBolusInfo.setBolusTimestamp(insightBolusID.timestamp); detailedBolusInfo.setPumpType(PumpType.ACCU_CHEK_INSIGHT); detailedBolusInfo.setPumpSerial(serialNumber()); detailedBolusInfo.setBolusPumpId(insightBolusID.id); - if (detailedBolusInfo.carbs > 0 && detailedBolusInfo.carbTime != 0) { - DetailedBolusInfo carbInfo = new DetailedBolusInfo(); - carbInfo.carbs = detailedBolusInfo.carbs; - carbInfo.setCarbsTimestamp(detailedBolusInfo.timestamp + detailedBolusInfo.carbTime * 60L * 1000L); - carbInfo.setPumpType(PumpType.USER); - treatmentsPlugin.addToHistoryTreatment(carbInfo, false); - detailedBolusInfo.carbTime = 0; - detailedBolusInfo.carbs = 0; - } treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true); + + */ while (true) { synchronized ($bolusLock) { if (bolusCancelled) break; @@ -657,10 +651,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai aapsLogger.error("Exception while delivering bolus", e); result.comment(ExceptionTranslator.getString(context, e)); } - } else if (detailedBolusInfo.carbs > 0) { - result.success(true).enacted(true); + result.bolusDelivered(insulin); } - result.carbsDelivered(detailedBolusInfo.carbs).bolusDelivered(insulin); return result; } @@ -676,6 +668,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusCancelled = true; confirmAlert(AlertType.WARNING_38); alertService.ignore(null); + aapsLogger.debug(LTag.PUMP, "XXXX Stop Bolus : " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now())); } } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while canceling bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); @@ -761,8 +754,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai .success(true) .enacted(true) .comment(R.string.virtualpump_resultok); + aapsLogger.debug(LTag.PUMP, "XXXX Set Temp Basal timestamp: " + dateUtil.now() + " rate: " + percent + " duration: " + durationInMinutes); + fetchStatus(); // here I switched fetchStatus and readHistory (I noticed that we could miss the latest command sent to the pump if readHistory is before readHistory(); - fetchStatus(); } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); result.comment(ExceptionTranslator.getString(context, e)); @@ -809,13 +803,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai insightBolusID.timestamp = System.currentTimeMillis(); insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); databaseHelper.createOrUpdate(insightBolusID); - ExtendedBolus extendedBolus = new ExtendedBolus(getInjector()); - extendedBolus.date = insightBolusID.timestamp; - extendedBolus.source = Source.PUMP; - extendedBolus.durationInMinutes = durationInMinutes; - extendedBolus.insulin = insulin; - extendedBolus.pumpId = insightBolusID.id; - treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); + aapsLogger.debug(LTag.PUMP, "XXXX Set Extended timestamp: " + dateUtil.now() + " amount: " + insulin + "U duration: " + durationInMinutes + "BolusId: " + bolusID); result.success(true).enacted(true).comment(R.string.virtualpump_resultok); } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); @@ -836,7 +824,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai PumpEnactResult cancelEBResult = null; if (isFakingTempsByExtendedBoluses()) cancelEBResult = cancelExtendedBolusOnly(); PumpEnactResult cancelTBRResult = cancelTempBasalOnly(); - result.success((cancelEBResult != null && cancelEBResult.getSuccess()) && cancelTBRResult.getSuccess()); + result.success((cancelEBResult == null || (cancelEBResult != null && cancelEBResult.getSuccess())) && cancelTBRResult.getSuccess()); //Fix a bug when Fake TBR is disabled and click on Cancel TBR button result.enacted((cancelEBResult != null && cancelEBResult.getEnacted()) || cancelTBRResult.getEnacted()); result.comment(cancelEBResult != null ? cancelEBResult.getComment() : cancelTBRResult.getComment()); try { @@ -863,6 +851,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai confirmAlert(AlertType.WARNING_36); alertService.ignore(null); result.comment(R.string.virtualpump_resultok); + aapsLogger.debug(LTag.PUMP, "XXXX cancel Temp Basal time: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now())); } catch (NoActiveTBRToCanceLException e) { result.success(true); result.comment(R.string.virtualpump_resultok); @@ -909,18 +898,18 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai InsightBolusID insightBolusID = databaseHelper.getInsightBolusID(connectionService.getPumpSystemIdentification().getSerialNumber(), activeBolus.getBolusID(), System.currentTimeMillis()); if (insightBolusID != null) { - ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(insightBolusID.id); + /* Search in Insight room database + PumpSync.PumpState.ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(insightBolusID.id); if (extendedBolus != null) { extendedBolus.durationInMinutes = (int) ((System.currentTimeMillis() - extendedBolus.date) / 60000); if (extendedBolus.durationInMinutes <= 0) { final String _id = extendedBolus._id; -// if (NSUpload.isIdValid(_id)) -// nsUpload.removeCareportalEntryFromNS(_id); -// else uploadQueue.removeByMongoId("dbAdd", _id); databaseHelper.delete(extendedBolus); } else treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); } + */ + aapsLogger.debug(LTag.PUMP, "XXXX cancel Extended Bolus time: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " BolusId: " + activeBolus.getBolusID()); result.enacted(true).success(true); } } @@ -941,8 +930,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private void confirmAlert(AlertType alertType) { try { - long started = System.currentTimeMillis(); - while (System.currentTimeMillis() - started < 10000) { + long started = dateUtil.now(); + while (dateUtil.now() - started < 10000) { GetActiveAlertMessage activeAlertMessage = connectionService.requestMessage(new GetActiveAlertMessage()).await(); if (activeAlertMessage.getAlert() != null) { if (activeAlertMessage.getAlert().getAlertType() == alertType) { @@ -963,9 +952,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai @NonNull @Override public JSONObject getJSONStatus(@NonNull Profile profile, @NonNull String profileName, @NonNull String version) { - long now = System.currentTimeMillis(); + long now = dateUtil.now(); if (connectionService == null) return new JSONObject(); - if (System.currentTimeMillis() - connectionService.getLastConnected() > (60 * 60 * 1000)) { + if (dateUtil.now() - connectionService.getLastConnected() > (60 * 60 * 1000)) { return new JSONObject(); } @@ -1103,7 +1092,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai public String shortStatus(boolean veryShort) { StringBuilder ret = new StringBuilder(); if (connectionService.getLastConnected() != 0) { - long agoMsec = System.currentTimeMillis() - connectionService.getLastConnected(); + long agoMsec = dateUtil.now() - connectionService.getLastConnected(); int agoMin = (int) (agoMsec / 60d / 1000d); ret.append(resourceHelper.gs(R.string.short_status_last_connected, agoMin)).append("\n"); } @@ -1144,6 +1133,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai String pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); timeOffset = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() - parseDate(pumpTime.getYear(), pumpTime.getMonth(), pumpTime.getDay(), pumpTime.getHour(), pumpTime.getMinute(), pumpTime.getSecond()); + // Move to Insight room database InsightHistoryOffset historyOffset = databaseHelper.getInsightHistoryOffset(pumpSerial); try { List historyEvents = new ArrayList<>(); @@ -1168,6 +1158,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai Collections.reverse(historyEvents); if (historyOffset != null) processHistoryEvents(pumpSerial, historyEvents); if (historyEvents.size() > 0) { + // Move to Insight room database historyOffset = new InsightHistoryOffset(); historyOffset.pumpSerial = pumpSerial; historyOffset.offset = historyEvents.get(0).getEventPosition(); @@ -1202,22 +1193,42 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai if (!processHistoryEvent(serial, temporaryBasals, pumpStartedEvents, historyEvent)) break; Collections.reverse(temporaryBasals); + for (InsightPumpID pumpID : pumpStartedEvents) { InsightPumpID stoppedEvent = databaseHelper.getPumpStoppedEvent(pumpID.pumpSerial, pumpID.timestamp); if (stoppedEvent == null || stoppedEvent.eventType.equals("PumpPaused")) continue; long tbrStart = stoppedEvent.timestamp + 10000; - TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector()); - temporaryBasal.durationInMinutes = (int) ((pumpID.timestamp - tbrStart) / 60000); - temporaryBasal.date = tbrStart; - temporaryBasal.source = Source.PUMP; - temporaryBasal.pumpId = pumpID.id; - temporaryBasal.percentRate = 0; - temporaryBasal.isAbsolute = false; + TemporaryBasal temporaryBasal = new TemporaryBasal( + tbrStart, + pumpID.timestamp - tbrStart, + 0, + false, + PumpSync.TemporaryBasalType.NORMAL, + pumpID.id, + pumpID.id); temporaryBasals.add(temporaryBasal); } - temporaryBasals.sort((o1, o2) -> (int) (o1.date - o2.date)); - for (TemporaryBasal temporaryBasal : temporaryBasals) - treatmentsPlugin.addToHistoryTempBasal(temporaryBasal); + temporaryBasals.sort((o1, o2) -> (int) (o1.getTimestamp() - o2.getTimestamp())); + for (TemporaryBasal temporaryBasal : temporaryBasals) { + if (temporaryBasal.getRate() == 100.0) { // for Stop TBR event rate = 100.0 + pumpSync.syncStopTemporaryBasalWithPumpId( + temporaryBasal.getTimestamp(), + temporaryBasal.getPumpId(), + PumpType.ACCU_CHEK_INSIGHT, + serial); + } + if (temporaryBasal.getRate() != 100.0){ + Boolean resultdb = pumpSync.syncTemporaryBasalWithPumpId( + temporaryBasal.getTimestamp(), + temporaryBasal.getRate(), + temporaryBasal.getDuration(), + temporaryBasal.isAbsolute(), + temporaryBasal.getType(), + temporaryBasal.getPumpId(), + PumpType.ACCU_CHEK_INSIGHT, + serial); + } + } } private boolean processHistoryEvent(String serial, List temporaryBasals, List pumpStartedEvents, HistoryEvent event) { @@ -1225,13 +1236,13 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai else if (event instanceof DateTimeChangedEvent) processDateTimeChangedEvent((DateTimeChangedEvent) event); else if (event instanceof CannulaFilledEvent) - processCannulaFilledEvent((CannulaFilledEvent) event); + processCannulaFilledEvent(serial, (CannulaFilledEvent) event); else if (event instanceof TotalDailyDoseEvent) - processTotalDailyDoseEvent((TotalDailyDoseEvent) event); - else if (event instanceof TubeFilledEvent) processTubeFilledEvent((TubeFilledEvent) event); + processTotalDailyDoseEvent(serial, (TotalDailyDoseEvent) event); + else if (event instanceof TubeFilledEvent) processTubeFilledEvent(serial, (TubeFilledEvent) event); else if (event instanceof SniffingDoneEvent) - processSniffingDoneEvent((SniffingDoneEvent) event); - else if (event instanceof PowerUpEvent) processPowerUpEvent((PowerUpEvent) event); + processSniffingDoneEvent(serial, (SniffingDoneEvent) event); + else if (event instanceof PowerUpEvent) processPowerUpEvent(serial, (PowerUpEvent) event); else if (event instanceof OperatingModeChangedEvent) processOperatingModeChangedEvent(serial, pumpStartedEvents, (OperatingModeChangedEvent) event); else if (event instanceof StartOfTBREvent) @@ -1253,19 +1264,28 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai timeOffset -= timeAfter - timeBefore; } - private void processCannulaFilledEvent(CannulaFilledEvent event) { + private void processCannulaFilledEvent(String serial, CannulaFilledEvent event) { if (!sp.getBoolean(R.string.key_insight_log_site_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.CANNULA_CHANGE); + aapsLogger.debug(LTag.PUMP, "XXXX event Site Change time: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); + pumpSync.insertTherapyEventIfNewWithTimestamp( + timestamp, + DetailedBolusInfo.EventType.CANNULA_CHANGE, + "", + event.getEventPosition(), + PumpType.ACCU_CHEK_INSIGHT, + serial); } - private void processTotalDailyDoseEvent(TotalDailyDoseEvent event) { + private void processTotalDailyDoseEvent(String serial, TotalDailyDoseEvent event) { Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date(0)); calendar.set(Calendar.YEAR, event.getTotalYear()); calendar.set(Calendar.MONTH, event.getTotalMonth() - 1); calendar.set(Calendar.DAY_OF_MONTH, event.getTotalDay()); + aapsLogger.debug(LTag.PUMP, "XXXX event Daily Dose event day: " + event.getTotalYear() + "/" + (event.getTotalMonth() - 1) + "/" + event.getTotalDay() + " Basal: " + event.getBasalTotal() + " Bolus: " + event.getBolusTotal()); pumpSync.createOrUpdateTotalDailyDose( calendar.getTimeInMillis(), event.getBolusTotal(), @@ -1273,29 +1293,52 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai 0.0, // will be calculated automatically null, PumpType.ACCU_CHEK_INSIGHT, - serialNumber() - ); + serial); } - private void processTubeFilledEvent(TubeFilledEvent event) { + private void processTubeFilledEvent(String serial, TubeFilledEvent event) { if (!sp.getBoolean(R.string.key_insight_log_tube_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; logNote(timestamp, resourceHelper.gs(R.string.tube_changed)); + aapsLogger.debug(LTag.PUMP, "XXXX event Tube Change time: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); + pumpSync.insertTherapyEventIfNewWithTimestamp( + timestamp, + DetailedBolusInfo.EventType.INSULIN_CHANGE, + "", + event.getEventPosition(), + PumpType.ACCU_CHEK_INSIGHT, + serial); } - private void processSniffingDoneEvent(SniffingDoneEvent event) { + private void processSniffingDoneEvent(String serial, SniffingDoneEvent event) { if (!sp.getBoolean(R.string.key_insight_log_reservoir_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.INSULIN_CHANGE); + aapsLogger.debug(LTag.PUMP, "XXXX event Reservoir Change time: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); + pumpSync.insertTherapyEventIfNewWithTimestamp( + timestamp, + DetailedBolusInfo.EventType.INSULIN_CHANGE, + "", + event.getEventPosition(), + PumpType.ACCU_CHEK_INSIGHT, + serial); } - private void processPowerUpEvent(PowerUpEvent event) { + private void processPowerUpEvent(String serial, PowerUpEvent event) { if (!sp.getBoolean(R.string.key_insight_log_battery_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE); + aapsLogger.debug(LTag.PUMP, "XXXX event Battery Change time: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); + pumpSync.insertTherapyEventIfNewWithTimestamp( + timestamp, + DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE, + "", + null, + PumpType.ACCU_CHEK_INSIGHT, + serial); } private void processOperatingModeChangedEvent(String serial, List pumpStartedEvents, OperatingModeChangedEvent event) { @@ -1311,60 +1354,72 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai pumpStartedEvents.add(pumpID); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_started)); + aapsLogger.debug(LTag.PUMP, "XXXX event START Event TimeStamp: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; case STOPPED: pumpID.eventType = "PumpStopped"; if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_stopped)); + aapsLogger.debug(LTag.PUMP, "XXXX event STOP: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; case PAUSED: pumpID.eventType = "PumpPaused"; if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_paused)); + aapsLogger.debug(LTag.PUMP, "XXXX event Pause: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; } + // Move to Insight room database databaseHelper.createOrUpdate(pumpID); } private void processStartOfTBREvent(String serial, List temporaryBasals, StartOfTBREvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; + // Move to Insight room database InsightPumpID pumpID = new InsightPumpID(); pumpID.eventID = event.getEventPosition(); pumpID.pumpSerial = serial; pumpID.timestamp = timestamp; pumpID.eventType = "StartOfTBR"; databaseHelper.createOrUpdate(pumpID); - TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector()); - temporaryBasal.durationInMinutes = event.getDuration(); - temporaryBasal.source = Source.PUMP; - temporaryBasal.pumpId = pumpID.id; - temporaryBasal.percentRate = event.getAmount(); - temporaryBasal.isAbsolute = false; - temporaryBasal.date = timestamp; + // + TemporaryBasal temporaryBasal = new TemporaryBasal( + timestamp, + T.mins(event.getDuration()).msecs(), + event.getAmount(), + false, + PumpSync.TemporaryBasalType.NORMAL, + pumpID.id, + pumpID.eventID); // margin added because on several reeadHistory, timestamp could vary temporaryBasals.add(temporaryBasal); } private void processEndOfTBREvent(String serial, List temporaryBasals, EndOfTBREvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; + // Move to Insight room database InsightPumpID pumpID = new InsightPumpID(); pumpID.eventID = event.getEventPosition(); pumpID.pumpSerial = serial; pumpID.eventType = "EndOfTBR"; pumpID.timestamp = timestamp; databaseHelper.createOrUpdate(pumpID); - TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector()); - temporaryBasal.durationInMinutes = 0; - temporaryBasal.source = Source.PUMP; - temporaryBasal.pumpId = pumpID.id; - temporaryBasal.date = timestamp - 1500L; + TemporaryBasal temporaryBasal = new PumpSync.PumpState.TemporaryBasal( + timestamp - 1500L, + 0L, + 100.0, + false, + PumpSync.TemporaryBasalType.NORMAL, + pumpID.id, + pumpID.eventID); temporaryBasals.add(temporaryBasal); } private void processBolusProgrammedEvent(String serial, BolusProgrammedEvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; + // Move to Insight room database InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); if (bolusID != null && bolusID.endID != null) { bolusID.startID = event.getEventPosition(); @@ -1379,24 +1434,26 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai } bolusID.startID = event.getEventPosition(); databaseHelper.createOrUpdate(bolusID); + // if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) { - DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo(); - detailedBolusInfo.timestamp = bolusID.timestamp; - detailedBolusInfo.setPumpType(PumpType.ACCU_CHEK_INSIGHT); - detailedBolusInfo.setPumpSerial(serialNumber()); - detailedBolusInfo.setBolusPumpId(bolusID.id); - detailedBolusInfo.insulin = event.getImmediateAmount(); - treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true); + pumpSync.syncBolusWithPumpId( + bolusID.timestamp, + event.getImmediateAmount(), + null, + bolusID.id, + PumpType.ACCU_CHEK_INSIGHT, + serial); } if ((event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE)) { - ExtendedBolus extendedBolus = new ExtendedBolus(getInjector()); - extendedBolus.date = bolusID.timestamp; - extendedBolus.source = Source.PUMP; - extendedBolus.durationInMinutes = event.getDuration(); - extendedBolus.insulin = event.getExtendedAmount(); - extendedBolus.pumpId = bolusID.id; - if (profileFunction.getProfile(extendedBolus.date) != null) - treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); + if (profileFunction.getProfile(bolusID.timestamp) != null) + pumpSync.syncExtendedBolusWithPumpId( + bolusID.timestamp, + event.getExtendedAmount(), + T.mins(event.getDuration()).msecs(), + isFakingTempsByExtendedBoluses(), + bolusID.id, + PumpType.ACCU_CHEK_INSIGHT, + serial); } } @@ -1405,6 +1462,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; long startTimestamp = parseRelativeDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond(), event.getStartHour(), event.getStartMinute(), event.getStartSecond()) + timeOffset; + // Move to Insight room database InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); if (bolusID == null || bolusID.endID != null) { bolusID = new InsightBolusID(); @@ -1414,17 +1472,19 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai } bolusID.endID = event.getEventPosition(); databaseHelper.createOrUpdate(bolusID); + // if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) { - DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo(); - detailedBolusInfo.setBolusTimestamp(bolusID.timestamp); - detailedBolusInfo.setPumpType(PumpType.ACCU_CHEK_INSIGHT); - detailedBolusInfo.setPumpSerial(serialNumber()); - detailedBolusInfo.setBolusPumpId(bolusID.id); - detailedBolusInfo.insulin = event.getImmediateAmount(); - treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true); + pumpSync.syncBolusWithPumpId( + bolusID.timestamp, + event.getImmediateAmount(), + null, + bolusID.id, + PumpType.ACCU_CHEK_INSIGHT, + serial); } if (event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE) { if (event.getDuration() == 0) { + /* ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(bolusID.id); if (extendedBolus != null) { final String _id = extendedBolus._id; @@ -1432,15 +1492,18 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai // else uploadQueue.removeByMongoId("dbAdd", _id); databaseHelper.delete(extendedBolus); } + + */ } else { - ExtendedBolus extendedBolus = new ExtendedBolus(getInjector()); - extendedBolus.date = bolusID.timestamp; - extendedBolus.source = Source.PUMP; - extendedBolus.durationInMinutes = event.getDuration(); - extendedBolus.insulin = event.getExtendedAmount(); - extendedBolus.pumpId = bolusID.id; - if (profileFunction.getProfile(extendedBolus.date) != null) - treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); + if (profileFunction.getProfile(bolusID.timestamp) != null) + pumpSync.syncExtendedBolusWithPumpId( + bolusID.timestamp, + event.getExtendedAmount(), + T.mins(event.getDuration()).msecs(), + isFakingTempsByExtendedBoluses(), + bolusID.id, + PumpType.ACCU_CHEK_INSIGHT, + serial); } } } From 117fda424473c4dec073b337fdfb24d199ff6f59 Mon Sep 17 00:00:00 2001 From: Philoul Date: Wed, 5 May 2021 08:27:41 +0200 Subject: [PATCH 03/16] Fix SMB remove comment linked to previous version --- .../pump/insight/LocalInsightPlugin.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index ad06a368f0..de069a1f31 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -592,18 +592,17 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai // Move to Insight room database InsightBolusID insightBolusID = new InsightBolusID(); insightBolusID.bolusID = bolusID; - insightBolusID.timestamp = System.currentTimeMillis(); + insightBolusID.timestamp = dateUtil.now(); insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); databaseHelper.createOrUpdate(insightBolusID); aapsLogger.debug(LTag.PUMP, "XXXX set Bolus: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " amount: " + insulin); - /* - detailedBolusInfo.setBolusTimestamp(insightBolusID.timestamp); - detailedBolusInfo.setPumpType(PumpType.ACCU_CHEK_INSIGHT); - detailedBolusInfo.setPumpSerial(serialNumber()); - detailedBolusInfo.setBolusPumpId(insightBolusID.id); - treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true); - - */ + pumpSync.syncBolusWithPumpId( + insightBolusID.timestamp, + detailedBolusInfo.insulin, + detailedBolusInfo.getBolusType(), + insightBolusID.id, + PumpType.ACCU_CHEK_INSIGHT, + serialNumber()); while (true) { synchronized ($bolusLock) { if (bolusCancelled) break; @@ -755,7 +754,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai .enacted(true) .comment(R.string.virtualpump_resultok); aapsLogger.debug(LTag.PUMP, "XXXX Set Temp Basal timestamp: " + dateUtil.now() + " rate: " + percent + " duration: " + durationInMinutes); - fetchStatus(); // here I switched fetchStatus and readHistory (I noticed that we could miss the latest command sent to the pump if readHistory is before + fetchStatus(); readHistory(); } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); @@ -1492,7 +1491,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai // else uploadQueue.removeByMongoId("dbAdd", _id); databaseHelper.delete(extendedBolus); } - */ } else { if (profileFunction.getProfile(bolusID.timestamp) != null) From f789888afd8cc989900d66fff13b3cbc0d75e3ec Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 7 May 2021 10:21:34 +0200 Subject: [PATCH 04/16] Fix SMB remove comment linked to previous version --- .../dependencyInjection/AppComponent.kt | 4 +- .../maintenance/MaintenanceFragment.kt | 3 + insight/build.gradle | 12 + .../insight/di/InsightActivitiesModule.kt | 2 +- .../insight/di/InsightCommModule.kt | 2 +- .../insight/di/InsightDatabaseModule.kt | 23 ++ .../androidaps/insight/di/InsightModule.kt | 10 +- .../insight/di/InsightServicesModule.kt | 2 +- .../pump/insight/LocalInsightPlugin.java | 267 +++++++++++++----- .../pump/insight/database/InsightBolusID.kt | 18 ++ .../pump/insight/database/InsightDatabase.kt | 34 +++ .../insight/database/InsightDatabaseDao.kt | 28 ++ .../insight/database/InsightHistoryOffset.kt | 12 + .../pump/insight/database/InsightPumpID.kt | 17 ++ 14 files changed, 356 insertions(+), 78 deletions(-) create mode 100644 insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt create mode 100644 insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt create mode 100644 insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt create mode 100644 insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt create mode 100644 insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt create mode 100644 insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt index 05b5974bb5..1421d586ed 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt @@ -12,8 +12,9 @@ import info.nightscout.androidaps.di.CoreModule import info.nightscout.androidaps.dana.di.DanaModule import info.nightscout.androidaps.danar.di.DanaRModule import info.nightscout.androidaps.danars.di.DanaRSModule -import info.nightscout.androidaps.danars.di.InsightModule import info.nightscout.androidaps.database.DatabaseModule +import info.nightscout.androidaps.insight.di.InsightDatabaseModule +import info.nightscout.androidaps.insight.di.InsightModule import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodErosModule @@ -51,6 +52,7 @@ import javax.inject.Singleton DanaRSModule::class, ComboModule::class, InsightModule::class, + InsightDatabaseModule::class, WorkersModule::class, OHUploaderModule::class ] diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt index 8ff8dac818..67ea1166e5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt @@ -21,6 +21,7 @@ import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.bus.RxBusWrapper import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData +import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabase import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers @@ -39,6 +40,7 @@ class MaintenanceFragment : DaggerFragment() { @Inject lateinit var aapsSchedulers: AapsSchedulers @Inject lateinit var repository: AppRepository @Inject lateinit var danaHistoryDatabase: DanaHistoryDatabase + @Inject lateinit var insightDatabase: InsightDatabase @Inject lateinit var uel: UserEntryLogger @Inject lateinit var dataSyncSelector: DataSyncSelector @Inject lateinit var pumpSync: PumpSync @@ -70,6 +72,7 @@ class MaintenanceFragment : DaggerFragment() { fromAction { repository.clearDatabases() danaHistoryDatabase.clearAllTables() + insightDatabase.clearAllTables() dataSyncSelector.resetToNextFullSync() pumpSync.connectNewPump() } diff --git a/insight/build.gradle b/insight/build.gradle index 8020051b31..14391efbea 100644 --- a/insight/build.gradle +++ b/insight/build.gradle @@ -12,9 +12,21 @@ android { defaultConfig { versionCode 1 versionName "1.0" + kapt { + arguments { + arg("room.incremental", "true") + arg("room.schemaLocation", "$projectDir/schemas") + } + } } } dependencies { implementation project(':core') + + api "androidx.room:room-ktx:$room_version" + api "androidx.room:room-runtime:$room_version" + api "androidx.room:room-rxjava2:$room_version" + kapt "androidx.room:room-compiler:$room_version" + kapt "android.arch.persistence.room:compiler:$room_version" } \ No newline at end of file diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightActivitiesModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightActivitiesModule.kt index 7a3024a501..b65a707469 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightActivitiesModule.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightActivitiesModule.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.di +package info.nightscout.androidaps.insight.di import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt index 4aeed99770..7073ad14ae 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.di +package info.nightscout.androidaps.insight.di import dagger.Module diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt new file mode 100644 index 0000000000..c55a0481ad --- /dev/null +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt @@ -0,0 +1,23 @@ +package info.nightscout.androidaps.insight.di + +import android.content.Context +import dagger.Module +import dagger.Provides +import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabase +import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabaseDao +import javax.inject.Singleton + +@Module +class InsightDatabaseModule { + + @Provides + @Singleton + internal fun provideDatabase(context: Context): InsightDatabase = InsightDatabase.build(context) + + @Provides + @Singleton + internal fun provideInsightDatabaseDao(insightDatabase: InsightDatabase): InsightDatabaseDao = + insightDatabase.insightDatabaseDao() + + +} \ No newline at end of file diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightModule.kt index 59d3a3de2a..af2a086dbf 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightModule.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightModule.kt @@ -1,10 +1,14 @@ -package info.nightscout.androidaps.danars.di +package info.nightscout.androidaps.insight.di import dagger.Module +import dagger.android.ContributesAndroidInjector @Module(includes = [ InsightCommModule::class, InsightActivitiesModule::class, - InsightServicesModule::class + InsightServicesModule::class, + InsightDatabaseModule::class ]) -open class InsightModule \ No newline at end of file + +@Suppress("unused") +abstract class InsightModule \ No newline at end of file diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightServicesModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightServicesModule.kt index 3d9a4bc52e..1684d6f9de 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightServicesModule.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightServicesModule.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.danars.di +package info.nightscout.androidaps.insight.di import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index de069a1f31..0f605e87f5 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -33,9 +33,9 @@ import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.data.PumpEnactResult; -import info.nightscout.androidaps.db.InsightBolusID; -import info.nightscout.androidaps.db.InsightHistoryOffset; -import info.nightscout.androidaps.db.InsightPumpID; +//import info.nightscout.androidaps.db.InsightBolusID; +//import info.nightscout.androidaps.db.InsightHistoryOffset; +//import info.nightscout.androidaps.db.InsightPumpID; import info.nightscout.androidaps.events.EventInitializationChanged; import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.insight.R; @@ -43,7 +43,7 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider; import info.nightscout.androidaps.interfaces.Config; import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.Constraints; -import info.nightscout.androidaps.interfaces.DatabaseHelperInterface; +//import info.nightscout.androidaps.interfaces.DatabaseHelperInterface; import info.nightscout.androidaps.interfaces.PluginDescription; import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.interfaces.ProfileFunction; @@ -108,6 +108,10 @@ import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetPumpS import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetTotalDailyDoseMessage; import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.ResetPumpStatusRegisterMessage; import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService; +import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID; +import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabaseDao; +import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset; +import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR; @@ -143,7 +147,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private final ProfileFunction profileFunction; private final Context context; private final DateUtil dateUtil; - private final DatabaseHelperInterface databaseHelper; + private final InsightDatabaseDao insightDatabaseDao; private final PumpSync pumpSync; public static final String ALERT_CHANNEL_ID = "AndroidAPS-InsightAlert"; @@ -202,7 +206,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai Context context, Config config, DateUtil dateUtil, - DatabaseHelperInterface databaseHelper, + InsightDatabaseDao insightDatabaseDao, PumpSync pumpSync ) { super(new PluginDescription() @@ -224,7 +228,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai this.profileFunction = profileFunction; this.context = context; this.dateUtil = dateUtil; - this.databaseHelper = databaseHelper; + this.insightDatabaseDao = insightDatabaseDao; this.pumpSync = pumpSync; pumpDescription = new PumpDescription(); @@ -589,18 +593,28 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusingEvent.setPercent(0); rxBus.send(bolusingEvent); int trials = 0; - // Move to Insight room database - InsightBolusID insightBolusID = new InsightBolusID(); + Long now = dateUtil.now(); + String serial = serialNumber(); + insightDatabaseDao.createOrUpdate( new InsightBolusID( + now, + serial, + bolusID, + null, + null + )); + InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serial, bolusID, now); + /* insightBolusID.bolusID = bolusID; insightBolusID.timestamp = dateUtil.now(); insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); databaseHelper.createOrUpdate(insightBolusID); + */ aapsLogger.debug(LTag.PUMP, "XXXX set Bolus: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " amount: " + insulin); pumpSync.syncBolusWithPumpId( - insightBolusID.timestamp, + insightBolusID.getTimestamp(), detailedBolusInfo.insulin, detailedBolusInfo.getBolusType(), - insightBolusID.id, + insightBolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serialNumber()); while (true) { @@ -754,8 +768,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai .enacted(true) .comment(R.string.virtualpump_resultok); aapsLogger.debug(LTag.PUMP, "XXXX Set Temp Basal timestamp: " + dateUtil.now() + " rate: " + percent + " duration: " + durationInMinutes); - fetchStatus(); readHistory(); + fetchStatus(); } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); result.comment(ExceptionTranslator.getString(context, e)); @@ -797,11 +811,19 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusMessage.setImmediateAmount(0); bolusMessage.setVibration(disableVibration); int bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId(); - InsightBolusID insightBolusID = new InsightBolusID(); + insightDatabaseDao.createOrUpdate(new InsightBolusID( + dateUtil.now(), + serialNumber(), + bolusID, + null, + null + )); + /* insightBolusID.bolusID = bolusID; insightBolusID.timestamp = System.currentTimeMillis(); insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); databaseHelper.createOrUpdate(insightBolusID); + */ aapsLogger.debug(LTag.PUMP, "XXXX Set Extended timestamp: " + dateUtil.now() + " amount: " + insulin + "U duration: " + durationInMinutes + "BolusId: " + bolusID); result.success(true).enacted(true).comment(R.string.virtualpump_resultok); } catch (AppLayerErrorException e) { @@ -894,9 +916,22 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai connectionService.requestMessage(cancelBolusMessage).await(); confirmAlert(AlertType.WARNING_38); alertService.ignore(null); + InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serialNumber(), activeBolus.getBolusID(), dateUtil.now()); + /* InsightBolusID insightBolusID = databaseHelper.getInsightBolusID(connectionService.getPumpSystemIdentification().getSerialNumber(), activeBolus.getBolusID(), System.currentTimeMillis()); + + */ if (insightBolusID != null) { + PumpSync.PumpState.ExtendedBolus extendedBolus = pumpSync.expectedPumpState().getExtendedBolus(); + if (extendedBolus != null) { + if ((dateUtil.now()- extendedBolus.getTimestamp()) / 60000 <= 0) { + //final String _id = extendedBolus._id; + //databaseHelper.delete(extendedBolus); + } else { + //treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); + } + } /* Search in Insight room database PumpSync.PumpState.ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(insightBolusID.id); if (extendedBolus != null) { @@ -1129,11 +1164,11 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private void readHistory() { try { PumpTime pumpTime = connectionService.requestMessage(new GetDateTimeMessage()).await().getPumpTime(); - String pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); + String serial = serialNumber(); timeOffset = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() - parseDate(pumpTime.getYear(), pumpTime.getMonth(), pumpTime.getDay(), pumpTime.getHour(), pumpTime.getMinute(), pumpTime.getSecond()); - // Move to Insight room database - InsightHistoryOffset historyOffset = databaseHelper.getInsightHistoryOffset(pumpSerial); + InsightHistoryOffset historyOffset = insightDatabaseDao.getInsightHistoryOffset(serial); + //InsightHistoryOffset historyOffset = databaseHelper.getInsightHistoryOffset(pumpSerial); try { List historyEvents = new ArrayList<>(); if (historyOffset == null) { @@ -1145,7 +1180,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai } else { StartReadingHistoryMessage startMessage = new StartReadingHistoryMessage(); startMessage.setDirection(HistoryReadingDirection.FORWARD); - startMessage.setOffset(historyOffset.offset + 1); + startMessage.setOffset(historyOffset.getOffset() + 1); connectionService.requestMessage(startMessage).await(); while (true) { List newEvents = connectionService.requestMessage(new ReadHistoryEventsMessage()).await().getHistoryEvents(); @@ -1155,13 +1190,18 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai } Collections.sort(historyEvents); Collections.reverse(historyEvents); - if (historyOffset != null) processHistoryEvents(pumpSerial, historyEvents); + if (historyOffset != null) processHistoryEvents(serial, historyEvents); if (historyEvents.size() > 0) { - // Move to Insight room database + historyOffset = new InsightHistoryOffset( + serial, + historyEvents.get(0).getEventPosition()); + insightDatabaseDao.createOrUpdate(historyOffset); + /* historyOffset = new InsightHistoryOffset(); historyOffset.pumpSerial = pumpSerial; historyOffset.offset = historyEvents.get(0).getEventPosition(); databaseHelper.createOrUpdate(historyOffset); + */ } } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); @@ -1194,22 +1234,29 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai Collections.reverse(temporaryBasals); for (InsightPumpID pumpID : pumpStartedEvents) { - InsightPumpID stoppedEvent = databaseHelper.getPumpStoppedEvent(pumpID.pumpSerial, pumpID.timestamp); - if (stoppedEvent == null || stoppedEvent.eventType.equals("PumpPaused")) continue; - long tbrStart = stoppedEvent.timestamp + 10000; + InsightPumpID stoppedEvent = insightDatabaseDao.getPumpStoppedEvent(pumpID.getPumpSerial(), pumpID.getTimestamp()); + if (stoppedEvent != null && stoppedEvent.getEventType().equals("PumpStopped")) { // Search if Stop event is after 15min of Pause + InsightPumpID pauseEvent = insightDatabaseDao.getPumpStoppedEvent(pumpID.getPumpSerial(), stoppedEvent.getTimestamp() - T.mins(1).msecs()); + if (pauseEvent != null && pauseEvent.getEventType().equals("PumpPaused") && (stoppedEvent.getTimestamp() - pauseEvent.getTimestamp() < T.mins(16).msecs())) { + stoppedEvent = pauseEvent; + stoppedEvent.setEventType("PumpStopped"); + } + } + if (stoppedEvent == null || stoppedEvent.getEventType().equals("PumpPaused")) continue; + long tbrStart = stoppedEvent.getTimestamp() + 10000; TemporaryBasal temporaryBasal = new TemporaryBasal( tbrStart, - pumpID.timestamp - tbrStart, + pumpID.getTimestamp() - tbrStart, 0, false, PumpSync.TemporaryBasalType.NORMAL, - pumpID.id, - pumpID.id); + pumpID.getId(), + pumpID.getEventID()); temporaryBasals.add(temporaryBasal); } temporaryBasals.sort((o1, o2) -> (int) (o1.getTimestamp() - o2.getTimestamp())); for (TemporaryBasal temporaryBasal : temporaryBasals) { - if (temporaryBasal.getRate() == 100.0) { // for Stop TBR event rate = 100.0 + if (temporaryBasal.getDuration() == 0L) { // for Stop TBR event duration = 0L pumpSync.syncStopTemporaryBasalWithPumpId( temporaryBasal.getTimestamp(), temporaryBasal.getPumpId(), @@ -1217,7 +1264,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai serial); } if (temporaryBasal.getRate() != 100.0){ - Boolean resultdb = pumpSync.syncTemporaryBasalWithPumpId( + pumpSync.syncTemporaryBasalWithPumpId( temporaryBasal.getTimestamp(), temporaryBasal.getRate(), temporaryBasal.getDuration(), @@ -1290,7 +1337,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai event.getBolusTotal(), event.getBasalTotal(), 0.0, // will be calculated automatically - null, + event.getEventPosition(), PumpType.ACCU_CHEK_INSIGHT, serial); } @@ -1335,7 +1382,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai timestamp, DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE, "", - null, + event.getEventPosition(), PumpType.ACCU_CHEK_INSIGHT, serial); } @@ -1343,45 +1390,57 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private void processOperatingModeChangedEvent(String serial, List pumpStartedEvents, OperatingModeChangedEvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - InsightPumpID pumpID = new InsightPumpID(); - pumpID.eventID = event.getEventPosition(); + InsightPumpID pumpID = new InsightPumpID( + timestamp, + "", + serial, + event.getEventPosition()); + /* + pumpID.EventID = event.getEventPosition(); pumpID.pumpSerial = serial; pumpID.timestamp = timestamp; + */ switch (event.getNewValue()) { case STARTED: - pumpID.eventType = "PumpStarted"; + pumpID.setEventType("PumpStarted"); pumpStartedEvents.add(pumpID); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_started)); aapsLogger.debug(LTag.PUMP, "XXXX event START Event TimeStamp: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; case STOPPED: - pumpID.eventType = "PumpStopped"; + pumpID.setEventType("PumpStopped"); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_stopped)); aapsLogger.debug(LTag.PUMP, "XXXX event STOP: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; case PAUSED: - pumpID.eventType = "PumpPaused"; + pumpID.setEventType("PumpPaused"); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_paused)); aapsLogger.debug(LTag.PUMP, "XXXX event Pause: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; } - // Move to Insight room database - databaseHelper.createOrUpdate(pumpID); + // databaseHelper.createOrUpdate(pumpID); + insightDatabaseDao.createOrUpdate(pumpID); } private void processStartOfTBREvent(String serial, List temporaryBasals, StartOfTBREvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - // Move to Insight room database - InsightPumpID pumpID = new InsightPumpID(); + InsightPumpID pumpID = new InsightPumpID( + timestamp, + "StartOfTBR", + serial, + event.getEventPosition()); + insightDatabaseDao.createOrUpdate(pumpID); + /* pumpID.eventID = event.getEventPosition(); pumpID.pumpSerial = serial; pumpID.timestamp = timestamp; pumpID.eventType = "StartOfTBR"; databaseHelper.createOrUpdate(pumpID); + */ // TemporaryBasal temporaryBasal = new TemporaryBasal( timestamp, @@ -1389,70 +1448,107 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai event.getAmount(), false, PumpSync.TemporaryBasalType.NORMAL, - pumpID.id, - pumpID.eventID); // margin added because on several reeadHistory, timestamp could vary + pumpID.getEventID(), + pumpID.getEventID()); // margin added because on several reeadHistory, timestamp could vary temporaryBasals.add(temporaryBasal); } private void processEndOfTBREvent(String serial, List temporaryBasals, EndOfTBREvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - // Move to Insight room database - InsightPumpID pumpID = new InsightPumpID(); + InsightPumpID pumpID = new InsightPumpID( + timestamp - 1500L, + "EndOfTBR", + serial, + event.getEventPosition()); + insightDatabaseDao.createOrUpdate(pumpID); + /* pumpID.eventID = event.getEventPosition(); pumpID.pumpSerial = serial; pumpID.eventType = "EndOfTBR"; pumpID.timestamp = timestamp; databaseHelper.createOrUpdate(pumpID); + */ TemporaryBasal temporaryBasal = new PumpSync.PumpState.TemporaryBasal( timestamp - 1500L, 0L, 100.0, false, PumpSync.TemporaryBasalType.NORMAL, - pumpID.id, - pumpID.eventID); + pumpID.getId(), + pumpID.getEventID()); temporaryBasals.add(temporaryBasal); } private void processBolusProgrammedEvent(String serial, BolusProgrammedEvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - // Move to Insight room database - InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); - if (bolusID != null && bolusID.endID != null) { - bolusID.startID = event.getEventPosition(); - databaseHelper.createOrUpdate(bolusID); + InsightBolusID bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); + //InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); + if (bolusID != null && bolusID.getEndID() != null) { + bolusID.setStartID(event.getEventPosition()); + insightDatabaseDao.createOrUpdate(bolusID); + //databaseHelper.createOrUpdate(bolusID); return; } - if (bolusID == null || bolusID.startID != null) { - bolusID = new InsightBolusID(); + if (bolusID == null || bolusID.getStartID() != null) { + insightDatabaseDao.createOrUpdate(new InsightBolusID( + timestamp, + serial, + event.getBolusID(), + event.getEventPosition(), + null + )); + bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); + /* + bolusID = new info.nightscout.androidaps.db.InsightBolusID(); bolusID.timestamp = timestamp; bolusID.bolusID = event.getBolusID(); bolusID.pumpSerial = serial; + */ } - bolusID.startID = event.getEventPosition(); - databaseHelper.createOrUpdate(bolusID); - // + bolusID.setStartID(event.getEventPosition()); + insightDatabaseDao.createOrUpdate(bolusID); + + //databaseHelper.createOrUpdate(bolusID); if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) { pumpSync.syncBolusWithPumpId( - bolusID.timestamp, + bolusID.getTimestamp(), event.getImmediateAmount(), null, - bolusID.id, + bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); + /* + DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo(); + detailedBolusInfo.timestamp = bolusID.timestamp; + detailedBolusInfo.setPumpType(PumpType.ACCU_CHEK_INSIGHT); + detailedBolusInfo.setPumpSerial(serialNumber()); + detailedBolusInfo.setBolusPumpId(bolusID.id); + detailedBolusInfo.insulin = event.getImmediateAmount(); + treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true); + */ } if ((event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE)) { - if (profileFunction.getProfile(bolusID.timestamp) != null) + if (profileFunction.getProfile(bolusID.getTimestamp()) != null) pumpSync.syncExtendedBolusWithPumpId( - bolusID.timestamp, + bolusID.getTimestamp(), event.getExtendedAmount(), T.mins(event.getDuration()).msecs(), isFakingTempsByExtendedBoluses(), - bolusID.id, + bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); + /* + ExtendedBolus extendedBolus = new ExtendedBolus(getInjector()); + extendedBolus.date = bolusID.timestamp; + extendedBolus.source = Source.PUMP; + extendedBolus.durationInMinutes = event.getDuration(); + extendedBolus.insulin = event.getExtendedAmount(); + extendedBolus.pumpId = bolusID.id; + if (profileFunction.getProfile(extendedBolus.date) != null) + treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); + */ } } @@ -1461,25 +1557,44 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; long startTimestamp = parseRelativeDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond(), event.getStartHour(), event.getStartMinute(), event.getStartSecond()) + timeOffset; - // Move to Insight room database - InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); - if (bolusID == null || bolusID.endID != null) { - bolusID = new InsightBolusID(); + InsightBolusID bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); + //InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); + if (bolusID == null || bolusID.getEndID() != null) { + bolusID = new InsightBolusID( + startTimestamp, + serial, + event.getBolusID(), + bolusID == null ? event.getEventPosition() : bolusID.getStartID(), + event.getEventPosition() + ); + /* + bolusID = new InsightBolusID(); bolusID.timestamp = startTimestamp; bolusID.bolusID = event.getBolusID(); bolusID.pumpSerial = serial; + */ } - bolusID.endID = event.getEventPosition(); - databaseHelper.createOrUpdate(bolusID); - // + bolusID.setEndID(event.getEventPosition()); + insightDatabaseDao.createOrUpdate(bolusID); + bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), startTimestamp); // Line added to get id + //databaseHelper.createOrUpdate(bolusID); if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) { pumpSync.syncBolusWithPumpId( - bolusID.timestamp, + bolusID.getTimestamp(), event.getImmediateAmount(), null, - bolusID.id, + bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); + /* + DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo(); + detailedBolusInfo.setBolusTimestamp(bolusID.timestamp); + detailedBolusInfo.setPumpType(PumpType.ACCU_CHEK_INSIGHT); + detailedBolusInfo.setPumpSerial(serialNumber()); + detailedBolusInfo.setBolusPumpId(bolusID.id); + detailedBolusInfo.insulin = event.getImmediateAmount(); + treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true); + */ } if (event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE) { if (event.getDuration() == 0) { @@ -1493,15 +1608,25 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai } */ } else { - if (profileFunction.getProfile(bolusID.timestamp) != null) + if (profileFunction.getProfile(bolusID.getTimestamp()) != null) pumpSync.syncExtendedBolusWithPumpId( - bolusID.timestamp, + bolusID.getTimestamp(), event.getExtendedAmount(), T.mins(event.getDuration()).msecs(), isFakingTempsByExtendedBoluses(), - bolusID.id, + bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); + /* + ExtendedBolus extendedBolus = new ExtendedBolus(getInjector()); + extendedBolus.date = bolusID.timestamp; + extendedBolus.source = Source.PUMP; + extendedBolus.durationInMinutes = event.getDuration(); + extendedBolus.insulin = event.getExtendedAmount(); + extendedBolus.pumpId = bolusID.id; + if (profileFunction.getProfile(extendedBolus.date) != null) + treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); + */ } } } diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt new file mode 100644 index 0000000000..fba16c1767 --- /dev/null +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt @@ -0,0 +1,18 @@ +package info.nightscout.androidaps.plugins.pump.insight.database + +import androidx.room.Entity +import androidx.room.Index +import androidx.room.PrimaryKey + +@Entity(tableName = DATABASE_INSIGHT_BOLUS_IDS, + indices = [Index("bolusID")]) +data class InsightBolusID( + var timestamp: Long, + var pumpSerial: String? = "None", + var bolusID: Int? = null, + var startID: Long? = null, + var endID: Long? = null +) { + @PrimaryKey(autoGenerate = true) + var id: Long = 0 +} \ No newline at end of file diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt new file mode 100644 index 0000000000..0ea04dd351 --- /dev/null +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt @@ -0,0 +1,34 @@ +package info.nightscout.androidaps.plugins.pump.insight.database + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase + +const val DATABASE_INSIGHT_BOLUS_IDS = "insightBolusIDs" +const val DATABASE_INSIGHT_PUMP_IDS = "insightPumpIDs" +const val DATABASE_INSIGHT_HISTORY_OFFSETS = "insightHistoryOffsets" + +@Database( + entities = [InsightBolusID::class, InsightHistoryOffset::class, InsightPumpID::class], + exportSchema = true, + version = InsightDatabase.VERSION +) +abstract class InsightDatabase : RoomDatabase() { + + abstract fun insightDatabaseDao(): InsightDatabaseDao + + companion object { + + const val VERSION = 1 + + fun build(context: Context) = + Room.databaseBuilder( + context.applicationContext, + InsightDatabase::class.java, + "insight_database.db" + ) + .fallbackToDestructiveMigration() + .build() + } +} diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt new file mode 100644 index 0000000000..9d00b3a49f --- /dev/null +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt @@ -0,0 +1,28 @@ +package info.nightscout.androidaps.plugins.pump.insight.database + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query + +@Dao +abstract class InsightDatabaseDao { + + @Query("SELECT * from $DATABASE_INSIGHT_BOLUS_IDS WHERE pumpSerial = :pumpSerial AND timestamp >= :timestamp - 259200000 AND timestamp <= :timestamp + 259200000 AND bolusID = :bolusID") + abstract fun getInsightBolusID(pumpSerial: String, bolusID: Int, timestamp: Long): InsightBolusID? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + abstract fun createOrUpdate(insightBolusID: InsightBolusID) + + @Query("SELECT * from $DATABASE_INSIGHT_HISTORY_OFFSETS WHERE pumpSerial = :pumpSerial") + abstract fun getInsightHistoryOffset(pumpSerial: String): InsightHistoryOffset? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + abstract fun createOrUpdate(insightHistoryOffset: InsightHistoryOffset) + + @Query("SELECT * from $DATABASE_INSIGHT_PUMP_IDS WHERE pumpSerial = :pumpSerial AND (eventType = 'PumpStopped' OR eventType = 'PumpPaused') AND timestamp < :timestamp ORDER BY timestamp DESC") + abstract fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long): InsightPumpID? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + abstract fun createOrUpdate(insightPumpID: InsightPumpID) +} diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt new file mode 100644 index 0000000000..9a94d37175 --- /dev/null +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt @@ -0,0 +1,12 @@ +package info.nightscout.androidaps.plugins.pump.insight.database + +import androidx.room.Entity +import androidx.room.Index +import androidx.room.PrimaryKey + +@Entity(tableName = DATABASE_INSIGHT_HISTORY_OFFSETS, + indices = [Index("pumpSerial")]) +data class InsightHistoryOffset( + @PrimaryKey val pumpSerial: String, + var offset: Long + ) diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt new file mode 100644 index 0000000000..24e38862cc --- /dev/null +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt @@ -0,0 +1,17 @@ +package info.nightscout.androidaps.plugins.pump.insight.database + +import androidx.room.Entity +import androidx.room.Index +import androidx.room.PrimaryKey + +@Entity(tableName = DATABASE_INSIGHT_PUMP_IDS, + indices = [Index("timestamp")]) +data class InsightPumpID( + var timestamp: Long, + var eventType: String? = null, + var pumpSerial: String? = "None", + @PrimaryKey + var eventID: Long +) { + fun getId(): Long = eventID +} \ No newline at end of file From ed7dcea38ee756e739c89c5f2eda484e2c9c5cb9 Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 7 May 2021 10:41:45 +0200 Subject: [PATCH 05/16] Clean Code, remove old code and add some Todo for verification and tests --- .../pump/insight/LocalInsightPlugin.java | 151 +++--------------- 1 file changed, 19 insertions(+), 132 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index 0f605e87f5..71a71f3f8b 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -33,9 +33,6 @@ import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.data.PumpEnactResult; -//import info.nightscout.androidaps.db.InsightBolusID; -//import info.nightscout.androidaps.db.InsightHistoryOffset; -//import info.nightscout.androidaps.db.InsightPumpID; import info.nightscout.androidaps.events.EventInitializationChanged; import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.insight.R; @@ -43,7 +40,6 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider; import info.nightscout.androidaps.interfaces.Config; import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.Constraints; -//import info.nightscout.androidaps.interfaces.DatabaseHelperInterface; import info.nightscout.androidaps.interfaces.PluginDescription; import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.interfaces.ProfileFunction; @@ -603,12 +599,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai null )); InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serial, bolusID, now); - /* - insightBolusID.bolusID = bolusID; - insightBolusID.timestamp = dateUtil.now(); - insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); - databaseHelper.createOrUpdate(insightBolusID); - */ aapsLogger.debug(LTag.PUMP, "XXXX set Bolus: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " amount: " + insulin); pumpSync.syncBolusWithPumpId( insightBolusID.getTimestamp(), @@ -818,12 +808,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai null, null )); - /* - insightBolusID.bolusID = bolusID; - insightBolusID.timestamp = System.currentTimeMillis(); - insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber(); - databaseHelper.createOrUpdate(insightBolusID); - */ aapsLogger.debug(LTag.PUMP, "XXXX Set Extended timestamp: " + dateUtil.now() + " amount: " + insulin + "U duration: " + durationInMinutes + "BolusId: " + bolusID); result.success(true).enacted(true).comment(R.string.virtualpump_resultok); } catch (AppLayerErrorException e) { @@ -917,22 +901,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai confirmAlert(AlertType.WARNING_38); alertService.ignore(null); InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serialNumber(), activeBolus.getBolusID(), dateUtil.now()); - /* - InsightBolusID insightBolusID = databaseHelper.getInsightBolusID(connectionService.getPumpSystemIdentification().getSerialNumber(), - activeBolus.getBolusID(), System.currentTimeMillis()); - - */ if (insightBolusID != null) { - PumpSync.PumpState.ExtendedBolus extendedBolus = pumpSync.expectedPumpState().getExtendedBolus(); - if (extendedBolus != null) { - if ((dateUtil.now()- extendedBolus.getTimestamp()) / 60000 <= 0) { - //final String _id = extendedBolus._id; - //databaseHelper.delete(extendedBolus); - } else { - //treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); - } - } - /* Search in Insight room database + /* TODO() I don't know if we can remove bolck below (there is a readHistory after that will update AAPS database) PumpSync.PumpState.ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(insightBolusID.id); if (extendedBolus != null) { extendedBolus.durationInMinutes = (int) ((System.currentTimeMillis() - extendedBolus.date) / 60000); @@ -1168,7 +1138,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai timeOffset = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() - parseDate(pumpTime.getYear(), pumpTime.getMonth(), pumpTime.getDay(), pumpTime.getHour(), pumpTime.getMinute(), pumpTime.getSecond()); InsightHistoryOffset historyOffset = insightDatabaseDao.getInsightHistoryOffset(serial); - //InsightHistoryOffset historyOffset = databaseHelper.getInsightHistoryOffset(pumpSerial); try { List historyEvents = new ArrayList<>(); if (historyOffset == null) { @@ -1192,16 +1161,10 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai Collections.reverse(historyEvents); if (historyOffset != null) processHistoryEvents(serial, historyEvents); if (historyEvents.size() > 0) { - historyOffset = new InsightHistoryOffset( + insightDatabaseDao.createOrUpdate(new InsightHistoryOffset( serial, - historyEvents.get(0).getEventPosition()); - insightDatabaseDao.createOrUpdate(historyOffset); - /* - historyOffset = new InsightHistoryOffset(); - historyOffset.pumpSerial = pumpSerial; - historyOffset.offset = historyEvents.get(0).getEventPosition(); - databaseHelper.createOrUpdate(historyOffset); - */ + historyEvents.get(0).getEventPosition()) + ); } } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); @@ -1395,11 +1358,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai "", serial, event.getEventPosition()); - /* - pumpID.EventID = event.getEventPosition(); - pumpID.pumpSerial = serial; - pumpID.timestamp = timestamp; - */ switch (event.getNewValue()) { case STARTED: pumpID.setEventType("PumpStarted"); @@ -1421,62 +1379,47 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai aapsLogger.debug(LTag.PUMP, "XXXX event Pause: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; } - // databaseHelper.createOrUpdate(pumpID); insightDatabaseDao.createOrUpdate(pumpID); } private void processStartOfTBREvent(String serial, List temporaryBasals, StartOfTBREvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - InsightPumpID pumpID = new InsightPumpID( + insightDatabaseDao.createOrUpdate(new InsightPumpID( timestamp, "StartOfTBR", serial, - event.getEventPosition()); - insightDatabaseDao.createOrUpdate(pumpID); - /* - pumpID.eventID = event.getEventPosition(); - pumpID.pumpSerial = serial; - pumpID.timestamp = timestamp; - pumpID.eventType = "StartOfTBR"; - databaseHelper.createOrUpdate(pumpID); - */ - // + event.getEventPosition()) + ); TemporaryBasal temporaryBasal = new TemporaryBasal( timestamp, T.mins(event.getDuration()).msecs(), event.getAmount(), false, PumpSync.TemporaryBasalType.NORMAL, - pumpID.getEventID(), - pumpID.getEventID()); // margin added because on several reeadHistory, timestamp could vary + event.getEventPosition(), + event.getEventPosition()); temporaryBasals.add(temporaryBasal); } private void processEndOfTBREvent(String serial, List temporaryBasals, EndOfTBREvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - InsightPumpID pumpID = new InsightPumpID( + insightDatabaseDao.createOrUpdate(new InsightPumpID( timestamp - 1500L, "EndOfTBR", serial, - event.getEventPosition()); - insightDatabaseDao.createOrUpdate(pumpID); - /* - pumpID.eventID = event.getEventPosition(); - pumpID.pumpSerial = serial; - pumpID.eventType = "EndOfTBR"; - pumpID.timestamp = timestamp; - databaseHelper.createOrUpdate(pumpID); - */ + event.getEventPosition()) + ); + TemporaryBasal temporaryBasal = new PumpSync.PumpState.TemporaryBasal( timestamp - 1500L, 0L, 100.0, false, PumpSync.TemporaryBasalType.NORMAL, - pumpID.getId(), - pumpID.getEventID()); + event.getEventPosition(), + event.getEventPosition()); temporaryBasals.add(temporaryBasal); } @@ -1484,14 +1427,12 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; InsightBolusID bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); - //InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); - if (bolusID != null && bolusID.getEndID() != null) { + if (bolusID != null && bolusID.getEndID() != null) { // TODO() Check if test EndID is necessary bolusID.setStartID(event.getEventPosition()); insightDatabaseDao.createOrUpdate(bolusID); - //databaseHelper.createOrUpdate(bolusID); return; } - if (bolusID == null || bolusID.getStartID() != null) { + if (bolusID == null || bolusID.getStartID() != null) { // TODO() Check StartID test is necessary insightDatabaseDao.createOrUpdate(new InsightBolusID( timestamp, serial, @@ -1500,17 +1441,10 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai null )); bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); - /* - bolusID = new info.nightscout.androidaps.db.InsightBolusID(); - bolusID.timestamp = timestamp; - bolusID.bolusID = event.getBolusID(); - bolusID.pumpSerial = serial; - */ } bolusID.setStartID(event.getEventPosition()); insightDatabaseDao.createOrUpdate(bolusID); - //databaseHelper.createOrUpdate(bolusID); if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) { pumpSync.syncBolusWithPumpId( bolusID.getTimestamp(), @@ -1519,15 +1453,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); - /* - DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo(); - detailedBolusInfo.timestamp = bolusID.timestamp; - detailedBolusInfo.setPumpType(PumpType.ACCU_CHEK_INSIGHT); - detailedBolusInfo.setPumpSerial(serialNumber()); - detailedBolusInfo.setBolusPumpId(bolusID.id); - detailedBolusInfo.insulin = event.getImmediateAmount(); - treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true); - */ } if ((event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE)) { if (profileFunction.getProfile(bolusID.getTimestamp()) != null) @@ -1539,16 +1464,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); - /* - ExtendedBolus extendedBolus = new ExtendedBolus(getInjector()); - extendedBolus.date = bolusID.timestamp; - extendedBolus.source = Source.PUMP; - extendedBolus.durationInMinutes = event.getDuration(); - extendedBolus.insulin = event.getExtendedAmount(); - extendedBolus.pumpId = bolusID.id; - if (profileFunction.getProfile(extendedBolus.date) != null) - treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); - */ } } @@ -1558,8 +1473,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai long startTimestamp = parseRelativeDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond(), event.getStartHour(), event.getStartMinute(), event.getStartSecond()) + timeOffset; InsightBolusID bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); - //InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); - if (bolusID == null || bolusID.getEndID() != null) { + if (bolusID == null || bolusID.getEndID() != null) { // TODO() Check if test EndID is necessary bolusID = new InsightBolusID( startTimestamp, serial, @@ -1567,12 +1481,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusID == null ? event.getEventPosition() : bolusID.getStartID(), event.getEventPosition() ); - /* - bolusID = new InsightBolusID(); - bolusID.timestamp = startTimestamp; - bolusID.bolusID = event.getBolusID(); - bolusID.pumpSerial = serial; - */ } bolusID.setEndID(event.getEventPosition()); insightDatabaseDao.createOrUpdate(bolusID); @@ -1586,24 +1494,13 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); - /* - DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo(); - detailedBolusInfo.setBolusTimestamp(bolusID.timestamp); - detailedBolusInfo.setPumpType(PumpType.ACCU_CHEK_INSIGHT); - detailedBolusInfo.setPumpSerial(serialNumber()); - detailedBolusInfo.setBolusPumpId(bolusID.id); - detailedBolusInfo.insulin = event.getImmediateAmount(); - treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true); - */ } if (event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE) { if (event.getDuration() == 0) { - /* + /* TODO() Check if we can remove this block ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(bolusID.id); if (extendedBolus != null) { final String _id = extendedBolus._id; -// if (NSUpload.isIdValid(_id)) nsUpload.removeCareportalEntryFromNS(_id); -// else uploadQueue.removeByMongoId("dbAdd", _id); databaseHelper.delete(extendedBolus); } */ @@ -1617,16 +1514,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); - /* - ExtendedBolus extendedBolus = new ExtendedBolus(getInjector()); - extendedBolus.date = bolusID.timestamp; - extendedBolus.source = Source.PUMP; - extendedBolus.durationInMinutes = event.getDuration(); - extendedBolus.insulin = event.getExtendedAmount(); - extendedBolus.pumpId = bolusID.id; - if (profileFunction.getProfile(extendedBolus.date) != null) - treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); - */ } } } From dfd6c6e859d14788dc6d0af8011a69169c8ede19 Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 7 May 2021 11:21:47 +0200 Subject: [PATCH 06/16] Move Insight database package outside plugins\pump --- .../plugins/general/maintenance/MaintenanceFragment.kt | 2 +- .../{plugins/pump => }/insight/database/InsightBolusID.kt | 2 +- .../pump => }/insight/database/InsightDatabase.kt | 2 +- .../pump => }/insight/database/InsightDatabaseDao.kt | 2 +- .../pump => }/insight/database/InsightHistoryOffset.kt | 2 +- .../{plugins/pump => }/insight/database/InsightPumpID.kt | 2 +- .../androidaps/insight/di/InsightDatabaseModule.kt | 4 ++-- .../plugins/pump/insight/LocalInsightPlugin.java | 8 ++++---- 8 files changed, 12 insertions(+), 12 deletions(-) rename insight/src/main/java/info/nightscout/androidaps/{plugins/pump => }/insight/database/InsightBolusID.kt (86%) rename insight/src/main/java/info/nightscout/androidaps/{plugins/pump => }/insight/database/InsightDatabase.kt (93%) rename insight/src/main/java/info/nightscout/androidaps/{plugins/pump => }/insight/database/InsightDatabaseDao.kt (95%) rename insight/src/main/java/info/nightscout/androidaps/{plugins/pump => }/insight/database/InsightHistoryOffset.kt (81%) rename insight/src/main/java/info/nightscout/androidaps/{plugins/pump => }/insight/database/InsightPumpID.kt (85%) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt index 67ea1166e5..36df705147 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt @@ -13,6 +13,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Action import info.nightscout.androidaps.database.entities.UserEntry.Sources import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding import info.nightscout.androidaps.events.EventNewBG +import info.nightscout.androidaps.insight.database.InsightDatabase import info.nightscout.androidaps.interfaces.DataSyncSelector import info.nightscout.androidaps.interfaces.ImportExportPrefs import info.nightscout.androidaps.interfaces.PumpSync @@ -21,7 +22,6 @@ import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.bus.RxBusWrapper import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData -import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabase import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt similarity index 86% rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt index fba16c1767..4546409145 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.insight.database +package info.nightscout.androidaps.insight.database import androidx.room.Entity import androidx.room.Index diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt similarity index 93% rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt index 0ea04dd351..e7e45423a4 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.insight.database +package info.nightscout.androidaps.insight.database import android.content.Context import androidx.room.Database diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt similarity index 95% rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt index 9d00b3a49f..7bffe694ef 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.insight.database +package info.nightscout.androidaps.insight.database import androidx.room.Dao import androidx.room.Insert diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightHistoryOffset.kt similarity index 81% rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightHistoryOffset.kt index 9a94d37175..8c1d45111c 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightHistoryOffset.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.insight.database +package info.nightscout.androidaps.insight.database import androidx.room.Entity import androidx.room.Index diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt similarity index 85% rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt index 24e38862cc..901c04a2b8 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.insight.database +package info.nightscout.androidaps.insight.database import androidx.room.Entity import androidx.room.Index diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt index c55a0481ad..251c372cbd 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt @@ -3,8 +3,8 @@ package info.nightscout.androidaps.insight.di import android.content.Context import dagger.Module import dagger.Provides -import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabase -import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabaseDao +import info.nightscout.androidaps.insight.database.InsightDatabase +import info.nightscout.androidaps.insight.database.InsightDatabaseDao import javax.inject.Singleton @Module diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index 71a71f3f8b..f6f80dcb4c 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -35,6 +35,10 @@ import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.events.EventInitializationChanged; import info.nightscout.androidaps.events.EventRefreshOverview; +import info.nightscout.androidaps.insight.database.InsightBolusID; +import info.nightscout.androidaps.insight.database.InsightDatabaseDao; +import info.nightscout.androidaps.insight.database.InsightHistoryOffset; +import info.nightscout.androidaps.insight.database.InsightPumpID; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.interfaces.CommandQueueProvider; import info.nightscout.androidaps.interfaces.Config; @@ -104,10 +108,6 @@ import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetPumpS import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetTotalDailyDoseMessage; import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.ResetPumpStatusRegisterMessage; import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService; -import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID; -import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabaseDao; -import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset; -import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR; From 0ea9c984693c76a6381ed44326d297d4789ad12d Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 7 May 2021 23:54:02 +0200 Subject: [PATCH 07/16] Replace hard coded strings for EventType by enum --- .../androidaps/insight/database/Converters.kt | 11 ++++++ .../insight/database/InsightBolusID.kt | 4 +-- .../insight/database/InsightDatabase.kt | 2 ++ .../insight/database/InsightDatabaseDao.kt | 7 ++-- .../insight/database/InsightPumpID.kt | 13 +++++-- .../pump/insight/LocalInsightPlugin.java | 36 +++++++++---------- 6 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 insight/src/main/java/info/nightscout/androidaps/insight/database/Converters.kt diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/Converters.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/Converters.kt new file mode 100644 index 0000000000..76a60cd1e6 --- /dev/null +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/Converters.kt @@ -0,0 +1,11 @@ +package info.nightscout.androidaps.insight.database + +import androidx.room.TypeConverter + +class Converters { + @TypeConverter + fun fromEventType(evenType: InsightPumpID.EventType) = evenType.name + + @TypeConverter + fun toEventType(evenType: String?) = evenType?.let { InsightPumpID.EventType.valueOf(it) } +} \ No newline at end of file diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt index 4546409145..99b6055c7f 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt @@ -8,8 +8,8 @@ import androidx.room.PrimaryKey indices = [Index("bolusID")]) data class InsightBolusID( var timestamp: Long, - var pumpSerial: String? = "None", - var bolusID: Int? = null, + val pumpSerial: String? = null, + val bolusID: Int? = null, var startID: Long? = null, var endID: Long? = null ) { diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt index e7e45423a4..7be27eae76 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt @@ -4,6 +4,7 @@ import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase +import androidx.room.TypeConverters const val DATABASE_INSIGHT_BOLUS_IDS = "insightBolusIDs" const val DATABASE_INSIGHT_PUMP_IDS = "insightPumpIDs" @@ -14,6 +15,7 @@ const val DATABASE_INSIGHT_HISTORY_OFFSETS = "insightHistoryOffsets" exportSchema = true, version = InsightDatabase.VERSION ) +@TypeConverters(Converters::class) abstract class InsightDatabase : RoomDatabase() { abstract fun insightDatabaseDao(): InsightDatabaseDao diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt index 7bffe694ef..e602b3bf77 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt @@ -4,6 +4,7 @@ import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import info.nightscout.androidaps.insight.database.InsightPumpID.EventType @Dao abstract class InsightDatabaseDao { @@ -20,8 +21,10 @@ abstract class InsightDatabaseDao { @Insert(onConflict = OnConflictStrategy.REPLACE) abstract fun createOrUpdate(insightHistoryOffset: InsightHistoryOffset) - @Query("SELECT * from $DATABASE_INSIGHT_PUMP_IDS WHERE pumpSerial = :pumpSerial AND (eventType = 'PumpStopped' OR eventType = 'PumpPaused') AND timestamp < :timestamp ORDER BY timestamp DESC") - abstract fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long): InsightPumpID? + @Query("SELECT * from $DATABASE_INSIGHT_PUMP_IDS WHERE pumpSerial = :pumpSerial AND (eventType = :PumpStopped OR eventType = :PumpPaused) AND timestamp < :timestamp ORDER BY timestamp DESC") + abstract fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long, PumpStopped: EventType, PumpPaused: EventType): InsightPumpID? + + fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long): InsightPumpID? = getPumpStoppedEvent(pumpSerial, timestamp, EventType.PumpStopped, EventType.PumpPaused) @Insert(onConflict = OnConflictStrategy.REPLACE) abstract fun createOrUpdate(insightPumpID: InsightPumpID) diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt index 901c04a2b8..71e5b3502e 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt @@ -8,10 +8,17 @@ import androidx.room.PrimaryKey indices = [Index("timestamp")]) data class InsightPumpID( var timestamp: Long, - var eventType: String? = null, - var pumpSerial: String? = "None", + var eventType: EventType = EventType.None, + val pumpSerial: String? = null, @PrimaryKey var eventID: Long ) { - fun getId(): Long = eventID + enum class EventType { + PumpStarted, + PumpStopped, + PumpPaused, + StartOfTBR, + EndOfTBR, + None; + } } \ No newline at end of file diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index f6f80dcb4c..f9f4fa676e 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -39,6 +39,7 @@ import info.nightscout.androidaps.insight.database.InsightBolusID; import info.nightscout.androidaps.insight.database.InsightDatabaseDao; import info.nightscout.androidaps.insight.database.InsightHistoryOffset; import info.nightscout.androidaps.insight.database.InsightPumpID; +import info.nightscout.androidaps.insight.database.InsightPumpID.EventType; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.interfaces.CommandQueueProvider; import info.nightscout.androidaps.interfaces.Config; @@ -1198,11 +1199,11 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai for (InsightPumpID pumpID : pumpStartedEvents) { InsightPumpID stoppedEvent = insightDatabaseDao.getPumpStoppedEvent(pumpID.getPumpSerial(), pumpID.getTimestamp()); - if (stoppedEvent != null && stoppedEvent.getEventType().equals("PumpStopped")) { // Search if Stop event is after 15min of Pause + if (stoppedEvent != null && stoppedEvent.getEventType().equals(EventType.PumpStopped)) { // Search if Stop event is after 15min of Pause InsightPumpID pauseEvent = insightDatabaseDao.getPumpStoppedEvent(pumpID.getPumpSerial(), stoppedEvent.getTimestamp() - T.mins(1).msecs()); - if (pauseEvent != null && pauseEvent.getEventType().equals("PumpPaused") && (stoppedEvent.getTimestamp() - pauseEvent.getTimestamp() < T.mins(16).msecs())) { + if (pauseEvent != null && pauseEvent.getEventType().equals(EventType.PumpPaused) && (stoppedEvent.getTimestamp() - pauseEvent.getTimestamp() < T.mins(16).msecs())) { stoppedEvent = pauseEvent; - stoppedEvent.setEventType("PumpStopped"); + stoppedEvent.setEventType(EventType.PumpStopped); } } if (stoppedEvent == null || stoppedEvent.getEventType().equals("PumpPaused")) continue; @@ -1213,7 +1214,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai 0, false, PumpSync.TemporaryBasalType.NORMAL, - pumpID.getId(), + pumpID.getEventID(), pumpID.getEventID()); temporaryBasals.add(temporaryBasal); } @@ -1355,25 +1356,25 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; InsightPumpID pumpID = new InsightPumpID( timestamp, - "", + EventType.None, serial, event.getEventPosition()); switch (event.getNewValue()) { case STARTED: - pumpID.setEventType("PumpStarted"); + pumpID.setEventType(EventType.PumpStarted); pumpStartedEvents.add(pumpID); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_started)); aapsLogger.debug(LTag.PUMP, "XXXX event START Event TimeStamp: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; case STOPPED: - pumpID.setEventType("PumpStopped"); + pumpID.setEventType(EventType.PumpStopped); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_stopped)); aapsLogger.debug(LTag.PUMP, "XXXX event STOP: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; case PAUSED: - pumpID.setEventType("PumpPaused"); + pumpID.setEventType(EventType.PumpPaused); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_paused)); aapsLogger.debug(LTag.PUMP, "XXXX event Pause: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); @@ -1387,19 +1388,19 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; insightDatabaseDao.createOrUpdate(new InsightPumpID( timestamp, - "StartOfTBR", + EventType.StartOfTBR, serial, event.getEventPosition()) ); - TemporaryBasal temporaryBasal = new TemporaryBasal( + temporaryBasals.add(new TemporaryBasal( timestamp, T.mins(event.getDuration()).msecs(), event.getAmount(), false, PumpSync.TemporaryBasalType.NORMAL, event.getEventPosition(), - event.getEventPosition()); - temporaryBasals.add(temporaryBasal); + event.getEventPosition()) + ); } private void processEndOfTBREvent(String serial, List temporaryBasals, EndOfTBREvent event) { @@ -1407,27 +1408,27 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; insightDatabaseDao.createOrUpdate(new InsightPumpID( timestamp - 1500L, - "EndOfTBR", + EventType.EndOfTBR, serial, event.getEventPosition()) ); - TemporaryBasal temporaryBasal = new PumpSync.PumpState.TemporaryBasal( + temporaryBasals.add(new PumpSync.PumpState.TemporaryBasal( timestamp - 1500L, 0L, 100.0, false, PumpSync.TemporaryBasalType.NORMAL, event.getEventPosition(), - event.getEventPosition()); - temporaryBasals.add(temporaryBasal); + event.getEventPosition()) + ); } private void processBolusProgrammedEvent(String serial, BolusProgrammedEvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; InsightBolusID bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); - if (bolusID != null && bolusID.getEndID() != null) { // TODO() Check if test EndID is necessary + if (bolusID != null && bolusID.getEndID() != null) { bolusID.setStartID(event.getEventPosition()); insightDatabaseDao.createOrUpdate(bolusID); return; @@ -1485,7 +1486,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusID.setEndID(event.getEventPosition()); insightDatabaseDao.createOrUpdate(bolusID); bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), startTimestamp); // Line added to get id - //databaseHelper.createOrUpdate(bolusID); if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) { pumpSync.syncBolusWithPumpId( bolusID.getTimestamp(), From a146d54a50647ac59e496ecab8065b94a4e7b8fe Mon Sep 17 00:00:00 2001 From: Philoul Date: Sat, 8 May 2021 16:18:47 +0200 Subject: [PATCH 08/16] Trail Add abstraction layer between InsightPlugin and dao --- .../insight/database/InsightDatabase.kt | 2 + .../insight/database/InsightDatabaseDao.kt | 6 +-- .../insight/database/InsightDbHelper.kt | 23 ++++++++++ .../insight/di/InsightDatabaseModule.kt | 5 ++ .../pump/insight/LocalInsightPlugin.java | 46 +++++++++---------- 5 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDbHelper.kt diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt index 7be27eae76..5cc47f32ba 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt @@ -20,6 +20,8 @@ abstract class InsightDatabase : RoomDatabase() { abstract fun insightDatabaseDao(): InsightDatabaseDao + abstract fun insightDbHelper(): InsightDbHelper + companion object { const val VERSION = 1 diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt index e602b3bf77..051f56803b 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt @@ -21,10 +21,8 @@ abstract class InsightDatabaseDao { @Insert(onConflict = OnConflictStrategy.REPLACE) abstract fun createOrUpdate(insightHistoryOffset: InsightHistoryOffset) - @Query("SELECT * from $DATABASE_INSIGHT_PUMP_IDS WHERE pumpSerial = :pumpSerial AND (eventType = :PumpStopped OR eventType = :PumpPaused) AND timestamp < :timestamp ORDER BY timestamp DESC") - abstract fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long, PumpStopped: EventType, PumpPaused: EventType): InsightPumpID? - - fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long): InsightPumpID? = getPumpStoppedEvent(pumpSerial, timestamp, EventType.PumpStopped, EventType.PumpPaused) + @Query("SELECT * from $DATABASE_INSIGHT_PUMP_IDS WHERE pumpSerial = :pumpSerial AND (eventType = :pumpStopped OR eventType = :pumpPaused) AND timestamp < :timestamp ORDER BY timestamp DESC") + abstract fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long, pumpStopped: EventType, pumpPaused: EventType): InsightPumpID? @Insert(onConflict = OnConflictStrategy.REPLACE) abstract fun createOrUpdate(insightPumpID: InsightPumpID) diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDbHelper.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDbHelper.kt new file mode 100644 index 0000000000..b7bf395206 --- /dev/null +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDbHelper.kt @@ -0,0 +1,23 @@ +package info.nightscout.androidaps.insight.database + +import androidx.room.Dao +import javax.inject.Inject + +@Dao +abstract class InsightDbHelper { + + @Inject lateinit var insightDatabaseDao: InsightDatabaseDao + + fun getInsightBolusID(pumpSerial: String, bolusID: Int, timestamp: Long): InsightBolusID? = insightDatabaseDao.getInsightBolusID(pumpSerial, bolusID, timestamp) + + fun createOrUpdate(insightBolusID: InsightBolusID) = insightDatabaseDao.createOrUpdate(insightBolusID) + + fun getInsightHistoryOffset(pumpSerial: String): InsightHistoryOffset? = insightDatabaseDao.getInsightHistoryOffset(pumpSerial) + + fun createOrUpdate(insightHistoryOffset: InsightHistoryOffset) = insightDatabaseDao.createOrUpdate(insightHistoryOffset) + + fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long): InsightPumpID? = insightDatabaseDao.getPumpStoppedEvent(pumpSerial, timestamp, InsightPumpID.EventType.PumpStopped, InsightPumpID.EventType.PumpPaused) + + fun createOrUpdate(insightPumpID: InsightPumpID) = insightDatabaseDao.createOrUpdate(insightPumpID) + +} \ No newline at end of file diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt index 251c372cbd..2425db378b 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt @@ -5,6 +5,7 @@ import dagger.Module import dagger.Provides import info.nightscout.androidaps.insight.database.InsightDatabase import info.nightscout.androidaps.insight.database.InsightDatabaseDao +import info.nightscout.androidaps.insight.database.InsightDbHelper import javax.inject.Singleton @Module @@ -19,5 +20,9 @@ class InsightDatabaseModule { internal fun provideInsightDatabaseDao(insightDatabase: InsightDatabase): InsightDatabaseDao = insightDatabase.insightDatabaseDao() + @Provides + @Singleton + internal fun provideInsightDbHelper(insightDatabase: InsightDatabase): InsightDbHelper = + insightDatabase.insightDbHelper() } \ No newline at end of file diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index f9f4fa676e..fc613f4f28 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -36,7 +36,7 @@ import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.events.EventInitializationChanged; import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.insight.database.InsightBolusID; -import info.nightscout.androidaps.insight.database.InsightDatabaseDao; +import info.nightscout.androidaps.insight.database.InsightDbHelper; import info.nightscout.androidaps.insight.database.InsightHistoryOffset; import info.nightscout.androidaps.insight.database.InsightPumpID; import info.nightscout.androidaps.insight.database.InsightPumpID.EventType; @@ -144,7 +144,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private final ProfileFunction profileFunction; private final Context context; private final DateUtil dateUtil; - private final InsightDatabaseDao insightDatabaseDao; + private final InsightDbHelper insightDbHelper; private final PumpSync pumpSync; public static final String ALERT_CHANNEL_ID = "AndroidAPS-InsightAlert"; @@ -203,7 +203,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai Context context, Config config, DateUtil dateUtil, - InsightDatabaseDao insightDatabaseDao, + InsightDbHelper insightDbHelper, PumpSync pumpSync ) { super(new PluginDescription() @@ -225,7 +225,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai this.profileFunction = profileFunction; this.context = context; this.dateUtil = dateUtil; - this.insightDatabaseDao = insightDatabaseDao; + this.insightDbHelper = insightDbHelper; this.pumpSync = pumpSync; pumpDescription = new PumpDescription(); @@ -592,14 +592,14 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai int trials = 0; Long now = dateUtil.now(); String serial = serialNumber(); - insightDatabaseDao.createOrUpdate( new InsightBolusID( + insightDbHelper.createOrUpdate( new InsightBolusID( now, serial, bolusID, null, null )); - InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serial, bolusID, now); + InsightBolusID insightBolusID = insightDbHelper.getInsightBolusID(serial, bolusID, now); aapsLogger.debug(LTag.PUMP, "XXXX set Bolus: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " amount: " + insulin); pumpSync.syncBolusWithPumpId( insightBolusID.getTimestamp(), @@ -802,7 +802,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusMessage.setImmediateAmount(0); bolusMessage.setVibration(disableVibration); int bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId(); - insightDatabaseDao.createOrUpdate(new InsightBolusID( + insightDbHelper.createOrUpdate(new InsightBolusID( dateUtil.now(), serialNumber(), bolusID, @@ -901,7 +901,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai connectionService.requestMessage(cancelBolusMessage).await(); confirmAlert(AlertType.WARNING_38); alertService.ignore(null); - InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serialNumber(), activeBolus.getBolusID(), dateUtil.now()); + InsightBolusID insightBolusID = insightDbHelper.getInsightBolusID(serialNumber(), activeBolus.getBolusID(), dateUtil.now()); if (insightBolusID != null) { /* TODO() I don't know if we can remove bolck below (there is a readHistory after that will update AAPS database) PumpSync.PumpState.ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(insightBolusID.id); @@ -1138,7 +1138,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai String serial = serialNumber(); timeOffset = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() - parseDate(pumpTime.getYear(), pumpTime.getMonth(), pumpTime.getDay(), pumpTime.getHour(), pumpTime.getMinute(), pumpTime.getSecond()); - InsightHistoryOffset historyOffset = insightDatabaseDao.getInsightHistoryOffset(serial); + InsightHistoryOffset historyOffset = insightDbHelper.getInsightHistoryOffset(serial); try { List historyEvents = new ArrayList<>(); if (historyOffset == null) { @@ -1162,7 +1162,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai Collections.reverse(historyEvents); if (historyOffset != null) processHistoryEvents(serial, historyEvents); if (historyEvents.size() > 0) { - insightDatabaseDao.createOrUpdate(new InsightHistoryOffset( + insightDbHelper.createOrUpdate(new InsightHistoryOffset( serial, historyEvents.get(0).getEventPosition()) ); @@ -1198,9 +1198,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai Collections.reverse(temporaryBasals); for (InsightPumpID pumpID : pumpStartedEvents) { - InsightPumpID stoppedEvent = insightDatabaseDao.getPumpStoppedEvent(pumpID.getPumpSerial(), pumpID.getTimestamp()); + InsightPumpID stoppedEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), pumpID.getTimestamp()); if (stoppedEvent != null && stoppedEvent.getEventType().equals(EventType.PumpStopped)) { // Search if Stop event is after 15min of Pause - InsightPumpID pauseEvent = insightDatabaseDao.getPumpStoppedEvent(pumpID.getPumpSerial(), stoppedEvent.getTimestamp() - T.mins(1).msecs()); + InsightPumpID pauseEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), stoppedEvent.getTimestamp() - T.mins(1).msecs()); if (pauseEvent != null && pauseEvent.getEventType().equals(EventType.PumpPaused) && (stoppedEvent.getTimestamp() - pauseEvent.getTimestamp() < T.mins(16).msecs())) { stoppedEvent = pauseEvent; stoppedEvent.setEventType(EventType.PumpStopped); @@ -1380,13 +1380,13 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai aapsLogger.debug(LTag.PUMP, "XXXX event Pause: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; } - insightDatabaseDao.createOrUpdate(pumpID); + insightDbHelper.createOrUpdate(pumpID); } private void processStartOfTBREvent(String serial, List temporaryBasals, StartOfTBREvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - insightDatabaseDao.createOrUpdate(new InsightPumpID( + insightDbHelper.createOrUpdate(new InsightPumpID( timestamp, EventType.StartOfTBR, serial, @@ -1406,7 +1406,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private void processEndOfTBREvent(String serial, List temporaryBasals, EndOfTBREvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - insightDatabaseDao.createOrUpdate(new InsightPumpID( + insightDbHelper.createOrUpdate(new InsightPumpID( timestamp - 1500L, EventType.EndOfTBR, serial, @@ -1427,24 +1427,24 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private void processBolusProgrammedEvent(String serial, BolusProgrammedEvent event) { long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - InsightBolusID bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); + InsightBolusID bolusID = insightDbHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); if (bolusID != null && bolusID.getEndID() != null) { bolusID.setStartID(event.getEventPosition()); - insightDatabaseDao.createOrUpdate(bolusID); + insightDbHelper.createOrUpdate(bolusID); return; } if (bolusID == null || bolusID.getStartID() != null) { // TODO() Check StartID test is necessary - insightDatabaseDao.createOrUpdate(new InsightBolusID( + insightDbHelper.createOrUpdate(new InsightBolusID( timestamp, serial, event.getBolusID(), event.getEventPosition(), null )); - bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); + bolusID = insightDbHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); } bolusID.setStartID(event.getEventPosition()); - insightDatabaseDao.createOrUpdate(bolusID); + insightDbHelper.createOrUpdate(bolusID); if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) { pumpSync.syncBolusWithPumpId( @@ -1473,7 +1473,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; long startTimestamp = parseRelativeDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond(), event.getStartHour(), event.getStartMinute(), event.getStartSecond()) + timeOffset; - InsightBolusID bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), timestamp); + InsightBolusID bolusID = insightDbHelper.getInsightBolusID(serial, event.getBolusID(), timestamp); if (bolusID == null || bolusID.getEndID() != null) { // TODO() Check if test EndID is necessary bolusID = new InsightBolusID( startTimestamp, @@ -1484,8 +1484,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai ); } bolusID.setEndID(event.getEventPosition()); - insightDatabaseDao.createOrUpdate(bolusID); - bolusID = insightDatabaseDao.getInsightBolusID(serial, event.getBolusID(), startTimestamp); // Line added to get id + insightDbHelper.createOrUpdate(bolusID); + bolusID = insightDbHelper.getInsightBolusID(serial, event.getBolusID(), startTimestamp); // Line added to get id if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) { pumpSync.syncBolusWithPumpId( bolusID.getTimestamp(), From 931980bcb6f6cf52c45422a925b9b78bcf2c2316 Mon Sep 17 00:00:00 2001 From: Philoul Date: Sat, 8 May 2021 16:20:01 +0200 Subject: [PATCH 09/16] Typo in variable names --- .../androidaps/insight/database/InsightDatabaseDao.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt index e602b3bf77..c941eb76e2 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt @@ -21,8 +21,8 @@ abstract class InsightDatabaseDao { @Insert(onConflict = OnConflictStrategy.REPLACE) abstract fun createOrUpdate(insightHistoryOffset: InsightHistoryOffset) - @Query("SELECT * from $DATABASE_INSIGHT_PUMP_IDS WHERE pumpSerial = :pumpSerial AND (eventType = :PumpStopped OR eventType = :PumpPaused) AND timestamp < :timestamp ORDER BY timestamp DESC") - abstract fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long, PumpStopped: EventType, PumpPaused: EventType): InsightPumpID? + @Query("SELECT * from $DATABASE_INSIGHT_PUMP_IDS WHERE pumpSerial = :pumpSerial AND (eventType = :pumpStopped OR eventType = :pumpPaused) AND timestamp < :timestamp ORDER BY timestamp DESC") + abstract fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long, pumpStopped: EventType, pumpPaused: EventType): InsightPumpID? fun getPumpStoppedEvent(pumpSerial: String, timestamp: Long): InsightPumpID? = getPumpStoppedEvent(pumpSerial, timestamp, EventType.PumpStopped, EventType.PumpPaused) From dd527d9908d3a29bbf2cf7c1df4333a6dd2243d2 Mon Sep 17 00:00:00 2001 From: Philoul Date: Sat, 8 May 2021 16:35:12 +0200 Subject: [PATCH 10/16] Cleaning --- .../pump/insight/LocalInsightPlugin.java | 42 ++++--------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index f9f4fa676e..0d815be2a8 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -830,7 +830,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai PumpEnactResult cancelEBResult = null; if (isFakingTempsByExtendedBoluses()) cancelEBResult = cancelExtendedBolusOnly(); PumpEnactResult cancelTBRResult = cancelTempBasalOnly(); - result.success((cancelEBResult == null || (cancelEBResult != null && cancelEBResult.getSuccess())) && cancelTBRResult.getSuccess()); //Fix a bug when Fake TBR is disabled and click on Cancel TBR button + result.success((cancelEBResult == null || (cancelEBResult != null && cancelEBResult.getSuccess())) && cancelTBRResult.getSuccess()); result.enacted((cancelEBResult != null && cancelEBResult.getEnacted()) || cancelTBRResult.getEnacted()); result.comment(cancelEBResult != null ? cancelEBResult.getComment() : cancelTBRResult.getComment()); try { @@ -903,17 +903,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai alertService.ignore(null); InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serialNumber(), activeBolus.getBolusID(), dateUtil.now()); if (insightBolusID != null) { - /* TODO() I don't know if we can remove bolck below (there is a readHistory after that will update AAPS database) - PumpSync.PumpState.ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(insightBolusID.id); - if (extendedBolus != null) { - extendedBolus.durationInMinutes = (int) ((System.currentTimeMillis() - extendedBolus.date) / 60000); - if (extendedBolus.durationInMinutes <= 0) { - final String _id = extendedBolus._id; - databaseHelper.delete(extendedBolus); - } else - treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus); - } - */ aapsLogger.debug(LTag.PUMP, "XXXX cancel Extended Bolus time: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " BolusId: " + activeBolus.getBolusID()); result.enacted(true).success(true); } @@ -1390,8 +1379,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai timestamp, EventType.StartOfTBR, serial, - event.getEventPosition()) - ); + event.getEventPosition())); temporaryBasals.add(new TemporaryBasal( timestamp, T.mins(event.getDuration()).msecs(), @@ -1399,8 +1387,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai false, PumpSync.TemporaryBasalType.NORMAL, event.getEventPosition(), - event.getEventPosition()) - ); + event.getEventPosition())); } private void processEndOfTBREvent(String serial, List temporaryBasals, EndOfTBREvent event) { @@ -1410,8 +1397,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai timestamp - 1500L, EventType.EndOfTBR, serial, - event.getEventPosition()) - ); + event.getEventPosition())); temporaryBasals.add(new PumpSync.PumpState.TemporaryBasal( timestamp - 1500L, @@ -1420,8 +1406,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai false, PumpSync.TemporaryBasalType.NORMAL, event.getEventPosition(), - event.getEventPosition()) - ); + event.getEventPosition())); } private void processBolusProgrammedEvent(String serial, BolusProgrammedEvent event) { @@ -1433,7 +1418,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai insightDatabaseDao.createOrUpdate(bolusID); return; } - if (bolusID == null || bolusID.getStartID() != null) { // TODO() Check StartID test is necessary + if (bolusID == null || bolusID.getStartID() != null) { //In rare edge cases two boluses can share the same ID insightDatabaseDao.createOrUpdate(new InsightBolusID( timestamp, serial, @@ -1480,8 +1465,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai serial, event.getBolusID(), bolusID == null ? event.getEventPosition() : bolusID.getStartID(), - event.getEventPosition() - ); + event.getEventPosition()); } bolusID.setEndID(event.getEventPosition()); insightDatabaseDao.createOrUpdate(bolusID); @@ -1496,16 +1480,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai serial); } if (event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE) { - if (event.getDuration() == 0) { - /* TODO() Check if we can remove this block - ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(bolusID.id); - if (extendedBolus != null) { - final String _id = extendedBolus._id; - databaseHelper.delete(extendedBolus); - } - */ - } else { - if (profileFunction.getProfile(bolusID.getTimestamp()) != null) + if (event.getDuration() > 0 && profileFunction.getProfile(bolusID.getTimestamp()) != null) pumpSync.syncExtendedBolusWithPumpId( bolusID.getTimestamp(), event.getExtendedAmount(), @@ -1514,7 +1489,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusID.getId(), PumpType.ACCU_CHEK_INSIGHT, serial); - } } } From 153168a4d491b6ee25080a92b9e9e06d736cc6a3 Mon Sep 17 00:00:00 2001 From: Philoul Date: Sat, 8 May 2021 19:48:10 +0200 Subject: [PATCH 11/16] Remove additional aapsLogger (3 left for further analysis with Insight V3 and site change) --- .../plugins/pump/insight/LocalInsightPlugin.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index 0d815be2a8..bd0aad2212 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -600,7 +600,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai null )); InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serial, bolusID, now); - aapsLogger.debug(LTag.PUMP, "XXXX set Bolus: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " amount: " + insulin); pumpSync.syncBolusWithPumpId( insightBolusID.getTimestamp(), detailedBolusInfo.insulin, @@ -672,7 +671,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai bolusCancelled = true; confirmAlert(AlertType.WARNING_38); alertService.ignore(null); - aapsLogger.debug(LTag.PUMP, "XXXX Stop Bolus : " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now())); } } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while canceling bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); @@ -758,7 +756,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai .success(true) .enacted(true) .comment(R.string.virtualpump_resultok); - aapsLogger.debug(LTag.PUMP, "XXXX Set Temp Basal timestamp: " + dateUtil.now() + " rate: " + percent + " duration: " + durationInMinutes); readHistory(); fetchStatus(); } catch (AppLayerErrorException e) { @@ -809,7 +806,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai null, null )); - aapsLogger.debug(LTag.PUMP, "XXXX Set Extended timestamp: " + dateUtil.now() + " amount: " + insulin + "U duration: " + durationInMinutes + "BolusId: " + bolusID); result.success(true).enacted(true).comment(R.string.virtualpump_resultok); } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); @@ -857,7 +853,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai confirmAlert(AlertType.WARNING_36); alertService.ignore(null); result.comment(R.string.virtualpump_resultok); - aapsLogger.debug(LTag.PUMP, "XXXX cancel Temp Basal time: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now())); } catch (NoActiveTBRToCanceLException e) { result.success(true); result.comment(R.string.virtualpump_resultok); @@ -903,7 +898,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai alertService.ignore(null); InsightBolusID insightBolusID = insightDatabaseDao.getInsightBolusID(serialNumber(), activeBolus.getBolusID(), dateUtil.now()); if (insightBolusID != null) { - aapsLogger.debug(LTag.PUMP, "XXXX cancel Extended Bolus time: " + dateUtil.dateAndTimeAndSecondsString(dateUtil.now()) + " BolusId: " + activeBolus.getBolusID()); result.enacted(true).success(true); } } @@ -1284,7 +1278,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai calendar.set(Calendar.YEAR, event.getTotalYear()); calendar.set(Calendar.MONTH, event.getTotalMonth() - 1); calendar.set(Calendar.DAY_OF_MONTH, event.getTotalDay()); - aapsLogger.debug(LTag.PUMP, "XXXX event Daily Dose event day: " + event.getTotalYear() + "/" + (event.getTotalMonth() - 1) + "/" + event.getTotalDay() + " Basal: " + event.getBasalTotal() + " Bolus: " + event.getBolusTotal()); pumpSync.createOrUpdateTotalDailyDose( calendar.getTimeInMillis(), event.getBolusTotal(), @@ -1330,7 +1323,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE); - aapsLogger.debug(LTag.PUMP, "XXXX event Battery Change time: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); pumpSync.insertTherapyEventIfNewWithTimestamp( timestamp, DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE, @@ -1354,19 +1346,16 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai pumpStartedEvents.add(pumpID); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_started)); - aapsLogger.debug(LTag.PUMP, "XXXX event START Event TimeStamp: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; case STOPPED: pumpID.setEventType(EventType.PumpStopped); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_stopped)); - aapsLogger.debug(LTag.PUMP, "XXXX event STOP: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; case PAUSED: pumpID.setEventType(EventType.PumpPaused); if (sp.getBoolean("insight_log_operating_mode_changes", false)) logNote(timestamp, resourceHelper.gs(R.string.pump_paused)); - aapsLogger.debug(LTag.PUMP, "XXXX event Pause: " + timestamp + " HMS: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); break; } insightDatabaseDao.createOrUpdate(pumpID); From 62901923550b5ff8a8012b70388c12ad32b977dd Mon Sep 17 00:00:00 2001 From: Philoul Date: Sun, 9 May 2021 00:55:05 +0200 Subject: [PATCH 12/16] Remove redundant CPevents, Fix Site Change with Insight V3 --- .../pump/insight/LocalInsightPlugin.java | 40 +++---------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index bd0aad2212..8771032287 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -1189,7 +1189,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai stoppedEvent.setEventType(EventType.PumpStopped); } } - if (stoppedEvent == null || stoppedEvent.getEventType().equals("PumpPaused")) continue; + if (stoppedEvent == null || stoppedEvent.getEventType().equals(EventType.PumpPaused) || pumpID.getTimestamp() - stoppedEvent.getTimestamp() < 10000) + continue; long tbrStart = stoppedEvent.getTimestamp() + 10000; TemporaryBasal temporaryBasal = new TemporaryBasal( tbrStart, @@ -1261,15 +1262,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai if (!sp.getBoolean(R.string.key_insight_log_site_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.CANNULA_CHANGE); - aapsLogger.debug(LTag.PUMP, "XXXX event Site Change time: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); - pumpSync.insertTherapyEventIfNewWithTimestamp( - timestamp, - DetailedBolusInfo.EventType.CANNULA_CHANGE, - "", - event.getEventPosition(), - PumpType.ACCU_CHEK_INSIGHT, - serial); + if (event.getAmount() > 0.0) // Don't record event if amount is null => Fix Site Change with Insight v3 (event is always sent when Reservoir is changed) + uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.CANNULA_CHANGE); } private void processTotalDailyDoseEvent(String serial, TotalDailyDoseEvent event) { @@ -1292,15 +1286,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai if (!sp.getBoolean(R.string.key_insight_log_tube_changes, false)) return; long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; - logNote(timestamp, resourceHelper.gs(R.string.tube_changed)); - aapsLogger.debug(LTag.PUMP, "XXXX event Tube Change time: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); - pumpSync.insertTherapyEventIfNewWithTimestamp( - timestamp, - DetailedBolusInfo.EventType.INSULIN_CHANGE, - "", - event.getEventPosition(), - PumpType.ACCU_CHEK_INSIGHT, - serial); + if (event.getAmount() > 0.0) // Don't record event if amount is null + logNote(timestamp, resourceHelper.gs(R.string.tube_changed)); } private void processSniffingDoneEvent(String serial, SniffingDoneEvent event) { @@ -1308,14 +1295,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.INSULIN_CHANGE); - aapsLogger.debug(LTag.PUMP, "XXXX event Reservoir Change time: " + dateUtil.dateAndTimeAndSecondsString(timestamp)); - pumpSync.insertTherapyEventIfNewWithTimestamp( - timestamp, - DetailedBolusInfo.EventType.INSULIN_CHANGE, - "", - event.getEventPosition(), - PumpType.ACCU_CHEK_INSIGHT, - serial); } private void processPowerUpEvent(String serial, PowerUpEvent event) { @@ -1323,13 +1302,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; uploadCareportalEvent(timestamp, DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE); - pumpSync.insertTherapyEventIfNewWithTimestamp( - timestamp, - DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE, - "", - event.getEventPosition(), - PumpType.ACCU_CHEK_INSIGHT, - serial); } private void processOperatingModeChangedEvent(String serial, List pumpStartedEvents, OperatingModeChangedEvent event) { From 0020856aae093108396a465c27583f772c72fa74 Mon Sep 17 00:00:00 2001 From: Philoul Date: Sun, 9 May 2021 16:20:55 +0200 Subject: [PATCH 13/16] Fix Injection for InsightDbHelper Thanks Adrian for your help --- .../androidaps/insight/database/InsightDatabase.kt | 2 -- .../androidaps/insight/database/InsightDbHelper.kt | 8 +------- .../androidaps/insight/di/InsightDatabaseModule.kt | 3 +-- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt index 5cc47f32ba..7be27eae76 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt @@ -20,8 +20,6 @@ abstract class InsightDatabase : RoomDatabase() { abstract fun insightDatabaseDao(): InsightDatabaseDao - abstract fun insightDbHelper(): InsightDbHelper - companion object { const val VERSION = 1 diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDbHelper.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDbHelper.kt index b7bf395206..592acd5a73 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDbHelper.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDbHelper.kt @@ -1,12 +1,6 @@ package info.nightscout.androidaps.insight.database -import androidx.room.Dao -import javax.inject.Inject - -@Dao -abstract class InsightDbHelper { - - @Inject lateinit var insightDatabaseDao: InsightDatabaseDao +class InsightDbHelper (val insightDatabaseDao: InsightDatabaseDao) { fun getInsightBolusID(pumpSerial: String, bolusID: Int, timestamp: Long): InsightBolusID? = insightDatabaseDao.getInsightBolusID(pumpSerial, bolusID, timestamp) diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt index 2425db378b..2e47f3891c 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt @@ -22,7 +22,6 @@ class InsightDatabaseModule { @Provides @Singleton - internal fun provideInsightDbHelper(insightDatabase: InsightDatabase): InsightDbHelper = - insightDatabase.insightDbHelper() + internal fun provideInsightDbHelper(insightDatabaseDao: InsightDatabaseDao): InsightDbHelper = InsightDbHelper(insightDatabaseDao) } \ No newline at end of file From afb16210aec430e00b7f5b9f769960c2b596e218 Mon Sep 17 00:00:00 2001 From: Philoul Date: Sun, 9 May 2021 17:02:20 +0200 Subject: [PATCH 14/16] Remove old insight db tables --- .../androidaps/db/DatabaseHelper.java | 93 ------------------- .../androidaps/db/DatabaseHelperProvider.java | 24 ----- .../interfaces/DatabaseHelperInterface.kt | 12 --- 3 files changed, 129 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java index 4496928738..c323a475be 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.interfaces.ActivePlugin; -import info.nightscout.androidaps.interfaces.DatabaseHelperInterface; import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.logging.LTag; import info.nightscout.androidaps.plugins.bus.RxBusWrapper; @@ -67,15 +66,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { public void onCreate(SQLiteDatabase database, ConnectionSource connectionSource) { try { aapsLogger.info(LTag.DATABASE, "onCreate"); - TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class); - TableUtils.createTableIfNotExists(connectionSource, InsightBolusID.class); - TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class); TableUtils.createTableIfNotExists(connectionSource, OmnipodHistoryRecord.class); TableUtils.createTableIfNotExists(connectionSource, OHQueueItem.class); - database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " + - "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\")"); - database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " + - "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\")"); } catch (SQLException e) { aapsLogger.error("Can't create database", e); throw new RuntimeException(e); @@ -91,17 +83,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { if (oldVersion < 7) { aapsLogger.info(LTag.DATABASE, "onUpgrade"); onCreate(database, connectionSource); - } else if (oldVersion < 10) { - TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class); - TableUtils.createTableIfNotExists(connectionSource, InsightBolusID.class); - TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class); - database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " + - "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\")"); - database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " + - "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\")"); - } else if (oldVersion < 11) { - database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\""); - database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\""); } TableUtils.createTableIfNotExists(connectionSource, OHQueueItem.class); } catch (SQLException e) { @@ -152,18 +133,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { // ------------------ getDao ------------------------------------------- - private Dao getDaoInsightPumpID() throws SQLException { - return getDao(InsightPumpID.class); - } - - private Dao getDaoInsightBolusID() throws SQLException { - return getDao(InsightBolusID.class); - } - - private Dao getDaoInsightHistoryOffset() throws SQLException { - return getDao(InsightHistoryOffset.class); - } - private Dao getDaoPodHistory() throws SQLException { return getDao(OmnipodHistoryRecord.class); } @@ -182,68 +151,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } } - // ---------------- Insight history handling --------------- - - public void createOrUpdate(InsightHistoryOffset offset) { - try { - getDaoInsightHistoryOffset().createOrUpdate(offset); - } catch (SQLException e) { - aapsLogger.error("Unhandled exception", e); - } - } - - public InsightHistoryOffset getInsightHistoryOffset(String pumpSerial) { - try { - return getDaoInsightHistoryOffset().queryForId(pumpSerial); - } catch (SQLException e) { - aapsLogger.error("Unhandled exception", e); - } - return null; - } - - public void createOrUpdate(InsightBolusID bolusID) { - try { - getDaoInsightBolusID().createOrUpdate(bolusID); - } catch (SQLException e) { - aapsLogger.error("Unhandled exception", e); - } - } - - public InsightBolusID getInsightBolusID(String pumpSerial, int bolusID, long timestamp) { - try { - return getDaoInsightBolusID().queryBuilder() - .where().eq("pumpSerial", pumpSerial) - .and().eq("bolusID", bolusID) - .and().between("timestamp", timestamp - 259200000, timestamp + 259200000) - .queryForFirst(); - } catch (SQLException e) { - aapsLogger.error("Unhandled exception", e); - } - return null; - } - - public void createOrUpdate(InsightPumpID pumpID) { - try { - getDaoInsightPumpID().createOrUpdate(pumpID); - } catch (SQLException e) { - aapsLogger.error("Unhandled exception", e); - } - } - - public InsightPumpID getPumpStoppedEvent(String pumpSerial, long before) { - try { - return getDaoInsightPumpID().queryBuilder() - .orderBy("timestamp", false) - .where().eq("pumpSerial", pumpSerial) - .and().in("eventType", "PumpStopped", "PumpPaused") - .and().lt("timestamp", before) - .queryForFirst(); - } catch (SQLException e) { - aapsLogger.error("Unhandled exception", e); - } - return null; - } - // ---------------- Food handling --------------- // ---------------- PodHistory handling --------------- diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java index 89d892fe97..da0b2479cf 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java @@ -49,18 +49,6 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface { return MainApp.Companion.getDbHelper().findOmnipodHistoryRecordByPumpId(pumpId); } - @Override public void createOrUpdate(@NonNull InsightBolusID record) { - MainApp.Companion.getDbHelper().createOrUpdate(record); - } - - @Override public void createOrUpdate(@NonNull InsightPumpID record) { - MainApp.Companion.getDbHelper().createOrUpdate(record); - } - - @Override public void createOrUpdate(@NonNull InsightHistoryOffset record) { - MainApp.Companion.getDbHelper().createOrUpdate(record); - } - @Override public void delete(@NonNull ExtendedBolus extendedBolus) { // MainApp.Companion.getDbHelper().delete(extendedBolus); } @@ -70,18 +58,6 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface { return null; } - @Nullable @Override public InsightBolusID getInsightBolusID(@NonNull String pumpSerial, int bolusID, long timestamp) { - return MainApp.Companion.getDbHelper().getInsightBolusID(pumpSerial, bolusID, timestamp); - } - - @Nullable @Override public InsightHistoryOffset getInsightHistoryOffset(@NonNull String pumpSerial) { - return MainApp.Companion.getDbHelper().getInsightHistoryOffset(pumpSerial); - } - - @Nullable @Override public InsightPumpID getPumpStoppedEvent(@NonNull String pumpSerial, long before) { - return MainApp.Companion.getDbHelper().getPumpStoppedEvent(pumpSerial, before); - } - @Override public void resetDatabases() { MainApp.Companion.getDbHelper().resetDatabases(); } diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt index e49f4cdf51..fe783413a0 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt @@ -7,9 +7,6 @@ interface DatabaseHelperInterface { fun resetDatabases() fun createOrUpdate(record: OmnipodHistoryRecord) - fun createOrUpdate(record: InsightBolusID) - fun createOrUpdate(record: InsightPumpID) - fun createOrUpdate(record: InsightHistoryOffset) fun createOrUpdate(record: OHQueueItem) fun delete(extendedBolus: ExtendedBolus) fun createOrUpdate(tempBasal: TemporaryBasal): Boolean @@ -24,18 +21,9 @@ interface DatabaseHelperInterface { fun getAllOHQueueItems(maxEntries: Long): List // old DB model - fun getInsightBolusID(pumpSerial: String, bolusID: Int, timestamp: Long): InsightBolusID? - fun getInsightHistoryOffset(pumpSerial: String): InsightHistoryOffset? - fun getPumpStoppedEvent(pumpSerial: String, before: Long): InsightPumpID? fun getOHQueueSize(): Long fun clearOpenHumansQueue() fun removeAllOHQueueItemsWithIdSmallerThan(id: Long) - companion object { - - const val DATABASE_INSIGHT_HISTORY_OFFSETS = "InsightHistoryOffsets" - const val DATABASE_INSIGHT_BOLUS_IDS = "InsightBolusIDs" - const val DATABASE_INSIGHT_PUMP_IDS = "InsightPumpIDs" - } } From d5a9c2b6288465ff29ada6ec47ab0b0ca4481682 Mon Sep 17 00:00:00 2001 From: Philoul Date: Tue, 11 May 2021 18:38:57 +0200 Subject: [PATCH 15/16] Fix tests --- .../androidaps/interfaces/ConstraintsCheckerTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt index f9bacb7bbd..9b0f002cd7 100644 --- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt @@ -10,6 +10,7 @@ import info.nightscout.androidaps.danar.DanaRPlugin import info.nightscout.androidaps.danars.DanaRSPlugin import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.database.AppRepository +import info.nightscout.androidaps.insight.database.InsightDbHelper import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin @@ -68,6 +69,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { @Mock lateinit var databaseHelper: DatabaseHelperInterface @Mock lateinit var repository: AppRepository @Mock lateinit var pumpSync: PumpSync + @Mock lateinit var insightDbHelper: InsightDbHelper private lateinit var danaPump: DanaPump @@ -141,7 +143,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, sp, commandQueue, context, databaseHelper, pumpSync, dateUtil) danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync) danaRSPlugin = DanaRSPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil) - insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsInterface, sp, commandQueue, profileFunction, context, ConfigImpl(), dateUtil, databaseHelper, pumpSync) + insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, sp, commandQueue, profileFunction, context, ConfigImpl(), dateUtil, insightDbHelper, pumpSync) openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, sp, dateUtil, repository, glucoseStatusProvider) openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, fabricPrivacy, dateUtil, repository, glucoseStatusProvider) safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, BuildHelper(ConfigImpl(), loggerUtils), iobCobCalculator, ConfigImpl(), dateUtil) From 02e923d3ed11d08ffa5cf4d3261a9d5baf01053a Mon Sep 17 00:00:00 2001 From: Philoul Date: Wed, 12 May 2021 09:43:34 +0200 Subject: [PATCH 16/16] Fix test 2 --- .../androidaps/interfaces/ConstraintsCheckerTest.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt index 9b0f002cd7..449ea3c5e6 100644 --- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt @@ -10,6 +10,7 @@ import info.nightscout.androidaps.danar.DanaRPlugin import info.nightscout.androidaps.danars.DanaRSPlugin import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.database.AppRepository +import info.nightscout.androidaps.insight.database.InsightDatabaseDao import info.nightscout.androidaps.insight.database.InsightDbHelper import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin @@ -52,7 +53,7 @@ import java.util.* ConstraintChecker::class, SP::class, Context::class, OpenAPSAMAPlugin::class, OpenAPSSMBPlugin::class, TreatmentsPlugin::class, TreatmentService::class, VirtualPumpPlugin::class, DetailedBolusInfoStorage::class, TemporaryBasalStorage::class, GlimpPlugin::class, Profiler::class, - UserEntryLogger::class, LoggerUtils::class, AppRepository::class) + UserEntryLogger::class, LoggerUtils::class, AppRepository::class, InsightDatabaseDao::class) class ConstraintsCheckerTest : TestBaseWithProfile() { @Mock lateinit var activePlugin: ActivePlugin @@ -69,10 +70,10 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { @Mock lateinit var databaseHelper: DatabaseHelperInterface @Mock lateinit var repository: AppRepository @Mock lateinit var pumpSync: PumpSync - @Mock lateinit var insightDbHelper: InsightDbHelper + @Mock lateinit var insightDatabaseDao: InsightDatabaseDao private lateinit var danaPump: DanaPump - + private lateinit var insightDbHelper: InsightDbHelper private lateinit var constraintChecker: ConstraintChecker private lateinit var safetyPlugin: SafetyPlugin private lateinit var objectivesPlugin: ObjectivesPlugin @@ -136,7 +137,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { val glucoseStatusProvider = GlucoseStatusProvider(aapsLogger = aapsLogger, iobCobCalculator = iobCobCalculator, dateUtil = dateUtil) - + insightDbHelper = InsightDbHelper(insightDatabaseDao) danaPump = DanaPump(aapsLogger, sp, dateUtil, injector) hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, repository) objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, ConfigImpl(), dateUtil, uel)