wip

usdigitalresponse · Sep 30, 2024 · e0b63ab · e0b63ab
1 parent 4f4e671
commit e0b63ab
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/packages/server/.env.example b/packages/server/.env.example
@@ -10,6 +10,7 @@ API_DOMAIN=http://localhost:8080
 
 ENABLE_GRANTS_SCRAPER=true
 SHARE_TERMINOLOGY_ENABLED=true
+SHOW_FORECASTED_GRANTS=true
 GRANTS_SCRAPER_DATE_RANGE=7
 GRANTS_SCRAPER_DELAY=1000
 NODE_OPTIONS=--max_old_space_size=1024

diff --git a/packages/server/src/db/index.js b/packages/server/src/db/index.js
@@ -350,7 +350,6 @@ async function getNewGrantsForAgency(agency) {
         .modify(helpers.whereAgencyCriteriaMatch, agencyCriteria)
         .modify((qb) => {
             qb.where({ open_date: moment().subtract(1, 'day').format('YYYY-MM-DD') })
-                .whereNot({ opportunity_status: 'forecasted' });
         })
         .limit(3);
 
@@ -714,7 +713,7 @@ function addCsvData(qb) {
     tenantId: number
     agencyId: number
 */
-async function getGrantsNew(filters, paginationParams, orderingParams, tenantId, agencyId, toCsv) {
+async function getGrantsNew(filters, paginationParams, orderingParams, tenantId, agencyId, toCsv, showForecastedGrants=false) {
     const errors = validateSearchFilters(filters);
     if (errors.length > 0) {
         throw new Error(`Invalid filters: ${errors.join(', ')}`);
@@ -760,10 +759,14 @@ async function getGrantsNew(filters, paginationParams, orderingParams, tenantId,
             NULLIF(grants.award_ceiling, 0) as award_ceiling
         `))
         .modify((qb) => grantsQuery(qb, filters, agencyId, orderingParams, paginationParams))
+        .modify((qb) => {
+            if (!showForecastedGrants) {
+                qb.whereNot({ opportunity_status: 'forecasted' });
+            }
+        })
         .select(knex.raw(`
             count(*) OVER() AS full_count
         `))
-        .whereNot({ opportunity_status: 'forecasted' })
         .groupBy(
             'grants.grant_id',
             'grants.grant_number',
@@ -844,10 +847,9 @@ async function enhanceGrantData(tenantId, data) {
 }
 
 async function getGrants({
-    currentPage, perPage, tenantId, filters, orderBy, searchTerm, orderDesc,
+    currentPage, perPage, tenantId, filters, orderBy, searchTerm, orderDesc, showForecastedGrants
 } = {}) {
     const data = await knex(TABLES.grants)
-        .whereNot(`${TABLES.grants}.opportunity_status`, 'forecasted')
         .modify((queryBuilder) => {
             if (searchTerm && searchTerm !== 'null') {
                 queryBuilder.andWhere(
@@ -856,6 +858,9 @@ async function getGrants({
                         .orWhere(`${TABLES.grants}.title`, '~*', searchTerm),
                 );
             }
+            if (!showForecastedGrants) {
+                queryBuilder.andWhereNot(`${TABLES.grants}.opportunity_status`, 'forecasted');
+            }
             if (filters) {
                 if (filters.interestedByUser || filters.positiveInterest || filters.result || filters.rejected || filters.interestedByAgency) {
                     queryBuilder.join(TABLES.grants_interested, `${TABLES.grants}.grant_id`, `${TABLES.grants_interested}.grant_id`)
@@ -1006,19 +1011,27 @@ async function getGrants({
     return { data: dataWithAgency, pagination };
 }
 
-async function getGrant({ grantId }) {
+async function getGrant({ grantId, showForecastedGrants }) {
     const results = await knex.table(TABLES.grants)
         .select('*')
         .where({ grant_id: grantId })
-        .whereNot({ opportunity_status: 'forecasted' });
+        .modify((queryBuilder) => {
+            if (!showForecastedGrants) {
+                queryBuilder.whereNot({ opportunity_status: 'forecasted' });
+            }
+        })
     return results[0];
 }
 
-async function getSingleGrantDetails({ grantId, tenantId }) {
+async function getSingleGrantDetails({ grantId, tenantId, showForecastedGrants }) {
     const results = await knex.table(TABLES.grants)
         .select('*')
         .where({ grant_id: grantId })
-        .whereNot({ opportunity_status: 'forecasted' });
+        .modify((queryBuilder) => {
+            if (!showForecastedGrants) {
+                queryBuilder.whereNot({ opportunity_status: 'forecasted' });
+            }
+        })
     const enhancedResults = await enhanceGrantData(tenantId, results);
     return enhancedResults.length ? enhancedResults[0] : null;
 }

diff --git a/packages/server/src/lib/email.js b/packages/server/src/lib/email.js
@@ -423,7 +423,7 @@ async function sendGrantAssignedEmails({ grantId, agencyIds, userId }) {
             i. Send email
     */
     try {
-        const grant = await db.getGrant({ grantId });
+        const grant = await db.getGrant({ grantId, showForecastedGrants: process.env.SHOW_FORECASTED_GRANTS });
         const grantDetail = await buildGrantDetail(grant, notificationType.grantAssignment);
         const agencies = await db.getAgenciesByIds(agencyIds);
         await asyncBatch(

diff --git a/packages/server/src/routes/grants.js b/packages/server/src/routes/grants.js
@@ -42,6 +42,7 @@ router.get('/', requireUser, async (req, res) => {
         },
         orderBy: req.query.orderBy,
         orderDesc: req.query.orderDesc,
+        showForecastedGrants: process.env.SHOW_FORECASTED_GRANTS,
     });
     res.json(grants);
 });
@@ -124,6 +125,7 @@ router.get('/next', requireUser, async (req, res) => {
         user.tenant_id,
         user.agency_id,
         false,
+        process.env.SHOW_FORECASTED_GRANTS,
     );
 
     return res.json(grants);
@@ -133,7 +135,7 @@ router.get('/next', requireUser, async (req, res) => {
 router.get('/:grantId/grantDetails', requireUser, async (req, res) => {
     const { grantId } = req.params;
     const { user } = req.session;
-    const response = await db.getSingleGrantDetails({ grantId, tenantId: user.tenant_id });
+    const response = await db.getSingleGrantDetails({ grantId, tenantId: user.tenant_id, showForecastedGrants: process.env.SHOW_FORECASTED_GRANTS });
     res.json(response);
 });
 
@@ -160,6 +162,7 @@ router.get('/exportCSVNew', requireUser, async (req, res) => {
         user.tenant_id,
         user.agency_id,
         true,
+        process.env.SHOW_FORECASTED_GRANTS,
     );
 
     // Generate CSV

diff --git a/terraform/prod.tfvars b/terraform/prod.tfvars
@@ -75,6 +75,7 @@ api_datadog_environment_variables = {
 api_container_environment = {
   NEW_GRANT_DETAILS_PAGE_ENABLED = true,
   SHARE_TERMINOLOGY_ENABLED      = true,
+  SHOW_FORECASTED_GRANTS         = false,
 }
 
 // Postgres

diff --git a/terraform/staging.tfvars b/terraform/staging.tfvars
@@ -74,6 +74,7 @@ api_datadog_environment_variables = {
 api_container_environment = {
   NEW_GRANT_DETAILS_PAGE_ENABLED = true,
   SHARE_TERMINOLOGY_ENABLED      = true,
+  SHOW_FORECASTED_GRANTS         = true,
 }
 
 // Postgres