Merge pull request #604 from HHS/TTAHUB-427/add-goal-scope

[TTAHUB-427] Only fetch goals with certain statuses for selection when creating a draft AR

Author: thewatermethod

src/services/goals.js

@@ -1,3 +1,4 @@
+import { Op } from 'sequelize';
 import {
   Goal,
   Grant,
@@ -18,16 +19,28 @@ export async function goalsForGrants(grantIds) {
   });
 
   /**
-   *  we need one big array that includes the old grantee id as well
+   * we need one big array that includes the old grantee id as well,
+   * removing all the nulls along the way
    */
-  const ids = grants.reduce((previous, current) => [...previous, current.id, current.oldGrantId],
-    []);
+  const ids = grants
+    .reduce((previous, current) => [...previous, current.id, current.oldGrantId], [])
+    .filter((g) => g != null);
 
   /*
   * finally, return all matching goals
   */
 
   return Goal.findAll({
+    where: {
+      [Op.or]: [
+        {
+          status: 'Not Started',
+        },
+        {
+          status: 'In Progress',
+        },
+      ],
+    },
     include: [
       {
         model: Grant,

src/services/goals.test.js

@@ -1,3 +1,4 @@
+import { Op } from 'sequelize';
 import {
   copyGoalsToGrants, saveGoalsForReport, goalsForGrants,
 } from './goals';
@@ -204,6 +205,16 @@ describe('goalsForGrants', () => {
     await goalsForGrants([506]);
 
     expect(Goal.findAll).toHaveBeenCalledWith({
+      where: {
+        [Op.or]: [
+          {
+            status: 'Not Started',
+          },
+          {
+            status: 'In Progress',
+          },
+        ],
+      },
       include: [
         {
           model: Grant,