Merge pull request #2265 from HHS/jp/3095/dont-remove-expired-grants-…

…on-ar

[TTAHUB-3095] Don't remove expired grants from the recipients dropdown when an AR is unlocked

frontend/src/fetchers/activityReports.js

@@ -102,6 +102,12 @@ export const getRecipients = async (region) => {
   return recipients.json();
 };
 
+export const getRecipientsForExistingAR = async (reportId) => {
+  const url = join(activityReportUrl, `${reportId}`, 'activity-recipients');
+  const recipients = await get(url);
+  return recipients.json();
+};
+
 export const getGoals = async (grantIds) => {
   const params = grantIds.map((grantId) => `grantIds=${grantId}`);
   const url = join(activityReportUrl, 'goals', `?${params.join('&')}`);

frontend/src/pages/ActivityReport/__tests__/index.js

@@ -42,6 +42,7 @@ describe('ActivityReport', () => {
 
   beforeEach(() => {
     fetchMock.get('/api/activity-reports/activity-recipients?region=1', recipients);
+    fetchMock.get('/api/activity-reports/1/activity-recipients', recipients);
     fetchMock.get('/api/activity-reports/groups?region=1', [{
       id: 110,
       name: 'Group 1',
@@ -155,6 +156,7 @@ describe('ActivityReport', () => {
       };
 
       fetchMock.get('/api/activity-reports/activity-recipients?region=1', groupRecipients, { overwriteRoutes: true });
+      fetchMock.get('/api/activity-reports/1/activity-recipients', groupRecipients, { overwriteRoutes: true });
 
       const data = formData();
       fetchMock.get('/api/activity-reports/1', { ...data, activityRecipients: [] });
@@ -226,6 +228,7 @@ describe('ActivityReport', () => {
       };
 
       fetchMock.get('/api/activity-reports/activity-recipients?region=1', groupRecipients, { overwriteRoutes: true });
+      fetchMock.get('/api/activity-reports/1/activity-recipients', groupRecipients, { overwriteRoutes: true });
 
       const data = formData();
       fetchMock.get('/api/activity-reports/1', { ...data, activityRecipients: [] });
@@ -363,6 +366,7 @@ describe('ActivityReport', () => {
 
   describe('resetToDraft', () => {
     it('navigates to the correct page', async () => {
+      fetchMock.get('/api/activity-reports/3/activity-recipients', recipients);
       const data = formData();
       // load the report
       fetchMock.get('/api/activity-reports/3', {

frontend/src/pages/ActivityReport/__tests__/localStorage.js

@@ -37,6 +37,7 @@ describe('Local storage fallbacks', () => {
 
   beforeEach(() => {
     fetchMock.get('/api/activity-reports/activity-recipients?region=1', recipients);
+    fetchMock.get('/api/activity-reports/1/activity-recipients', recipients);
     fetchMock.get('/api/activity-reports/groups?region=1', []);
     fetchMock.get('/api/users/collaborators?region=1', []);
     fetchMock.get('/api/activity-reports/approvers?region=1', []);

frontend/src/pages/ActivityReport/index.js

@@ -34,13 +34,14 @@ import {
   submitReport,
   saveReport,
   getReport,
-  getRecipients,
+  getRecipientsForExistingAR,
   createReport,
   getCollaborators,
   getApprovers,
   reviewReport,
   resetToDraft,
   getGroupsForActivityReport,
+  getRecipients,
 } from '../../fetchers/activityReports';
 import useLocalStorage, { setConnectionActiveWithError } from '../../hooks/useLocalStorage';
 import NetworkContext, { isOnlineMode } from '../../NetworkContext';
@@ -277,8 +278,16 @@ function ActivityReport({
           };
         }
 
+        const getRecips = async () => {
+          if (reportId.current && reportId.current !== 'new') {
+            return getRecipientsForExistingAR(reportId.current);
+          }
+
+          return getRecipients(report.regionId);
+        };
+
         const apiCalls = [
-          getRecipients(report.regionId),
+          getRecips(),
           getCollaborators(report.regionId),
           getApprovers(report.regionId),
           getGroupsForActivityReport(report.regionId),

src/routes/activityReports/handlers.js

@@ -722,6 +722,24 @@ export async function getActivityRecipients(req, res) {
   res.json(activityRecipients);
 }
 
+export async function getActivityRecipientsForExistingReport(req, res) {
+  const { activityReportId } = req.params;
+
+  const [report] = await activityReportAndRecipientsById(activityReportId);
+  const userId = await currentUserId(req, res);
+  const user = await userById(userId);
+  const authorization = new ActivityReport(user, report);
+
+  if (!authorization.canGet()) {
+    res.sendStatus(403);
+    return;
+  }
+
+  const targetRegion = parseInt(report.regionId, DECIMAL_BASE);
+  const activityRecipients = await possibleRecipients(targetRegion, activityReportId);
+  res.json(activityRecipients);
+}
+
 /**
  * Retrieve an activity report
  *

src/routes/activityReports/index.js

@@ -9,6 +9,7 @@ import {
   getReports,
   getReportAlerts,
   getActivityRecipients,
+  getActivityRecipientsForExistingReport,
   getGoals,
   reviewReport,
   resetToDraft,
@@ -40,6 +41,7 @@ router.post('/', transactionWrapper(createReport));
 router.get('/approvers', transactionWrapper(getApprovers));
 router.get('/groups', transactionWrapper(getGroups));
 router.get('/activity-recipients', transactionWrapper(getActivityRecipients));
+router.get('/activity-recipients/:reportId', transactionWrapper(getActivityRecipientsForExistingReport));
 router.get('/goals', transactionWrapper(getGoals));
 router.post('/goals', transactionWrapper(createGoalsForReport));
 router.post('/objectives', transactionWrapper(saveOtherEntityObjectivesForReport));
@@ -60,5 +62,6 @@ router.put('/:activityReportId/review', checkActivityReportIdParam, transactionW
 router.put('/:activityReportId/submit', checkActivityReportIdParam, transactionWrapper(submitReport));
 router.put('/:activityReportId/unlock', checkActivityReportIdParam, transactionWrapper(unlockReport));
 router.put('/:activityReportId/goals/edit', checkActivityReportIdParam, transactionWrapper(setGoalAsActivelyEdited));
+router.get('/:activityReportId/activity-recipients', transactionWrapper(getActivityRecipientsForExistingReport));
 
 export default router;

src/services/activityReports.js

@@ -14,6 +14,7 @@ import {
   ActivityReportCollaborator,
   ActivityReportFile,
   sequelize,
+  Sequelize,
   ActivityRecipient,
   File,
   Grant,
@@ -1125,33 +1126,54 @@ export async function setStatus(report, status) {
  * @param {number} [regionId] - A region id to query against
  * @returns {*} Grants and Other entities
  */
-export async function possibleRecipients(regionId) {
-  const where = { status: 'Active', regionId };
-
+export async function possibleRecipients(regionId, activityReportId = null) {
   const grants = await Recipient.findAll({
-    attributes: ['id', 'name'],
+    attributes: [
+      'id',
+      'name',
+    ],
     order: ['name'],
-    include: [{
-      where,
-      model: Grant,
-      as: 'grants',
-      attributes: [['id', 'activityRecipientId'], 'name', 'number'],
-      include: [{
-        model: Recipient,
-        as: 'recipient',
-      },
+    include: [
       {
-        model: Program,
-        as: 'programs',
-        attributes: ['programType'],
+        model: Grant,
+        as: 'grants',
+        attributes: ['number', ['id', 'activityRecipientId'], 'name'],
+        required: true,
+        include: [
+          {
+            model: Program,
+            as: 'programs',
+            attributes: ['programType'],
+            required: false,
+          },
+          {
+            model: Recipient,
+            as: 'recipient',
+            required: true,
+          },
+          {
+            model: ActivityRecipient,
+            as: 'activityRecipients',
+            attributes: [],
+            required: false,
+          },
+        ],
       },
+    ],
+    where: {
+      '$grants.regionId$': regionId,
+      [Op.or]: [
+        { '$grants.status$': 'Active' },
+        { '$grants->activityRecipients.activityReportId$': activityReportId },
       ],
-    }],
+    },
   });
+
   const otherEntities = await OtherEntity.findAll({
     raw: true,
     attributes: [['id', 'activityRecipientId'], 'name'],
   });
+
   return { grants, otherEntities };
 }