@plusscommunities/pluss-maintenance-aws-forms 2.1.9-auth.0 → 2.1.10

package/editNote.js

@@ -24,7 +24,7 @@ module.exports.editNote = (event, context, callback) => {
   }
   switch (data.action) {
     case "AddNote":
-      if (!data.note && !data.attachments) {
+      if (!data.note && !data.attachments && !data.images) {
         return callback(
           null,
           generateJsonResponse(422, { error: { message: "Incomplete data" } })
@@ -40,7 +40,7 @@ module.exports.editNote = (event, context, callback) => {
       }
       break;
     case "EditNote":
-      if ((!data.note && !data.attachments) || !data.noteId) {
+      if ((!data.note && !data.attachments && !data.images) || !data.noteId) {
         return callback(
           null,
           generateJsonResponse(422, { error: { message: "Incomplete data" } })
@@ -76,6 +76,7 @@ module.exports.editNote = (event, context, callback) => {
                 User: user,
                 Note: data.note,
                 Attachments: data.attachments,
+                Images: data.images,
               });
               activityAction = values.activityAddMaintenanceNote;
               break;
@@ -99,6 +100,7 @@ module.exports.editNote = (event, context, callback) => {
               }
               note.Note = data.note;
               note.Attachments = data.attachments;
+              note.Images = data.images;
               activityAction = values.activityEditMaintenanceNote;
               break;
             default:

package/integration/IntegrationStrategy.js

@@ -26,6 +26,21 @@ class IntegrationStrategy {
     return null;
   };
 
+  // actions taken when a request's status has changed
+  onStatusChanged = async (request) => {
+    return null;
+  };
+
+  // actions taken when a comment has been added to a request
+  onCommentAdded = async (request) => {
+    return null;
+  };
+
+  // actions taken when a note has been added to a request
+  onNotesAdded = async (request) => {
+    return null;
+  };
+
   // actions taken when a request is marked as completed
   onCompleteRequest = async (request) => {
     return null;

package/integration/archibus/ArchibusStrategy.js

@@ -55,37 +55,40 @@ class ArchibusStrategy extends IntegrationStrategy {
    * Creates a request from the Archibus system
    *
    * @param {Object} request - Request definition on Pluss
+   * @param {Object} mockResponse - Mock response from Archibus to simulate response
    * @returns {Boolean} Whether the request was created on Archibus
    */
-  createRequest = async (request) => {
+  createRequest = async (request, mockResponse = null) => {
     const logId = log("Archibus:CreateRequest", "Start", request);
     try {
-      const response = await axios({
-        method: "PUT",
-        url: `${this.baseUrl}/createWorkRequest`,
-        timeout: 15000,
-        headers: {
-          [this.apiKeyHeader]: this.apiKey,
-          "Content-Type": "application/json",
-          Host: this.host,
-        },
-        data: {
-          prob_type: "1.ON-SITE|1. MAINTENANCE",
-          requestor: "PLUSS",
-          description: `${request.title}${
-            _.isEmpty(request.description) ? "" : `\n\n${request.description}`
-          }${_.isEmpty(request.room) ? "" : `\n\nLocation: ${request.room}`}${
-            _.isEmpty(request.userName) ? "" : `\n\nName: ${request.userName}`
-          }${_.isEmpty(request.phone) ? "" : `\n\nPhone: ${request.phone}`}${
-            _.isEmpty(request.type) ? "" : `\n\nJob Type: ${request.type}`
-          }${
-            _.isEmpty(request.images)
-              ? ""
-              : `\n\nImages: ${request.images.join("\n")}`
-          }`,
-          site_id: "2025", //TODO need to do site mapping 2025 is WooloowareShores in prod
-        },
-      });
+      const response =
+        mockResponse ??
+        (await axios({
+          method: "PUT",
+          url: `${this.baseUrl}/createWorkRequest`,
+          timeout: 15000,
+          headers: {
+            [this.apiKeyHeader]: this.apiKey,
+            "Content-Type": "application/json",
+            Host: this.host,
+          },
+          data: {
+            prob_type: "1.ON-SITE|1. MAINTENANCE",
+            requestor: "PLUSS",
+            description: `${request.title}${
+              _.isEmpty(request.description) ? "" : `\n\n${request.description}`
+            }${_.isEmpty(request.room) ? "" : `\n\nLocation: ${request.room}`}${
+              _.isEmpty(request.userName) ? "" : `\n\nName: ${request.userName}`
+            }${_.isEmpty(request.phone) ? "" : `\n\nPhone: ${request.phone}`}${
+              _.isEmpty(request.type) ? "" : `\n\nJob Type: ${request.type}`
+            }${
+              _.isEmpty(request.images)
+                ? ""
+                : `\n\nImages: ${request.images.join("\n")}`
+            }`,
+            site_id: "2025", //TODO need to do site mapping 2025 is WooloowareShores in prod
+          },
+        }));
       log("Archibus:CreateRequest", "Response", response.data, logId);
 
       // Save the ID to external entities for future reference
@@ -105,7 +108,7 @@ class ArchibusStrategy extends IntegrationStrategy {
       });
 
       // add images
-      if (!_.isEmpty(request.images)) {
+      if (!mockResponse && !_.isEmpty(request.images)) {
         const imagePromises = [];
         request.images.forEach((url) => {
           imagePromises.push(this.addFileToRequest(response.data.wrId, url));
@@ -350,114 +353,210 @@ class ArchibusStrategy extends IntegrationStrategy {
   };
 
   /**
+   * Get Archibus Id of the request
    *
    * @param {Object} request - Request definition on Pluss
-   * @returns {Boolean} Represents whether the actions were successful
+   * @returns {Number} Id of the request on Archibus (null if not exists)
    */
-  onCompleteRequest = async (request) => {
-    const logId = log("Archibus:OnComplete", "Start", {
-      Id: request.id,
+  getExternalId = async (request) => {
+    const logId = log("Archibus:GetExternalId", "Start", { Id: request.id });
+
+    // get external id
+    const externalEntityQuery = await indexQuery("externalentities", {
+      IndexName: "InternalIdIndex",
+      KeyConditionExpression:
+        "EntityType = :entityType AND InternalId = :internalId",
+      ExpressionAttributeValues: {
+        ":entityType": this.getEntityType(),
+        ":internalId": request.id,
+      },
     });
-    try {
-      // get external id
-      const externalEntityQuery = await indexQuery("externalentities", {
-        IndexName: "InternalIdIndex",
-        KeyConditionExpression:
-          "EntityType = :entityType AND InternalId = :internalId",
-        ExpressionAttributeValues: {
-          ":entityType": this.getEntityType(),
-          ":internalId": request.id,
-        },
-      });
 
-      log(
-        "Archibus:OnComplete",
-        "ExternalLength",
-        externalEntityQuery.Items.length,
-        logId
-      );
-      if (_.isEmpty(externalEntityQuery.Items)) {
-        return true;
-      }
+    log(
+      "Archibus:GetExternalId",
+      "ExternalLength",
+      externalEntityQuery.Items.length,
+      logId
+    );
+    if (_.isEmpty(externalEntityQuery.Items)) {
+      return null;
+    }
 
-      const externalId = externalEntityQuery.Items[0].ExternalId;
-      log("Archibus:OnComplete", "ExternalId", externalId, logId);
+    const externalId = externalEntityQuery.Items[0].ExternalId;
+    log("Archibus:GetExternalId", "ExternalId", externalId, logId);
 
-      // get comments
-      const commentsQuery = {
-        IndexName: "CommentsEntityIdIndex",
-        KeyConditionExpression: "EntityId = :groupId",
-        ExpressionAttributeValues: {
-          ":groupId": getRowId(request.id, values.serviceKey),
-        },
-      };
+    return externalId;
+  };
+
+  /**
+   * Get latest comment for a request
+   *
+   * @param {Object} request - Request definition on Pluss
+   * @param {String} entityKey - Request entity key (e.g. maintenancerequest)
+   * @returns {Object} Latest comment (null if not exists)
+   */
+  getLatestComment = async (request, entityKey) => {
+    const logId = log("Archibus:GetLatestComment", "Start", { Id: request.id });
+
+    // get comments
+    const commentsQuery = {
+      IndexName: "CommentsEntityIdIndex",
+      KeyConditionExpression: "EntityId = :groupId",
+      ExpressionAttributeValues: {
+        ":groupId": getRowId(request.id, entityKey),
+      },
+    };
+
+    const commentsQueryRes = await indexQuery("comments", commentsQuery);
+    const comments = _.orderBy(commentsQueryRes.Items, "Timestamp", "desc");
+    log(
+      "Archibus:GetLatestComment",
+      `CommentsLength - ${entityKey}`,
+      comments.length,
+      logId
+    );
 
-      const commentsQueryRes = await indexQuery("comments", commentsQuery);
-      const comments = commentsQueryRes.Items;
-      log("Archibus:OnComplete", "CommentsLength", comments.length, logId);
+    return comments.length > 0 ? comments[0] : null;
+  };
 
-      const promises = [];
+  /**
+   * Perform actions when a task's status has changed
+   *
+   * @param {Object} request - Request definition on Pluss
+   * @returns {Boolean} Represents whether the actions were successful
+   */
+  onStatusChanged = async (request) => {
+    const logId = log("Archibus:OnStatusChanged", "Start", { Id: request.id });
 
-      // save history as a comment
-      if (!_.isEmpty(request.history)) {
-        const historyComment = _.map(request.history, (entry) => {
-          if (entry.EntryType === "assignment") {
-            return "";
-          }
-          const time = moment(Number.parseFloat(entry.timestamp + "")).format(
-            "D MMM YYYY HH:mm:ss"
-          );
-          const user = entry.user ? ` by ${entry.user.displayName}` : "";
-          return `${time}: Marked ${entry.status}${user}`;
-        }).join("\n");
-        promises.push(this.addCommentToRequest(externalId, historyComment));
-      }
+    try {
+      const externalId = await this.getExternalId(request);
+      if (_.isNil(externalId)) return true;
+
+      const statues = _.orderBy(
+        (request.history ?? []).filter(
+          (entry) => entry.EntryType !== "assignment"
+        ),
+        "timestamp",
+        "desc"
+      );
+      const latest = statues.length > 0 ? statues[0] : null;
 
-      // save history as a comment
-      if (!_.isEmpty(request.Notes)) {
-        // format comment to save
-        const notesComment = _.map(request.Notes, (entry) => {
-          const time = moment(Number.parseFloat(entry.Timestamp + "")).format(
-            "YYYY-MM-DD HH:mm:ss"
-          );
-          const user = entry.User ? entry.User.displayName : "Unknown User";
-          const note = entry.Note ? `Note: ${entry.Note}` : "No Note";
-          if (!_.isEmpty(entry.Attachments)) {
-            entry.Attachments.forEach((att) => {
-              promises.push(this.addFileToRequest(externalId, att.Source));
-            });
-          }
-          const attachments =
-            entry.Attachments && entry.Attachments.length > 0
-              ? `Attachments: ${entry.Attachments.map(
-                  (att) => `${att.Title} (${att.Source})`
-                ).join(", ")}`
-              : "No Attachments";
-          return `${time} by ${user}\n${note}\n${attachments}`;
-        }).join("\n\n");
-        // save comment
-        promises.push(this.addCommentToRequest(externalId, notesComment));
+      if (latest) {
+        const time = moment(Number.parseFloat(latest.timestamp + "")).format(
+          "D MMM YYYY HH:mm:ss"
+        );
+        const user = latest.user ? ` by ${latest.user.displayName}` : "";
+        const comment = `${time}: Marked ${latest.status}${user}`;
+        await this.addCommentToRequest(externalId, comment);
       }
 
-      // save comments to Archibus
-      comments.forEach((comment) => {
+      return true;
+    } catch (error) {
+      log("Archibus:OnStatusChanged", "Error", error.toString(), logId);
+    }
+    return false;
+  };
+
+  /**
+   * Perform actions when a a comment has been added to a task
+   *
+   * @param {Object} request - Request definition on Pluss
+   * @returns {Boolean} Represents whether the actions were successful
+   */
+  onCommentAdded = async (request) => {
+    const logId = log("Archibus:OnCommentAdded", "Start", {
+      Id: request.id,
+    });
+
+    try {
+      const externalId = await this.getExternalId(request);
+      if (_.isNil(externalId)) return true;
+
+      let comment = await this.getLatestComment(request, values.serviceKey);
+      if (!comment)
+        comment = await this.getLatestComment(request, values.entityKey);
+
+      if (comment) {
         const commentText = `${comment.User.displayName}:\n\n${
           comment.Comment
         }${!_.isEmpty(comment.Image) ? `\n\nImage: ${comment.Image}` : ""}}`;
         const commentTime = moment(comment.Timestamp);
-        promises.push(
-          this.addCommentToRequest(externalId, commentText, commentTime)
-        );
-      });
+        await this.addCommentToRequest(externalId, commentText, commentTime);
+      }
 
-      await Promise.all(promises);
+      return true;
+    } catch (error) {
+      log("Archibus:OnCommentAdded", "Error", error.toString(), logId);
+    }
+    return false;
+  };
+
+  /**
+   * Perform actions when a note has been added to a task
+   *
+   * @param {Object} request - Request definition on Pluss
+   * @returns {Boolean} Represents whether the actions were successful
+   */
+  onNotesAdded = async (request) => {
+    const logId = log("Archibus:OnNotesAdded", "Start", { Id: request.id });
+
+    try {
+      const externalId = await this.getExternalId(request);
+      if (_.isNil(externalId)) return true;
+
+      const notes = _.orderBy(request.Notes ?? [], "Timestamp", "desc");
+      const latest = notes.length > 0 ? notes[0] : null;
+
+      if (latest) {
+        const promises = [];
+
+        const time = moment(Number.parseFloat(latest.Timestamp + "")).format(
+          "YYYY-MM-DD HH:mm:ss"
+        );
+        const user = latest.User ? latest.User.displayName : "Unknown User";
+        const note = latest.Note ? `Note: ${latest.Note}` : "No Note";
+        if (!_.isEmpty(latest.Attachments)) {
+          latest.Attachments.forEach((att) => {
+            promises.push(this.addFileToRequest(externalId, att.Source));
+          });
+        }
+        const attachments =
+          latest.Attachments && latest.Attachments.length > 0
+            ? `Attachments: ${latest.Attachments.map(
+                (att) => `${att.Title} (${att.Source})`
+              ).join(", ")}`
+            : "No Attachments";
+        if (!_.isEmpty(latest.Images)) {
+          latest.Images.forEach((image) => {
+            promises.push(this.addFileToRequest(externalId, image));
+          });
+        }
+        const images =
+          latest.Images && latest.Images.length > 0
+            ? `Images: ${latest.Images.map((image) => image).join(", ")}`
+            : "No Images";
+        const comment = `${time} by ${user}\n${note}\n${attachments}\n${images}`;
+        promises.push(this.addCommentToRequest(externalId, comment));
+
+        await Promise.all(promises);
+      }
 
       return true;
     } catch (error) {
-      log("Archibus:OnComplete", "Error", error.toString(), logId);
+      log("Archibus:OnNotesAdded", "Error", error.toString(), logId);
     }
     return false;
   };
+
+  /**
+   * Perform completion actions when a task is completed
+   *
+   * @param {Object} request - Request definition on Pluss
+   * @returns {Boolean} Represents whether the actions were successful
+   */
+  onCompleteRequest = async (request) => {
+    return true;
+  };
 }
 
 module.exports = ArchibusStrategy;

package/integration/index.js

@@ -19,7 +19,9 @@ exports.getStrategy = async (site) => {
       default:
         return new IntegrationStrategy();
     }
-  } catch (e) {}
+  } catch (e) {
+    log("getStrategy", "Error", e, logId);
+  }
 
   return new IntegrationStrategy();
 };

package/jobChanged.js

@@ -1,21 +1,38 @@
+const moment = require("moment");
+const _ = require("lodash");
 const { Marshaller } = require("@aws/dynamodb-auto-marshaller");
 const config = require("./config.json");
 const { init } = require("@plusscommunities/pluss-core-aws/config");
 const logUpdate = require("@plusscommunities/pluss-core-aws/db/strings/logUpdate");
 const { getStrategy } = require("./integration");
 const { log } = require("@plusscommunities/pluss-core-aws/helper");
+const triggerAutomatedAction = require("@plusscommunities/pluss-core-aws/helper/triggerAutomatedAction");
 const { values } = require("./values.config");
 
 const marshaller = new Marshaller();
 
 const pushRequestToIntegration = async (request) => {
   const integrationStrategy = await getStrategy(request.site);
+  // const mockRes = {
+  //   data: { wrId: moment().valueOf() },
+  // };
+  // await integrationStrategy.createRequest(request, mockRes);
   await integrationStrategy.createRequest(request);
 };
 
-const onCompletedRequest = async (request) => {
+const onStatusChanged = async (request) => {
   const integrationStrategy = await getStrategy(request.site);
-  await integrationStrategy.onCompleteRequest(request);
+  await integrationStrategy.onStatusChanged(request);
+};
+
+const onCommentAdded = async (request) => {
+  const integrationStrategy = await getStrategy(request.site);
+  await integrationStrategy.onCommentAdded(request);
+};
+
+const onNotesAdded = async (request) => {
+  const integrationStrategy = await getStrategy(request.site);
+  await integrationStrategy.onNotesAdded(request);
 };
 
 /**
@@ -32,9 +49,45 @@ const checkIntegrationActions = async (request, prevRequest) => {
     await pushRequestToIntegration(request);
   }
 
-  if (request.status === "Completed" && prevRequest.status !== "Completed") {
-    log("checkIntegrationActions", "CompletedRequest", true);
-    await onCompletedRequest(request);
+  if (request.status !== prevRequest.status) {
+    log("checkIntegrationActions", "StatusChanaged", {
+      new: request.status,
+      old: prevRequest.status,
+    });
+    await onStatusChanged(request);
+  }
+
+  if (request.commentCount > prevRequest.commentCount) {
+    log("checkIntegrationActions", "CommentCountChanged", {
+      new: request.commentCount,
+      old: prevRequest.commentCount,
+    });
+    await onCommentAdded(request);
+  }
+
+  if ((request.Notes ?? []).length > (prevRequest.Notes ?? []).length) {
+    log("checkIntegrationActions", "NotesAdded", {
+      new: (request.Notes ?? []).length,
+      old: (prevRequest.Notes ?? []).length,
+    });
+    await onNotesAdded(request);
+  }
+};
+
+const checkAutomatedActions = async (request, prevRequest) => {
+  if (request.status !== prevRequest.status) {
+    log("checkAutomatedActions", "StatusChanaged", {
+      new: request.status,
+      old: prevRequest.status,
+    });
+    await triggerAutomatedAction(
+      request.site,
+      values.triggerMaintenanceStatusChanged,
+      {
+        JobNumber: request.jobNo,
+        status: request.status,
+      }
+    );
   }
 };
 
@@ -59,6 +112,7 @@ module.exports.jobChanged = (event, context, callback) => {
       console.log("Old record: ", JSON.stringify(previousData));
 
       checkIntegrationActions(data, previousData);
+      checkAutomatedActions(data, previousData);
 
       site = data.site;
     } else if (record.eventName == "REMOVE") {

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-forms",
-  "version": "2.1.9-auth.0",
+  "version": "2.1.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -94,26 +94,11 @@
         "semver": "^6.3.1"
       },
       "dependencies": {
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
           "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
           "dev": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
         }
       }
     },
@@ -1483,9 +1468,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "2.0.18-auth.0",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.18-auth.0.tgz",
-      "integrity": "sha512-JcMCn06BQ9Qv2/38W3ve6l8CIuvpGFIGWI/wk9uTwxe4gBAFua9TrLgitccfGhylyAMA3/sPlG3h6GLiIulvUg==",
+      "version": "2.0.20-beta.1",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.20-beta.1.tgz",
+      "integrity": "sha512-9PEkZ3UPiSK84d+fsr0jkNhHfZ6FuvY1ujjdmsULDi7XS2eUCBA770BRBPPoRiXaaGr0RJ1euBVrZmmqVvfxRw==",
       "requires": {
         "@aws/dynamodb-auto-marshaller": "^0.7.1",
         "amazon-cognito-identity-js": "^2.0.19",
@@ -1494,8 +1479,6 @@
         "expo-server-sdk": "^3.0.1",
         "html-entities": "^2.3.2",
         "https": "^1.0.0",
-        "jsonwebtoken": "^9.0.2",
-        "jwks-rsa": "^3.1.0",
         "lodash": "^4.17.10",
         "moment": "^2.30.1",
         "moment-timezone": "^0.5.41",
@@ -1504,35 +1487,6 @@
         "nodemailer": "^6.9.12",
         "twilio": "^3.18.0",
         "uuid": "^2.0.3"
-      },
-      "dependencies": {
-        "jsonwebtoken": {
-          "version": "9.0.2",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
-          "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
-          "requires": {
-            "jws": "^3.2.2",
-            "lodash.includes": "^4.3.0",
-            "lodash.isboolean": "^3.0.3",
-            "lodash.isinteger": "^4.0.4",
-            "lodash.isnumber": "^3.0.3",
-            "lodash.isplainobject": "^4.0.6",
-            "lodash.isstring": "^4.0.1",
-            "lodash.once": "^4.0.0",
-            "ms": "^2.1.1",
-            "semver": "^7.5.4"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        },
-        "semver": {
-          "version": "7.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-          "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="
-        }
       }
     },
     "@sinclair/typebox": {
@@ -1600,45 +1554,6 @@
         "@babel/types": "^7.20.7"
       }
     },
-    "@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
-      "requires": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/express": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
-      "requires": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "@types/express-serve-static-core": {
-      "version": "4.19.6",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
-      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
-      "requires": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
-      }
-    },
     "@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -1648,11 +1563,6 @@
         "@types/node": "*"
       }
     },
-    "@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
-    },
     "@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
@@ -1687,67 +1597,13 @@
         "pretty-format": "^26.0.0"
       }
     },
-    "@types/jsonwebtoken": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.9.tgz",
-      "integrity": "sha512-uoe+GxEuHbvy12OUQct2X9JenKM3qAscquYymuQN4fMWG9DBQtykrQEFcAbVACF7qaLw9BePSodUL0kquqBJpQ==",
-      "requires": {
-        "@types/ms": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
-    },
-    "@types/ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
-      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="
-    },
     "@types/node": {
       "version": "22.2.0",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.2.0.tgz",
       "integrity": "sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==",
+      "dev": true,
       "requires": {
         "undici-types": "~6.13.0"
-      },
-      "dependencies": {
-        "undici-types": {
-          "version": "6.13.0",
-          "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz",
-          "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg=="
-        }
-      }
-    },
-    "@types/qs": {
-      "version": "6.9.18",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
-      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA=="
-    },
-    "@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
-    },
-    "@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
-      "requires": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      }
-    },
-    "@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
-      "requires": {
-        "@types/http-errors": "*",
-        "@types/node": "*",
-        "@types/send": "*"
       }
     },
     "@types/stack-utils": {
@@ -1899,9 +1755,9 @@
       }
     },
     "aws-sdk": {
-      "version": "2.1591.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1591.0.tgz",
-      "integrity": "sha512-9HbejaKZM89OK4YpE5TpjJItAtU1xhsFvy2p9qZN7nEpfx3G0FpepaW2fdpHu51gFeUn1+g0XUwekyq2N/Xagw==",
+      "version": "2.1665.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1665.0.tgz",
+      "integrity": "sha512-IhEcdGmiplF3l/pCROxEYIdi0s+LZ2VkbMAq3RgoXTHxY5cgqVRNaqsEsgIHev2Clxa9V08HttnIERTIUqb1+Q==",
       "requires": {
         "buffer": "4.9.2",
         "events": "1.1.1",
@@ -1938,25 +1794,13 @@
       }
     },
     "axios": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
+      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        }
       }
     },
     "babel-code-frame": {
@@ -2682,6 +2526,7 @@
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
       "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+      "dev": true,
       "requires": {
         "ms": "2.1.2"
       },
@@ -2689,7 +2534,8 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -3405,6 +3251,16 @@
         "is-callable": "^1.1.3"
       }
     },
+    "form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -6031,11 +5887,6 @@
       "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
       "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw=="
     },
-    "jose": {
-      "version": "4.15.9",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz",
-      "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA=="
-    },
     "js-cookie": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
@@ -6136,19 +5987,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "jwks-rsa": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.2.0.tgz",
-      "integrity": "sha512-PwchfHcQK/5PSydeKCs1ylNym0w/SSv8a62DgHJ//7x2ZclCoinlsjAfDxAAbpoTPybOum/Jgy+vkvMmKz89Ww==",
-      "requires": {
-        "@types/express": "^4.17.20",
-        "@types/jsonwebtoken": "^9.0.4",
-        "debug": "^4.3.4",
-        "jose": "^4.15.4",
-        "limiter": "^1.1.5",
-        "lru-memoizer": "^2.2.0"
-      }
-    },
     "jws": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
@@ -6180,11 +6018,6 @@
         "type-check": "~0.3.2"
       }
     },
-    "limiter": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
-      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="
-    },
     "lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -6211,11 +6044,6 @@
       "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
       "dev": true
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
-    },
     "lodash.cond": {
       "version": "4.5.2",
       "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
@@ -6302,20 +6130,12 @@
       }
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "lru-memoizer": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.3.0.tgz",
-      "integrity": "sha512-GXn7gyHAMhO13WSKrIiNfztwxodVsP8IoZ3XfrJV4yH2x0/OeTO/FIaAHTY5YekdGgW94njfuKmyyt1E0mR6Ug==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
       "requires": {
-        "lodash.clonedeep": "^4.5.0",
-        "lru-cache": "6.0.0"
+        "yallist": "^3.0.2"
       }
     },
     "make-dir": {
@@ -6351,9 +6171,9 @@
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
+      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
       "dev": true,
       "requires": {
         "braces": "^3.0.3",
@@ -6496,9 +6316,9 @@
       "dev": true
     },
     "nodemailer": {
-      "version": "6.9.13",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.13.tgz",
-      "integrity": "sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA=="
+      "version": "6.9.14",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.14.tgz",
+      "integrity": "sha512-Dobp/ebDKBvz91sbtRKhcznLThrKxKt97GI2FAlAyy+fk19j73Uz3sBXolVtmcXjaorivqsbbbjDY+Jkt4/bQA=="
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -6813,6 +6633,11 @@
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
+    "punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
+    },
     "pure-rand": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
@@ -7464,6 +7289,12 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "undici-types": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz",
+      "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==",
+      "dev": true
+    },
     "update-browserslist-db": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
@@ -7481,13 +7312,6 @@
       "requires": {
         "punycode": "1.3.2",
         "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
-        }
       }
     },
     "url-parse": {
@@ -7768,9 +7592,10 @@
       "dev": true
     },
     "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
     },
     "yargs": {
       "version": "17.7.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-forms",
-  "version": "2.1.9-auth.0",
+  "version": "2.1.10",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -10,9 +10,6 @@
     "deploy": "npm run gc && npm run gs && serverless deploy",
     "betaupload": "rm -rf .serverless && npm i && npm publish --access public --tag beta",
     "betaupload:p": "npm run betapatch && npm run betaupload",
-    "authpatch": "npm version prepatch --preid=auth",
-    "authupload": "npm i && npm i && npm publish --access public --tag auth",
-    "authupload:p": "npm run authpatch && npm run authupload",
     "upload": "rm -rf .serverless && npm i && npm publish --access public",
     "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",
@@ -20,7 +17,6 @@
     "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 betapatch; 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:authupload": "npm run authpatch; for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run authupload; 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"
   },
@@ -28,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "2.0.18-auth.0",
+    "@plusscommunities/pluss-core-aws": "2.0.20-beta.1",
     "amazon-cognito-identity-js": "^2.0.19",
     "aws-sdk": "^2.1591.0",
     "axios": "^1.6.8",

package/requests/getRequests.js

@@ -81,6 +81,12 @@ module.exports = async (event) => {
     log("getRequests", "FilteredOnStatus", jobs.length, logId);
   }
 
+  // filter on priority
+  if (qParams.priority) {
+    jobs = jobs.filter((j) => qParams.priority.includes(j.priority));
+    log("getRequests", "FilterOnPriority", jobs.length, logId);
+  }
+
   // filter on type
   if (qParams.type) {
     jobs = jobs.filter((j) => qParams.type.includes(j.type));

package/requests/updatePriority.js

@@ -0,0 +1,46 @@
+const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
+const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
+const editMaintenanceJob = require("../db/maintenance/editMaintenanceJob");
+const isValidAssignee = require("./helper/isValidAssignee");
+const { log } = require("@plusscommunities/pluss-core-aws/helper");
+const { values } = require("../values.config");
+
+module.exports = async (event, data) => {
+  const logId = log("updatePriority", "data", data);
+  // check required data
+  const requiredKeys = ["id", "priority"];
+  if (!data || requiredKeys.some((prop) => !data.hasOwnProperty(prop))) {
+    log("updatePriority", "InsufficientInput", 422, logId);
+    return { status: 422, data: { error: "Insufficient input" } };
+  }
+
+  const job = await getRef(values.tableNameMaintenance, "id", data.id);
+  log("updatePriority", "job", job, logId);
+  log("updatePriority", "site", job.site, logId);
+
+  // validate authorisation
+  const valid = await validateMasterAuth(
+    event,
+    values.permissionMaintenanceTracking,
+    job.site
+  );
+  log("updatePriority", "valid", valid, logId);
+  if (!valid) {
+    const validAssignee = await isValidAssignee(
+      event,
+      job.site,
+      job.AssigneeId
+    );
+    log("updatePriority", "validAssignee", validAssignee, logId);
+    if (!validAssignee) {
+      log("updatePriority", "NotAuthorised", 403, logId);
+      return { status: 403, data: { error: "Not authorised" } };
+    }
+  }
+
+  job.priority = data.priority;
+  const result = await editMaintenanceJob(job);
+
+  log("updatePriority", "result", result, logId);
+  return { status: 200, data: { job: result } };
+};

package/updateData.js

@@ -3,6 +3,7 @@ const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/ge
 const { init } = require("@plusscommunities/pluss-core-aws/config");
 const config = require("./config.json");
 const assignRequest = require("./requests/assignRequest");
+const updatePriority = require("./requests/updatePriority");
 
 module.exports.updateData = async (event, context, callback) => {
   init(config);
@@ -17,6 +18,9 @@ module.exports.updateData = async (event, context, callback) => {
       case "assign":
         response = await assignRequest(event, data);
         break;
+      case "priority":
+        response = await updatePriority(event, data);
+        break;
       default:
         break;
     }

package/values.config.a.js

@@ -22,5 +22,6 @@ const values = {
   activityDeleteMaintenanceNote: "DeleteMaintenanceNoteA",
   activityEditMaintenanceNote: "EditMaintenanceNoteA",
   textJobEmailTitle: "Service Request",
+  triggerMaintenanceStatusChanged: "MaintenanceStatusChangedA",
 };
 exports.values = values;

package/values.config.default.js

@@ -24,5 +24,6 @@ const values = {
   activityEditMaintenanceNote: "EditMaintenanceNote",
   textJobEmailTitle: "Service Request",
   allowGeneralType: true,
+  triggerMaintenanceStatusChanged: "MaintenanceStatusChanged",
 };
 exports.values = values;

package/values.config.forms.js

@@ -24,5 +24,6 @@ const values = {
   activityEditMaintenanceNote: "EditMaintenanceNoteForms",
   textJobEmailTitle: "Form Submission",
   allowGeneralType: false,
+  triggerMaintenanceStatusChanged: "MaintenanceStatusChangedForms",
 };
 exports.values = values;

package/values.config.js

@@ -24,5 +24,6 @@ const values = {
   activityEditMaintenanceNote: "EditMaintenanceNoteForms",
   textJobEmailTitle: "Form Submission",
   allowGeneralType: false,
+  triggerMaintenanceStatusChanged: "MaintenanceStatusChangedForms",
 };
 exports.values = values;

package/values.config.b.js

@@ -1,26 +0,0 @@
-const values = {
-  entityKey: "maintenancerequestB",
-  serviceKey: "maintenanceB",
-  updateKey: "jobsB",
-  tableKeyJobTypes: "jobtypesB",
-  tableKeyMaintenance: "maintenanceB",
-  tableKeySupportTickets: "supportticketsB",
-  tableNameJobTypes: "jobTypesB",
-  tableNameMaintenance: "maintenanceB",
-  tableNameSupportTickets: "supportticketsB",
-  permissionMaintenanceTracking: "maintenanceTrackingB",
-  permissionMaintenanceAssignment: "maintenanceAssignmentB",
-  permissionMaintenanceTypes: "maintenanceTypesB",
-  routeEntityPath: "/requestsHubB/jobDetails/:id",
-  screenMaintenanceDetail: "requestDetailB",
-  notificationMaintenanceJobAssigned: "MaintenanceJobAssignedB",
-  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassignedB",
-  activityDeleteMaintenanceJob: "DeleteMaintenanceJobB",
-  activityEditMaintenanceJob: "EditMaintenanceJobB",
-  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChangedB",
-  activityAddMaintenanceNote: "AddMaintenanceNoteB",
-  activityDeleteMaintenanceNote: "DeleteMaintenanceNoteB",
-  activityEditMaintenanceNote: "EditMaintenanceNoteB",
-  textJobEmailTitle: "Service Request",
-};
-exports.values = values;

package/values.config.c.js

@@ -1,26 +0,0 @@
-const values = {
-  entityKey: "maintenancerequestC",
-  serviceKey: "maintenanceC",
-  updateKey: "jobsC",
-  tableKeyJobTypes: "jobtypesC",
-  tableKeyMaintenance: "maintenanceC",
-  tableKeySupportTickets: "supportticketsC",
-  tableNameJobTypes: "jobTypesC",
-  tableNameMaintenance: "maintenanceC",
-  tableNameSupportTickets: "supportticketsC",
-  permissionMaintenanceTracking: "maintenanceTrackingC",
-  permissionMaintenanceAssignment: "maintenanceAssignmentC",
-  permissionMaintenanceTypes: "maintenanceTypesC",
-  routeEntityPath: "/requestsHubC/jobDetails/:id",
-  screenMaintenanceDetail: "requestDetailC",
-  notificationMaintenanceJobAssigned: "MaintenanceJobAssignedC",
-  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassignedC",
-  activityDeleteMaintenanceJob: "DeleteMaintenanceJobC",
-  activityEditMaintenanceJob: "EditMaintenanceJobC",
-  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChangedC",
-  activityAddMaintenanceNote: "AddMaintenanceNoteC",
-  activityDeleteMaintenanceNote: "DeleteMaintenanceNoteC",
-  activityEditMaintenanceNote: "EditMaintenanceNoteC",
-  textJobEmailTitle: "Service Request",
-};
-exports.values = values;

package/values.config.d.js

@@ -1,26 +0,0 @@
-const values = {
-  entityKey: "maintenancerequestD",
-  serviceKey: "maintenanceD",
-  updateKey: "jobsD",
-  tableKeyJobTypes: "jobtypesD",
-  tableKeyMaintenance: "maintenanceD",
-  tableKeySupportTickets: "supportticketsD",
-  tableNameJobTypes: "jobTypesD",
-  tableNameMaintenance: "maintenanceD",
-  tableNameSupportTickets: "supportticketsD",
-  permissionMaintenanceTracking: "maintenanceTrackingD",
-  permissionMaintenanceAssignment: "maintenanceAssignmentD",
-  permissionMaintenanceTypes: "maintenanceTypesD",
-  routeEntityPath: "/requestsHubD/jobDetails/:id",
-  screenMaintenanceDetail: "requestDetailD",
-  notificationMaintenanceJobAssigned: "MaintenanceJobAssignedD",
-  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassignedD",
-  activityDeleteMaintenanceJob: "DeleteMaintenanceJobD",
-  activityEditMaintenanceJob: "EditMaintenanceJobD",
-  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChangedD",
-  activityAddMaintenanceNote: "AddMaintenanceNoteD",
-  activityDeleteMaintenanceNote: "DeleteMaintenanceNoteD",
-  activityEditMaintenanceNote: "EditMaintenanceNoteD",
-  textJobEmailTitle: "Service Request",
-};
-exports.values = values;