Merge pull request #54 from tidepool-org/WEB-2640-bgm-agp

[WEB-2640] add bgm agp reports

Author: krystophv

lib/report.js

@@ -19,7 +19,21 @@ const { DataUtil } = vizDataUtil;
 const { createPrintPDFPackage, utils: PrintPDFUtils } = vizPrintUtil;
 const { generateAGPFigureDefinitions } = getAGPFigures;
 const {
-  reject, includes, max, map, find, get, pick, flatten, valuesIn, some, keys, isArray, fromPairs,
+  reject,
+  includes,
+  max,
+  map,
+  find,
+  get,
+  pick,
+  flatten,
+  valuesIn,
+  some,
+  keys,
+  isArray,
+  fromPairs,
+  reduce,
+  each,
 } = _;
 PrintPDFUtils.PDFDocument = PDFKit;
 PrintPDFUtils.blobStream = blobStream.default;
@@ -47,7 +61,8 @@ class Report {
     all: 'all',
     basics: 'basics',
     bgLog: 'bgLog',
-    agp: 'agp',
+    agpBGM: 'agpBGM',
+    agpCGM: 'agpCGM',
     daily: 'daily',
     settings: 'settings',
   };
@@ -174,11 +189,11 @@ class Report {
   }
 
   getStatsByChartType(chartType, data) {
-    const bgSource = _.get(data, 'metaData.bgSources.current');
+    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 isAutomatedBasalDevice = get(data, 'metaData.latestPumpUpload.isAutomatedBasalDevice');
+    const isSettingsOverrideDevice = get(data, 'metaData.latestPumpUpload.isSettingsOverrideDevice');
 
     const stats = [];
 
@@ -218,12 +233,21 @@ class Report {
         stats.push(this.#commonStats.coefficientOfVariation);
         break;
 
-      case 'agp':
-        stats.push(this.#commonStats.timeInRange);
+      case 'agpBGM':
         stats.push(this.#commonStats.averageGlucose);
-        stats.push(this.#commonStats.sensorUsage);
+        stats.push(this.#commonStats.bgExtents);
+        stats.push(this.#commonStats.coefficientOfVariation);
         stats.push(this.#commonStats.glucoseManagementIndicator);
+        stats.push(this.#commonStats.readingsInRange);
+        break;
+
+      case 'agpCGM':
+        stats.push(this.#commonStats.averageGlucose);
+        stats.push(this.#commonStats.bgExtents);
         stats.push(this.#commonStats.coefficientOfVariation);
+        stats.push(this.#commonStats.glucoseManagementIndicator);
+        stats.push(this.#commonStats.sensorUsage);
+        stats.push(this.#commonStats.timeInRange);
         break;
 
       case 'trends':
@@ -249,7 +273,7 @@ class Report {
   }
 
   buildReportQueries({ data }) {
-    const bgSource = _.get(data, 'metaData.bgSources.current');
+    const bgSource = get(data, 'metaData.bgSources.current');
     const dataQueries = {
       basics: {
         endpoints: [],
@@ -295,11 +319,24 @@ class Report {
         timePrefs: this.getTimePrefs(),
         excludedDevices: [],
       },
-      agp: {
+      agpBGM: {
+        endpoints: [],
+        aggregationsByDate: 'dataByDate, statsByDate',
+        bgSource: 'smbg',
+        stats: this.getStatsByChartType('agpBGM', data),
+        types: {
+          smbg: {},
+        },
+        bgPrefs: this.getBGPrefs(),
+        metaData: 'latestPumpUpload, bgSources',
+        timePrefs: this.getTimePrefs(),
+        excludedDevices: [],
+      },
+      agpCGM: {
         endpoints: [],
         aggregationsByDate: 'dataByDate, statsByDate',
         bgSource: 'cbg',
-        stats: this.getStatsByChartType('agp', data),
+        stats: this.getStatsByChartType('agpCGM', data),
         types: {
           cbg: {},
         },
@@ -324,8 +361,11 @@ class Report {
     if (!this.#reports.includes(this.#reportTypes.bgLog)) {
       delete dataQueries.bgLog;
     }
-    if (!this.#reports.includes(this.#reportTypes.agp)) {
-      delete dataQueries.agp;
+    if (!this.#reports.includes(this.#reportTypes.agpBGM)) {
+      delete dataQueries.agpBGM;
+    }
+    if (!this.#reports.includes(this.#reportTypes.agpCGM)) {
+      delete dataQueries.agpCGM;
     }
     if (!this.#reports.includes(this.#reportTypes.settings)) {
       delete dataQueries.settings;
@@ -436,7 +476,8 @@ class Report {
     const {
       data,
       days = {
-        agp: 14,
+        agpBGM: 30,
+        agpCGM: 14,
         basics: 14,
         daily: 14,
         bgLog: 30,
@@ -463,7 +504,11 @@ class Report {
       }
 
       return {
-        agp: {
+        agpBGM: {
+          startDate: bgLogStartDate,
+          endDate,
+        },
+        agpCGM: {
           startDate,
           endDate,
         },
@@ -484,7 +529,8 @@ class Report {
     }
 
     const dates = {
-      agp: {},
+      agpBGM: {},
+      agpCGM: {},
       daily: {},
       basics: {},
       bgLog: {},
@@ -521,13 +567,19 @@ class Report {
       ]),
     );
 
-    dates.agp.endDate = lastAGPDate
+    dates.agpCGM.endDate = lastAGPDate
       ? moment.utc(lastAGPDate).tz(this.#timezoneName).add(1, 'day').startOf('day')
       : endOfToday();
+    dates.agpCGM.startDate = moment.utc(dates.agp.endDate)
+      .tz(this.#timezoneName)
+      .subtract(days.agpCGM - 1, 'days');
 
-    dates.agp.startDate = moment.utc(dates.agp.endDate)
+    dates.agpBGM.endDate = lastAGPDate
+      ? moment.utc(lastAGPDate).tz(this.#timezoneName).add(1, 'day').startOf('day')
+      : endOfToday();
+    dates.agpBGM.startDate = moment.utc(dates.agpBGM.endDate)
       .tz(this.#timezoneName)
-      .subtract(days.agp - 1, 'days');
+      .subtract(days.agpBGM - 1, 'days');
 
     dates.daily.endDate = lastDailyDate
       ? moment.utc(lastDailyDate).tz(this.#timezoneName).add(1, 'day').startOf('day')
@@ -564,10 +616,17 @@ class Report {
     const reportQueries = this.buildReportQueries({ data });
 
     const printOptions = {
-      agp: {
+      agpBGM: {
         endpoints: [
-          datesByReport.agp.startDate.toDate(),
-          datesByReport.agp.endDate.toDate(),
+          datesByReport.agpBGM.startDate.toDate(),
+          datesByReport.agpBGM.endDate.toDate(),
+        ],
+        disabled: false,
+      },
+      agpCGM: {
+        endpoints: [
+          datesByReport.agpCGM.startDate.toDate(),
+          datesByReport.agpCGM.endDate.toDate(),
         ],
         disabled: false,
       },
@@ -619,8 +678,11 @@ class Report {
     ) {
       reportQueries.basics.endpoints = printOptions.basics.endpoints;
     }
-    if (this.#reports.includes(this.#reportTypes.all, this.#reportTypes.agp)) {
-      reportQueries.agp.endpoints = printOptions.agp.endpoints;
+    if (this.#reports.includes(this.#reportTypes.all, this.#reportTypes.agpBGM)) {
+      reportQueries.agpBGM.endpoints = printOptions.agpBGM.endpoints;
+    }
+    if (this.#reports.includes(this.#reportTypes.all, this.#reportTypes.agpCGM)) {
+      reportQueries.agpCGM.endpoints = printOptions.agpCGM.endpoints;
     }
     if (
       this.#reports.includes(this.#reportTypes.all, this.#reportTypes.bgLog)
@@ -660,11 +722,18 @@ class Report {
     const pdfData = {};
     const options = opts;
 
-    if (queries.agp) {
-      pdfData.agp = this.#dataUtil.query(queries.agp);
-      options.agp.disabled = !containsDataForReport(
+    if (queries.agpBGM) {
+      pdfData.agpBGM = this.#dataUtil.query(queries.agpBGM);
+      options.agpBGM.disabled = !containsDataForReport(
+        pdfData,
+        'agpBGM.data.current.data',
+      );
+    }
+    if (queries.agpCGM) {
+      pdfData.agpCGM = this.#dataUtil.query(queries.agpCGM);
+      options.agpCGM.disabled = !containsDataForReport(
         pdfData,
-        'agp.data.current.data',
+        'agpCGM.data.current.data',
       );
     }
     if (queries.daily) {
@@ -707,22 +776,35 @@ class Report {
     return this.resp.data;
   }
 
-  async processAGPSVGs(agpPDFData) {
-    this.agpSVGFigures = await generateAGPFigureDefinitions({
-      ...agpPDFData,
-    });
-    this.agpFigurePromises = map(this.agpSVGFigures, async (image, key) => {
-      if (isArray(image)) {
-        const processedArray = await Promise.all(
-          map(image, async (img) => this.graphRendererOrca(img)),
-        );
-        return [key, processedArray];
-      }
-      const processedValue = await this.graphRendererOrca(image);
-      return [key, processedValue];
+  async processAGPSVGs(agpPDFData, reportTypes) {
+    const promises = [];
+
+    await each(reportTypes, async (reportType) => {
+      const images = await generateAGPFigureDefinitions({
+        ...agpPDFData?.[reportType],
+      });
+
+      promises.push(...map(images, async (image, key) => {
+        if (isArray(image)) {
+          const processedArray = await Promise.all(
+            map(image, async (img) => this.graphRendererOrca(img)),
+          );
+          return [reportType, [key, processedArray]];
+        }
+        const processedValue = await this.graphRendererOrca(image);
+        return [reportType, [key, processedValue]];
+      }));
     });
-    const processedEntries = await Promise.all(this.agpFigurePromises);
-    return fromPairs(processedEntries);
+
+    const results = await Promise.all(promises);
+
+    const processedImages = reduce(results, (res, entry) => {
+      const processedImage = fromPairs(entry.slice(1));
+      res[entry[0]] = { ...res[entry[0]], ...processedImage };
+      return res;
+    }, {});
+
+    return processedImages;
   }
 
   async generate() {
@@ -836,9 +918,17 @@ class Report {
     this.#log.debug('getting pdf report data');
 
     const reportData = this.runReportQueries(queries, printOptions);
-    if (!reportData.options.agp.disabled) {
+    const reportTypes = [];
+    if (!reportData.options.agpBGM.disabled) {
+      reportTypes.push('agpBGM');
+    }
+    if (!reportData.options.agpCGM.disabled) {
+      reportTypes.push('agpCGM');
+    }
+    if (reportTypes.length > 0) {
       reportData.options.svgDataURLS = await this.processAGPSVGs(
-        reportData.pdfData.agp,
+        reportData.pdfData,
+        reportTypes,
       );
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tidepool/export",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "main": "app.js",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@godaddy/terminus": "4.12.1",
     "@tidepool/data-tools": "2.4.1",
-    "@tidepool/viz": "1.36.0",
+    "@tidepool/viz": "1.37.0",
     "axios": "1.4.0",
     "blob-stream": "0.1.3",
     "body-parser": "1.20.2",