Merge pull request #2268 from HHS/al-ttahub-3083-optimize-program-query

[TTAHUB-3083] Integrate programs retrieve into normal sequelize pattern

Author: AdamAdHocTeam

src/services/activityReports.js

@@ -300,80 +300,6 @@ export function activityReportByLegacyId(legacyId) {
   });
 }
 
-export async function populateRecipientInfo(activityRecipients, grantPrograms) {
-  /*
-      Hopefully this code is temporary until we figure
-      out why joining programs to grants causes issues.
-  */
-  return activityRecipients.map((recipient) => {
-    if (recipient.grant && grantPrograms.length) {
-      const programsToAssign = grantPrograms.filter((p) => p.grantId === recipient.grantId);
-      // Programs.
-      Object.defineProperty(
-        recipient.grant,
-        'programs',
-        {
-          value: programsToAssign,
-          enumerable: true,
-        },
-      );
-
-      // Program Types.
-      const programTypes = programsToAssign && programsToAssign.length > 0
-        ? [...new Set(
-          programsToAssign.filter((p) => (p.programType))
-            .map((p) => (p.programType)).sort(),
-        )] : [];
-      Object.defineProperty(
-        recipient.grant,
-        'programTypes',
-        {
-          value: programTypes,
-          enumerable: true,
-        },
-      );
-
-      // Number with Program Types.
-      const numberWithProgramTypes = `${recipient.grant.number} ${programTypes.length > 0 ? ` - ${programTypes.join(', ')}` : ''}`;
-
-      Object.defineProperty(
-        recipient.grant,
-        'numberWithProgramTypes',
-        {
-          value: numberWithProgramTypes,
-          enumerable: true,
-        },
-      );
-
-      // Name.
-      let nameValue;
-      if (recipient.grant.recipient) {
-        nameValue = `${recipient.grant.recipient.name} - ${recipient.grant.numberWithProgramTypes}`;
-      } else {
-        nameValue = `${recipient.grant.numberWithProgramTypes}`;
-      }
-      Object.defineProperty(
-        recipient.grant,
-        'name',
-        {
-          value: nameValue,
-          enumerable: true,
-        },
-      );
-
-      Object.defineProperty(
-        recipient,
-        'name',
-        {
-          value: nameValue,
-          enumerable: true,
-        },
-      );
-    }
-    return { ...recipient };
-  });
-}
-
 export async function activityReportAndRecipientsById(activityReportId) {
   const arId = parseInt(activityReportId, DECIMAL_BASE);
 
@@ -395,22 +321,23 @@ export async function activityReportAndRecipientsById(activityReportId) {
       {
         model: Grant,
         as: 'grant',
+        include: [
+          {
+            model: Program,
+            as: 'programs',
+            attributes: ['programType'],
+          },
+          {
+            model: Recipient,
+            as: 'recipient',
+            attributes: ['name'],
+          },
+        ],
       },
     ],
   });
 
-  // Get all grant programs at once to reduce DB calls.
-  const grantIds = recipients.map((a) => a.grantId);
-  const grantPrograms = await Program.findAll({
-    where: {
-      grantId: grantIds,
-    },
-  });
-
-  // Populate Activity Recipient info.
-  const updatedRecipients = await populateRecipientInfo(recipients, grantPrograms);
-
-  const activityRecipients = updatedRecipients.map((recipient) => {
+  const activityRecipients = recipients.map((recipient) => {
     const name = recipient.otherEntity ? recipient.otherEntity.name : recipient.grant.name;
     const activityRecipientId = recipient.otherEntity
       ? recipient.otherEntity.dataValues.id : recipient.grant.dataValues.id;
@@ -724,17 +651,6 @@ export async function activityReports(
     name: arot.topic.name,
   }));
 
-  // Get all grant programs at once to reduce DB calls.
-  const grantIds = recipients.map((a) => a.grantId);
-  const grantPrograms = await Program.findAll({
-    where: {
-      grantId: grantIds,
-    },
-  });
-
-  // Populate Activity Recipient info.
-  await populateRecipientInfo(recipients, grantPrograms);
-
   return {
     ...reports, recipients, topics,
   };
@@ -1251,6 +1167,18 @@ async function getDownloadableActivityReports(where, separate = true) {
           {
             model: Grant,
             as: 'grant',
+            include: [
+              {
+                model: Program,
+                as: 'programs',
+                attributes: ['programType'],
+              },
+              {
+                model: Recipient,
+                as: 'recipient',
+                attributes: ['name'],
+              },
+            ],
           },
         ],
       },
@@ -1329,21 +1257,7 @@ async function getDownloadableActivityReports(where, separate = true) {
   };
 
   // Get reports.
-  const reports = await batchQuery(query, 2000);
-
-  // Populate Activity Recipient info.
-  const updatedReportPromises = reports.map(async (r) => {
-    const grantIds = r.activityRecipients.map((a) => a.grantId);
-    // Get all grant programs at once to reduce DB calls.
-    const grantPrograms = await Program.findAll({
-      where: {
-        grantId: grantIds,
-      },
-    });
-    const updatedRecipients = await populateRecipientInfo(r.activityRecipients, grantPrograms);
-    return { ...r, activityRecipients: updatedRecipients };
-  });
-  return Promise.all(updatedReportPromises);
+  return batchQuery(query, 2000);
 }
 
 export async function getAllDownloadableActivityReports(