Change analytics queries to run sequentially (#1344)

* Change analytics queries to run sequentially

* remove defaultMaxListeners test change

Author: ktuite

lib/model/query/analytics.js

@@ -10,6 +10,7 @@
 const config = require('config');
 const { sql } = require('slonik');
 const { clone } = require('ramda');
+const { runSequentially } = require('../../util/promise');
 const { metricsTemplate } = require('../../data/analytics');
 const oidc = require('../../util/oidc');
 
@@ -557,24 +558,24 @@ JOIN submission_defs as sd
 const getProjectsWithDescriptions = () => ({ all }) => all(sql`
 select id as "projectId", length(trim(description)) as description_length from projects where coalesce(trim(description),'')!=''`);
 
-const projectMetrics = () => (({ Analytics }) => Promise.all([
-  Analytics.countUsersPerRole(),
-  Analytics.countAppUsers(),
-  Analytics.countDeviceIds(),
-  Analytics.countPublicLinks(),
-  Analytics.countForms(),
-  Analytics.countFormFieldTypes(),
-  Analytics.countFormsEncrypted(),
-  Analytics.countFormsInStates(),
-  Analytics.countReusedFormIds(),
-  Analytics.countSubmissions(),
-  Analytics.countSubmissionReviewStates(),
-  Analytics.countSubmissionsEdited(),
-  Analytics.countSubmissionsComments(),
-  Analytics.countSubmissionsByUserType(),
-  Analytics.getProjectsWithDescriptions(),
-  Analytics.getDatasets(),
-  Analytics.getDatasetEvents()
+const projectMetrics = () => (({ Analytics }) => runSequentially([
+  Analytics.countUsersPerRole,
+  Analytics.countAppUsers,
+  Analytics.countDeviceIds,
+  Analytics.countPublicLinks,
+  Analytics.countForms,
+  Analytics.countFormFieldTypes,
+  Analytics.countFormsEncrypted,
+  Analytics.countFormsInStates,
+  Analytics.countReusedFormIds,
+  Analytics.countSubmissions,
+  Analytics.countSubmissionReviewStates,
+  Analytics.countSubmissionsEdited,
+  Analytics.countSubmissionsComments,
+  Analytics.countSubmissionsByUserType,
+  Analytics.getProjectsWithDescriptions,
+  Analytics.getDatasets,
+  Analytics.getDatasetEvents
 ]).then(([ userRoles, appUsers, deviceIds, pubLinks,
   forms, formGeoRepeats, formsEncrypt, formStates, reusedIds,
   subs, subStates, subEdited, subComments, subUsers,
@@ -725,24 +726,24 @@ const projectMetrics = () => (({ Analytics }) => Promise.all([
   return projArray;
 }));
 
-const previewMetrics = () => (({ Analytics }) => Promise.all([
-  Analytics.databaseSize(),
-  Analytics.encryptedProjects(),
-  Analytics.biggestForm(),
-  Analytics.countAdmins(),
-  Analytics.auditLogs(),
-  Analytics.archivedProjects(),
-  Analytics.countUniqueManagers(),
-  Analytics.countUniqueViewers(),
-  Analytics.countUniqueDataCollectors(),
-  Analytics.countClientAuditAttachments(),
-  Analytics.countClientAuditProcessingFailed(),
-  Analytics.countClientAuditRows(),
-  Analytics.countOfflineBranches(),
-  Analytics.countInterruptedBranches(),
-  Analytics.countSubmissionReprocess(),
-  Analytics.measureEntityProcessingTime(),
-  Analytics.projectMetrics()
+const previewMetrics = () => (({ Analytics }) => runSequentially([
+  Analytics.databaseSize,
+  Analytics.encryptedProjects,
+  Analytics.biggestForm,
+  Analytics.countAdmins,
+  Analytics.auditLogs,
+  Analytics.archivedProjects,
+  Analytics.countUniqueManagers,
+  Analytics.countUniqueViewers,
+  Analytics.countUniqueDataCollectors,
+  Analytics.countClientAuditAttachments,
+  Analytics.countClientAuditProcessingFailed,
+  Analytics.countClientAuditRows,
+  Analytics.countOfflineBranches,
+  Analytics.countInterruptedBranches,
+  Analytics.countSubmissionReprocess,
+  Analytics.measureEntityProcessingTime,
+  Analytics.projectMetrics
 ]).then(([db, encrypt, bigForm, admins, audits,
   archived, managers, viewers, collectors,
   caAttachments, caFailures, caRows,

test/integration/other/analytics-queries.js

@@ -2143,9 +2143,6 @@ describe('analytics task queries', function () {
     }));
 
     it('should fill in all project.datasets queries', testService(async (service, container) => {
-      const { defaultMaxListeners } = require('events').EventEmitter;
-      require('events').EventEmitter.defaultMaxListeners = 30;
-
       const asAlice = await service.login('alice');
 
       // Create first Dataset
@@ -2308,9 +2305,6 @@ describe('analytics task queries', function () {
 
       // Assert that a Project without a Dataset returns an empty array
       res.projects[1].datasets.should.be.eql([]);
-
-      // revert to original default
-      require('events').defaultMaxListeners = defaultMaxListeners;
     }));
   });