Merge pull request #742 from tolkamps1/epicsystem-23-add-comment-peri…

…od-aggregator-to-search [EPICSYSTEM-23] Add Public Comment Period aggregator to search
bcgov · Mar 8, 2024 · 245a18c · 245a18c
2 parents ba5f985 + 824c2f0
commit 245a18c
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 1 deletion.
diff --git a/api/aggregators/commentPeriodAggregator.js b/api/aggregators/commentPeriodAggregator.js
@@ -0,0 +1,75 @@
+const { setProjectDefault } = require('../helpers/aggregators');
+
+/**
+ * Creates an aggregate for looking up recent activity.
+ *
+ * @param {boolean} populate Flag indicating if fields need a look up
+ * @returns {array} Aggregate for recent activity
+ */
+exports.createCommentPeriodAggr = (populate) => {
+  let aggregation = [];
+
+  if (populate) {
+    // Handle project.
+    aggregation.push(
+      {
+        '$lookup': {
+          'from': 'epic',
+          'localField': 'project',
+          'foreignField': '_id',
+          'as': 'project'
+        }
+      },
+      {
+        '$addFields': {
+          project: '$project',
+        }
+      },
+      {
+        '$unwind': {
+          'path': '$project',
+          'preserveNullAndEmptyArrays': true
+        }
+      }
+    );
+
+    // Here we have documents with a nested Project and a nested legislation key
+    const defaultAggr = setProjectDefault(false);
+    aggregation = [...aggregation, ...defaultAggr];
+
+    // We need to merge the legislation key with the Project while preserving the _id and the rest of the document info
+    // TODO: Abstract these types of stages, as we will need to do this a lot")
+    aggregation.push(
+      {
+        '$addFields': {
+          'project': { '$mergeObjects': ['$project', '$project.default'] },
+        }
+      },
+      {
+        '$project': { ['project.legislation_2002']: 0 }
+      },
+      {
+        '$project': { ['project.legislation_1996']: 0 }
+      },
+      {
+        '$project': { ['project.default']: 0 }
+      },
+      {
+        '$lookup': {
+          from: 'epic',
+          localField: 'project.currentPhaseName',
+          foreignField: '_id',
+          as: 'project.currentPhaseName'
+        }
+      },
+      {
+        '$unwind': {
+          path: '$project.currentPhaseName',
+          preserveNullAndEmptyArrays: true
+        }
+      }
+    );
+  }
+
+  return aggregation;
+};
diff --git a/api/controllers/search.js b/api/controllers/search.js
@@ -14,6 +14,7 @@ const recentActivityAggregator = require('../aggregators/recentActivityAggregato
 const inspectionAggregator = require('../aggregators/inspectionAggregator');
 const notificationProjectAggregator = require('../aggregators/notificationProjectAggregator');
 const itemAggregator = require('../aggregators/itemAggregator');
+const commentPeriodAggregator = require('../aggregators/commentPeriodAggregator');
 const searchAggregator = require('../aggregators/searchAggregator');
 const aggregateHelper = require('../helpers/aggregators');
 
@@ -73,6 +74,10 @@ const searchCollection = async function (roles, keywords, schemaName, pageNum, p
   case constants.LIST:
     matchAggregation = await searchAggregator.createMatchAggr(schemaName, project, decodedKeywords, caseSensitive, or, and, roles);
     break;
+  case constants.COMMENT_PERIOD:
+    matchAggregation = await searchAggregator.createMatchAggr(schemaName, project, decodedKeywords, caseSensitive, or, and, roles);
+    schemaAggregation = commentPeriodAggregator.createCommentPeriodAggr(populate);
+    break;
   case constants.ORGANIZATION:
     matchAggregation = await searchAggregator.createMatchAggr(schemaName, project, decodedKeywords, caseSensitive, or, and, roles);
     break;
@@ -209,7 +214,6 @@ const executeQuery = async function (args, res) {
   } else if (dataset === constants.ITEM) {
     const collectionObj = mongoose.model(args.swagger.params._schemaName.value);
     const aggregation = itemAggregator.createItemAggr(args.swagger.params._id.value, args.swagger.params._schemaName.value, roles);
-
     let data = await collectionObj.aggregate(aggregation).allowDiskUse(true);
 
     if (args.swagger.params._schemaName.value === constants.COMMENT) {

diff --git a/api/helpers/aggregators.js b/api/helpers/aggregators.js
@@ -293,6 +293,10 @@ const generateExpArray = async (field, roles, schemaName) => {
           case 'datePostedEnd':
             handleDateEndItem(orArray, ['datePosted'], decodeURIComponent(entry));
             break;
+          case 'dateCompletedStart':
+            // PCP date range check if comment period has closed within last 30 days or will in future
+            handleDateStartItem(orArray, ['dateCompleted'], decodeURIComponent(entry));
+            break;
           default:
             if (schemaName === constants.PROJECT) {
               for (let field of fields) {