Merge pull request #52 from tidepool-org/BACK-2685-pump-settings

[BACK-2685] always fetch latest settings for date bound reports

Author: krystophv

lib/report.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import getAGPFigures from '@tidepool/viz/dist/getAGPFigures.js';
 import vizDataUtil from '@tidepool/viz/dist/data.js';
 import { Blob } from 'buffer';
@@ -51,6 +52,22 @@ class Report {
     settings: 'settings',
   };
 
+  #commonStats = {
+    averageGlucose: 'averageGlucose',
+    averageDailyDose: 'averageDailyDose',
+    bgExtents: 'bgExtents',
+    carbs: 'carbs',
+    coefficientOfVariation: 'coefficientOfVariation',
+    glucoseManagementIndicator: 'glucoseManagementIndicator',
+    readingsInRange: 'readingsInRange',
+    sensorUsage: 'sensorUsage',
+    standardDev: 'standardDev',
+    timeInAuto: 'timeInAuto',
+    timeInOverride: 'timeInOverride',
+    timeInRange: 'timeInRange',
+    totalInsulin: 'totalInsulin',
+  };
+
   #reports = [this.#reportTypes.all];
 
   #reportDates;
@@ -156,24 +173,89 @@ class Report {
     };
   }
 
-  buildReportQueries() {
+  getStatsByChartType(chartType, data) {
+    const bgSource = _.get(data, 'metaData.bgSources.current');
+    const cbgSelected = bgSource === 'cbg';
+    const smbgSelected = bgSource === 'smbg';
+    const isAutomatedBasalDevice = _.get(data, 'metaData.latestPumpUpload.isAutomatedBasalDevice');
+    const isSettingsOverrideDevice = _.get(data, 'metaData.latestPumpUpload.isSettingsOverrideDevice');
+
+    const stats = [];
+
+    switch (chartType) {
+      case 'basics':
+        cbgSelected && stats.push(this.#commonStats.timeInRange);
+        smbgSelected && stats.push(this.#commonStats.readingsInRange);
+        stats.push(this.#commonStats.averageGlucose);
+        cbgSelected && stats.push(this.#commonStats.sensorUsage);
+        stats.push(this.#commonStats.totalInsulin);
+        isAutomatedBasalDevice && stats.push(this.#commonStats.timeInAuto);
+        isSettingsOverrideDevice && stats.push(this.#commonStats.timeInOverride);
+        stats.push(this.#commonStats.carbs);
+        stats.push(this.#commonStats.averageDailyDose);
+        cbgSelected && stats.push(this.#commonStats.glucoseManagementIndicator);
+        stats.push(this.#commonStats.standardDev);
+        stats.push(this.#commonStats.coefficientOfVariation);
+        stats.push(this.#commonStats.bgExtents);
+        break;
+
+      case 'daily':
+        cbgSelected && stats.push(this.#commonStats.timeInRange);
+        smbgSelected && stats.push(this.#commonStats.readingsInRange);
+        stats.push(this.#commonStats.averageGlucose);
+        stats.push(this.#commonStats.totalInsulin);
+        isAutomatedBasalDevice && stats.push(this.#commonStats.timeInAuto);
+        isSettingsOverrideDevice && stats.push(this.#commonStats.timeInOverride);
+        stats.push(this.#commonStats.carbs);
+        cbgSelected && stats.push(this.#commonStats.standardDev);
+        cbgSelected && stats.push(this.#commonStats.coefficientOfVariation);
+        break;
+
+      case 'bgLog':
+        stats.push(this.#commonStats.readingsInRange);
+        stats.push(this.#commonStats.averageGlucose);
+        stats.push(this.#commonStats.standardDev);
+        stats.push(this.#commonStats.coefficientOfVariation);
+        break;
+
+      case 'agp':
+        stats.push(this.#commonStats.timeInRange);
+        stats.push(this.#commonStats.averageGlucose);
+        stats.push(this.#commonStats.sensorUsage);
+        stats.push(this.#commonStats.glucoseManagementIndicator);
+        stats.push(this.#commonStats.coefficientOfVariation);
+        break;
+
+      case 'trends':
+        cbgSelected && stats.push(this.#commonStats.timeInRange);
+        smbgSelected && stats.push(this.#commonStats.readingsInRange);
+        stats.push(this.#commonStats.averageGlucose);
+        cbgSelected && stats.push(this.#commonStats.sensorUsage);
+        stats.push(this.#commonStats.totalInsulin);
+        stats.push(this.#commonStats.averageDailyDose);
+        isAutomatedBasalDevice && stats.push(this.#commonStats.timeInAuto);
+        isSettingsOverrideDevice && stats.push(this.#commonStats.timeInOverride);
+        cbgSelected && stats.push(this.#commonStats.glucoseManagementIndicator);
+        stats.push(this.#commonStats.standardDev);
+        stats.push(this.#commonStats.coefficientOfVariation);
+        stats.push(this.#commonStats.bgExtents);
+        break;
+
+      default:
+        break;
+    }
+
+    return stats;
+  }
+
+  buildReportQueries({ data }) {
+    const bgSource = _.get(data, 'metaData.bgSources.current');
     const dataQueries = {
       basics: {
         endpoints: [],
         aggregationsByDate: 'basals, boluses, fingersticks, siteChanges',
-        bgSource: 'cbg',
-        stats: [
-          'timeInRange',
-          'averageGlucose',
-          'sensorUsage',
-          'totalInsulin',
-          'carbs',
-          'averageDailyDose',
-          'glucoseManagementIndicator',
-          'standardDev',
-          'coefficientOfVariation',
-          'bgExtents',
-        ],
+        bgSource: bgSource || 'cbg',
+        stats: this.getStatsByChartType('basics', data),
         excludeDaysWithoutBolus: false,
         bgPrefs: this.getBGPrefs(),
         metaData: 'latestPumpUpload, bgSources',
@@ -183,12 +265,7 @@ class Report {
       bgLog: {
         endpoints: [],
         aggregationsByDate: 'dataByDate',
-        stats: [
-          'readingsInRange',
-          'averageGlucose',
-          'standardDev',
-          'coefficientOfVariation',
-        ],
+        stats: this.getStatsByChartType('bgLog', data),
         types: {
           smbg: {},
         },
@@ -201,14 +278,7 @@ class Report {
       daily: {
         endpoints: [],
         aggregationsByDate: 'dataByDate, statsByDate',
-        stats: [
-          'timeInRange',
-          'averageGlucose',
-          'totalInsulin',
-          'carbs',
-          'standardDev',
-          'coefficientOfVariation',
-        ],
+        stats: this.getStatsByChartType('daily', data),
         types: {
           basal: {},
           bolus: {},
@@ -219,7 +289,7 @@ class Report {
           smbg: {},
           wizard: {},
         },
-        bgSource: 'cbg',
+        bgSource: bgSource || 'cbg',
         bgPrefs: this.getBGPrefs(),
         metaData: 'latestPumpUpload, bgSources',
         timePrefs: this.getTimePrefs(),
@@ -229,13 +299,7 @@ class Report {
         endpoints: [],
         aggregationsByDate: 'dataByDate, statsByDate',
         bgSource: 'cbg',
-        stats: [
-          'timeInRange',
-          'averageGlucose',
-          'sensorUsage',
-          'glucoseManagementIndicator',
-          'coefficientOfVariation',
-        ],
+        stats: this.getStatsByChartType('agp', data),
         types: {
           cbg: {},
         },
@@ -497,7 +561,7 @@ class Report {
   getReportOptions(data) {
     const datesByReport = this.getDateRangeByReport({ data });
 
-    const reportQueries = this.buildReportQueries();
+    const reportQueries = this.buildReportQueries({ data });
 
     const printOptions = {
       agp: {
@@ -702,6 +766,61 @@ class Report {
       fetchConfig,
     );
 
+    if (this.#reportDates) {
+      // fetch the latest pump settings record for date bound reports
+      const pumpSettingsFetch = await fetchUserData(
+        this.#userDetail.userId,
+        {
+          headers: this.#requestData.sessionHeader,
+          params: {
+            type: 'pumpSettings',
+            latest: 1,
+          },
+        },
+      ).catch((error) => {
+        this.#log.error(error);
+      });
+
+      if (pumpSettingsFetch?.length > 0) {
+        userData.push(pumpSettingsFetch[0]);
+      }
+
+      const latestPumpSettings = find(userData, {
+        type: 'pumpSettings',
+      });
+
+      const latestPumpSettingsUploadId = get(
+        latestPumpSettings || {},
+        'uploadId',
+      );
+
+      const latestPumpSettingsUpload = find(userData, {
+        type: 'upload',
+        uploadId: latestPumpSettingsUploadId,
+      });
+
+      if (latestPumpSettingsUploadId && !latestPumpSettingsUpload) {
+        // If we have pump settings, but we don't have the corresponing upload record used
+        // to get the device source, we need to fetch it
+        const pumpSettingsUploadFetch = await fetchUserData(
+          this.#userDetail.userId,
+          {
+            headers: this.#requestData.sessionHeader,
+            params: {
+              type: 'upload',
+              uploadId: latestPumpSettingsUploadId,
+            },
+          },
+        ).catch((error) => {
+          this.#log.error(error);
+        });
+
+        if (pumpSettingsUploadFetch?.length > 0) {
+          userData.push(pumpSettingsUploadFetch[0]);
+        }
+      }
+    }
+
     this.#log.debug(`Downloading data for User ${this.#userDetail.userId}...`);
 
     this.#log.debug('add data to dataUtil');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tidepool/export",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "main": "app.js",
   "repository": {
     "type": "git",