Merge branch 'develop' into epicsystem-23-add-comment-period-aggregat…

…or-to-search
bcgov · Mar 7, 2024 · 824c2f0 · 824c2f0
2 parents a5fe394 + ba5f985
commit 824c2f0
Showing 1 changed file with 47 additions and 33 deletions.
diff --git a/api/helpers/aggregators.js b/api/helpers/aggregators.js
@@ -261,42 +261,52 @@ const generateExpArray = async (field, roles, schemaName) => {
         }
 
         switch (item) {
-        case 'decisionDateStart':
-          for(let field of fields) {
-            handleDateStartItem(orArray, field, decodeURIComponent(entry));
-          }
-          break;
-        case 'decisionDateEnd':
-          for(let field of fields) {
-            handleDateEndItem(orArray, field, decodeURIComponent(entry));
-          }
-          break;
-        case 'dateAddedStart':
-          handleDateStartItem(orArray, ['dateAdded'], decodeURIComponent(entry));
-          break;
-        case 'dateAddedEnd':
-          handleDateEndItem(orArray, ['dateAdded'], decodeURIComponent(entry));
-          break;
-        case 'datePostedStart':
-          handleDateStartItem(orArray, ['datePosted'], decodeURIComponent(entry));
-          break;
-        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) {
-              orArray.push(getConvertedValue(field, decodeURIComponent(entry)));
+          case 'dateUpdatedStart':
+            for (let field of fields) {
+              handleDateStartItem(orArray, field, decodeURIComponent(entry));
             }
             break;
-          } else {
-            orArray.push(getConvertedValue(fields[0], decodeURIComponent(entry)));
+          case 'dateUpdatedEnd':
+            for (let field of fields) {
+              handleDateEndItem(orArray, field, decodeURIComponent(entry));
+            }
             break;
-          }
+          case 'decisionDateStart':
+            for (let field of fields) {
+              handleDateStartItem(orArray, field, decodeURIComponent(entry));
+            }
+            break;
+          case 'decisionDateEnd':
+            for (let field of fields) {
+              handleDateEndItem(orArray, field, decodeURIComponent(entry));
+            }
+            break;
+          case 'dateAddedStart':
+            handleDateStartItem(orArray, ['dateAdded'], decodeURIComponent(entry));
+            break;
+          case 'dateAddedEnd':
+            handleDateEndItem(orArray, ['dateAdded'], decodeURIComponent(entry));
+            break;
+          case 'datePostedStart':
+            handleDateStartItem(orArray, ['datePosted'], decodeURIComponent(entry));
+            break;
+          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) {
+                orArray.push(getConvertedValue(field, decodeURIComponent(entry)));
+              }
+              break;
+            } else {
+              orArray.push(getConvertedValue(fields[0], decodeURIComponent(entry)));
+              break;
+            }
         }
 
         expArray.push({ $or: orArray });
@@ -321,6 +331,10 @@ const handleProjectTerms = (item) => {
     item = 'decisionDate';
   }
 
+  if (item === 'dateUpdatedStart' || item === 'dateUpdatedEnd') {
+    item = 'dateUpdated';
+  }
+
   // prepend for embedded fields
   let legislations = ['legislation_1996', 'legislation_2002', 'legislation_2018'];
   for (let legis of legislations) {