@plusscommunities/pluss-maintenance-aws-forms 2.1.42 → 2.1.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-forms",
-  "version": "2.1.42",
+  "version": "2.1.43",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -16,7 +16,7 @@
     "copy:get": "echo $npm_package_name",
     "copy:set": "run(){ target='\\@plusscommunities\\/pluss-maintenance-aws'; ext=${1:-default}; [ $ext == 'default' ] && replace=$target || replace=$target'-'$ext; echo 'Setting target to '$replace; test -f values.config.$ext.js && cp -f values.config.$ext.js values.config.js; sed -i '' -e 's/'$target'.*\"/'$replace'\"/g' package.json; }; run",
     "copy:deploy": "for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run deploy; done; npm run copy:set; npm run gs;",
-    "copy:betaupload": "npm run betapach; for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;",
+    "copy:betaupload": "for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;",
     "copy:upload": "for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run upload; done; npm run copy:set;",
     "test": "jest tests -i"
   },

package/requests/getRequests.js

@@ -19,6 +19,61 @@ const DEFAULT_PRIORITY = "Low";
 const normalizePriority = (priority) =>
   priority == null ? DEFAULT_PRIORITY : priority;
 
+// Minimum number of filtered results to return before stopping.
+// Because DynamoDB pages are unfiltered and we filter after query,
+// a single page may yield very few matching results. We keep
+// fetching pages until we have this many items to return.
+const MIN_RESULT_COUNT = 50;
+
+/**
+ * Apply all post-query filters to a set of jobs.
+ * Extracted so the same logic runs on every auto-fill page.
+ */
+const filterJobs = (jobs, qParams, authorised, assigneeTracking, userId) => {
+  let filtered = jobs;
+
+  if (qParams.status) {
+    if (qParams.status === "Incomplete") {
+      filtered = filtered.filter((j) => !isCompleted(normalizeStatus(j.status)));
+    } else {
+      filtered = filtered.filter((j) => qParams.status.includes(normalizeStatus(j.status)));
+    }
+  }
+
+  if (qParams.priority) {
+    filtered = filtered.filter((j) => qParams.priority.includes(normalizePriority(j.priority)));
+  }
+
+  if (qParams.type) {
+    filtered = filtered.filter((j) => qParams.type.includes(j.type));
+  }
+
+  if (!authorised && assigneeTracking) {
+    filtered = filtered.filter((j) => j.AssigneeId === userId || j.userID === userId);
+  }
+
+  if (qParams.startTime) {
+    const startTime = parseInt(qParams.startTime, 10);
+    filtered = filtered.filter((j) => j.createdUnix >= startTime);
+  }
+  if (qParams.endTime) {
+    const endTime = parseInt(qParams.endTime, 10);
+    filtered = filtered.filter((j) => j.createdUnix <= endTime);
+  }
+
+  if (qParams.search) {
+    const searchLower = qParams.search.toLowerCase();
+    filtered = filtered.filter((j) => {
+      if (j.jobId && j.jobId === qParams.search) return true;
+      if (j.room && j.room.toLowerCase().indexOf(searchLower) > -1) return true;
+      if (j.title && j.title.toLowerCase().indexOf(searchLower) > -1) return true;
+      return false;
+    });
+  }
+
+  return filtered;
+};
+
 module.exports = async (event) => {
   const qParams = event.queryStringParameters;
   const logId = log("getRequests", "Params", qParams);
@@ -89,67 +144,28 @@ module.exports = async (event) => {
     } catch (e) {}
   }
 
-  // get jobs
-  const result = await indexQuery(values.tableNameMaintenance, query);
-  let jobs = result.Items;
-
-  log("getRequests", "LastEvaluatedKey", result.LastEvaluatedKey, logId);
-  log("getRequests", "JobsLength", jobs.length, logId);
-
-  // filter on status
-  if (qParams.status) {
-    if (qParams.status === "Incomplete") {
-      jobs = jobs.filter((j) => !isCompleted(normalizeStatus(j.status)));
-    } else {
-      jobs = jobs.filter((j) => qParams.status.includes(normalizeStatus(j.status)));
-    }
-    log("getRequests", "FilteredOnStatus", jobs.length, logId);
-  }
-
-  // filter on priority (normalise null to the default)
-  if (qParams.priority) {
-    jobs = jobs.filter((j) => qParams.priority.includes(normalizePriority(j.priority)));
-    log("getRequests", "FilterOnPriority", jobs.length, logId);
-  }
-
-  // filter on type
-  if (qParams.type) {
-    jobs = jobs.filter((j) => qParams.type.includes(j.type));
-    log("getRequests", "FilteredOnType", jobs.length, logId);
-  }
-
-  // filter to assigned jobs
-  if (!authorised && assigneeTracking) {
-    jobs = jobs.filter((j) => j.AssigneeId === userId || j.userID === userId);
-    log("getRequests", "FilteredOnAssignee", jobs.length, logId);
-  }
-
-  // filter on time range
-  if (qParams.startTime) {
-    const startTime = parseInt(qParams.startTime, 10);
-    jobs = jobs.filter((j) => j.createdUnix >= startTime);
-    log("getRequests", "FilteredOnStartTime", jobs.length, logId);
-  }
-  if (qParams.endTime) {
-    const endTime = parseInt(qParams.endTime, 10);
-    jobs = jobs.filter((j) => j.createdUnix <= endTime);
-    log("getRequests", "FilteredOnEndTime", jobs.length, logId);
+  // get first page of jobs
+  let result = await indexQuery(values.tableNameMaintenance, query);
+  let allJobs = filterJobs(result.Items, qParams, authorised, assigneeTracking, userId);
+  let lastKey = result.LastEvaluatedKey;
+
+  log("getRequests", "LastEvaluatedKey", lastKey, logId);
+  log("getRequests", "FirstPageFiltered", allJobs.length, logId);
+
+  // auto-fill: keep fetching pages until we have MIN_RESULT_COUNT filtered results
+  while (lastKey && allJobs.length < MIN_RESULT_COUNT) {
+    const nextQuery = { ...query, ExclusiveStartKey: lastKey };
+    result = await indexQuery(values.tableNameMaintenance, nextQuery);
+    const filtered = filterJobs(result.Items, qParams, authorised, assigneeTracking, userId);
+    allJobs = [...allJobs, ...filtered];
+    lastKey = result.LastEvaluatedKey;
   }
 
-  // filter on search text (jobId exact match, or room/title contains)
-  if (qParams.search) {
-    const searchLower = qParams.search.toLowerCase();
-    jobs = jobs.filter((j) => {
-      if (j.jobId && j.jobId === qParams.search) return true;
-      if (j.room && j.room.toLowerCase().indexOf(searchLower) > -1) return true;
-      if (j.title && j.title.toLowerCase().indexOf(searchLower) > -1) return true;
-      return false;
-    });
-    log("getRequests", "FilteredOnSearch", jobs.length, logId);
-  }
+  log("getRequests", "TotalFiltered", allJobs.length, logId);
+  log("getRequests", "PagesFetched", lastKey ? "more available" : "exhausted", logId);
 
   // compile results
-  const results = { Items: jobs, LastKey: result.LastEvaluatedKey };
+  const results = { Items: allJobs, LastKey: lastKey };
   log("getRequests", "Done", true, logId);
   return { status: 200, data: results };
 };