Update fqmexec 1.3.1

.eslintignore

@@ -0,0 +1,2 @@
+connectathon
+ecqm-content-r4-2021

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [16.x, 18.x]
         mongodb-version: ['5.0']
 
     steps:
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [16.x, 18.x]
         mongodb-version: ['5.0']
     steps:
       - uses: actions/checkout@v2

package.json

@@ -34,7 +34,7 @@
     "cql-exec-fhir-mongo": "git+https://[email protected]/projecttacoma/cql-exec-fhir-mongo",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
-    "fqm-execution": "^1.0.5",
+    "fqm-execution": "^1.3.1",
     "lodash": "^4.17.21",
     "mongodb": "^4.1.3",
     "uuid": "^8.3.2",

src/queue/execQueue.js

@@ -41,7 +41,8 @@ class ScaledCalculation {
 
     // Prepare the fqm-execution measure report builder
     try {
-      this._mrBuilder = new MeasureReportBuilder(this._measureBundle, {
+      const measure_entry = this._measureBundle.entry?.find(e => e.resource?.resourceType === 'Measure');
+      this._mrBuilder = new MeasureReportBuilder(measure_entry.resource, {
         measurementPeriodStart: this._periodStart,
         measurementPeriodEnd: this._periodEnd,
         reportType: 'summary'

src/services/measure.service.js

@@ -237,7 +237,7 @@ const evaluateMeasure = async (args, { req }) => {
   const { reportType, subject } = req.query;
 
   // If reportType is not specified, default to 'subject', but
-  // only if the 'subject' parameter is also specificed
+  // only if the 'subject' parameter is also specified
   if (reportType === 'subject' || (reportType == null && subject != null)) {
     logger.debug('Evaluating measure for individual');
     return evaluateMeasureForIndividual(args, { req });

test/services/base.service.test.js

@@ -80,8 +80,9 @@ describe('base.service', () => {
               url: expect.stringMatching(/\/4_0_1\/Patient\?page=1$/)
             }
           ]);
-          expect(response.body.entry[0].resource.id).toEqual(testPatient.id);
-          expect(response.body.entry[0].resource.resourceType).toEqual('Patient');
+          const testPatientEntry = response.body.entry.find(e => e.resource.id === testPatient.id);
+          expect(testPatientEntry).toBeDefined();
+          expect(testPatientEntry.resource.resourceType).toEqual('Patient');
         });
     });