@plusscommunities/pluss-maintenance-aws-forms 2.1.40-beta.0 → 2.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-forms",
-  "version": "2.1.40-beta.0",
+  "version": "2.1.41",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -14,9 +14,9 @@
     "upload:p": "npm run patch && npm run upload",
     "copy:add": "run(){ ext=${1:-default}; test -f values.config.$ext.js || cp values.config.default.js values.config.$ext.js; }; run",
     "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: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": "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": "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:upload": "npm run patch; 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

@@ -105,6 +105,30 @@ module.exports = async (event) => {
     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);
+  }
+
+  // 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);
+  }
+
   // compile results
   const results = { Items: jobs, LastKey: result.LastEvaluatedKey };
   log("getRequests", "Done", true, logId);