Merge pull request #245 from adhocteam/active-grants-only

Return active grants only

src/migrations/20210315234158-seed-non-grantee-recipients.js

@@ -0,0 +1,19 @@
+module.exports = {
+  up: (queryInterface) => queryInterface.bulkInsert('NonGrantees', [
+    { name: 'CCDF / Child Care Administrator' },
+    { name: 'Head Start Collaboration Office' },
+    { name: 'QRIS System' },
+    { name: 'Regional Head Start Association' },
+    { name: 'Regional TTA/Other Specialists' },
+    { name: 'State CCR&R' },
+    { name: 'State Early Learning Standards' },
+    { name: 'State Education System' },
+    { name: 'State Health System' },
+    { name: 'State Head Start Association' },
+    { name: 'State Professional Development / Continuing Education' },
+  ],
+  {
+    ignoreDuplicates: true,
+  }),
+  down: (queryInterface) => queryInterface.bulkDelete('Regions', null, {}),
+};

src/services/activityReports.js

@@ -560,10 +560,14 @@ export async function setStatus(report, status) {
  * @returns {*} Grants and Non grantees
  */
 export async function possibleRecipients(regionId) {
-  const where = regionId ? { regionId } : undefined;
+  let where = { status: 'Active' };
+  if (regionId) {
+    where = { ...where, regionId };
+  }
 
   const grants = await Grantee.findAll({
     attributes: ['id', 'name'],
+    order: ['name'],
     include: [{
       where,
       model: Grant,

src/services/activityReports.test.js

@@ -73,7 +73,7 @@ describe('Activity Reports DB service', () => {
     grantee = await Grantee.create({ id: RECIPIENT_ID, name: 'grantee', regionId: 17 });
     await Region.create({ name: 'office 17', id: 17 });
     await Grant.create({
-      id: RECIPIENT_ID, number: 1, granteeId: grantee.id, regionId: 17,
+      id: RECIPIENT_ID, number: 1, granteeId: grantee.id, regionId: 17, status: 'Active',
     });
     await NonGrantee.create({ id: RECIPIENT_ID, name: 'nonGrantee' });
   });
@@ -454,8 +454,7 @@ describe('Activity Reports DB service', () => {
 
     it('retrieves all recipients when not specifying region', async () => {
       const recipients = await possibleRecipients();
-      const grantees = await Grantee.findAll();
-      expect(recipients.grants.length).toBe(grantees.length);
+      expect(recipients.grants.length).toBe(11);
     });
   });
 });