@plusscommunities/pluss-maintenance-aws-forms 2.1.9 → 2.1.12-beta.0

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

@@ -22,6 +22,7 @@ class ArchibusStrategy extends IntegrationStrategy {
     this.host = url.host;
 
     this.statusMap = config.StatusMap;
+    this.siteMap = config.SiteMap ?? {};
   }
 
   /**
@@ -55,38 +56,49 @@ 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);
+    const siteId = this.siteMap[request.site];
+    if (!siteId) return false;
+
     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
-        },
-      });
-      log("Archibus:CreateRequest", "Response", response.data, logId);
+      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: siteId,
+          },
+        }));
+      log(
+        "Archibus:CreateRequest",
+        "Response",
+        { data: response.data, siteId },
+        logId
+      );
 
       // Save the ID to external entities for future reference
       await updateRef("externalentities", {
@@ -105,7 +117,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 +362,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;
+  };
 
-      const commentsQueryRes = await indexQuery("comments", commentsQuery);
-      const comments = commentsQueryRes.Items;
-      log("Archibus:OnComplete", "CommentsLength", comments.length, logId);
+  /**
+   * 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 promises = [];
+    return comments.length > 0 ? comments[0] : null;
+  };
 
-      // 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));
-      }
+  /**
+   * 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.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));
+    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;
+
+      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);
+      }
+
+      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;
 
-      await Promise.all(promises);
+      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);
-  await integrationStrategy.createRequest(request);
+  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",
+  "version": "2.1.12-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1468,9 +1468,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.19.tgz",
-      "integrity": "sha512-A6y79EyAxYYPuvQSlMSI4sqeC8CXDQA/E4ZcGQCGUVmULJD65Nw24hfokl43KXSW7Igrgx0CQDoOMSRHBX4q2Q==",
+      "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",
@@ -1744,7 +1744,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "available-typed-arrays": {
       "version": "1.0.7",
@@ -2579,7 +2579,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "detect-newline": {
       "version": "3.1.0",
@@ -3077,7 +3077,7 @@
     "events": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw=="
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
     },
     "execa": {
       "version": "5.1.1",
@@ -6657,7 +6657,7 @@
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
     },
     "querystringify": {
       "version": "2.2.0",
@@ -6808,7 +6808,7 @@
     "sax": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-      "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
+      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
     "scmp": {
       "version": "2.1.0",
@@ -7308,7 +7308,7 @@
     "url": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-      "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+      "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
       "requires": {
         "punycode": "1.3.2",
         "querystring": "0.2.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-forms",
-  "version": "2.1.9",
+  "version": "2.1.12-beta.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -24,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "2.0.19",
+    "@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;