@plusscommunities/pluss-maintenance-aws 2.2.1-beta.0 → 2.2.2-beta.0

package/getData.js

@@ -4,6 +4,7 @@ const { log } = require("@plusscommunities/pluss-core-aws/helper");
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
 const getAssignees = require("./requests/getAssignees");
 const getRequests = require("./requests/getRequests");
+const getRequest = require("./requests/getRequest");
 
 module.exports.getData = async (event, context, callback) => {
   init(config);
@@ -20,6 +21,13 @@ module.exports.getData = async (event, context, callback) => {
           log(action, "ResponseLength", response.data.Items.length, logId);
         }
         break;
+
+      case "request":
+        response = await getRequest(event);
+        if (response.status === 200) {
+          log(action, "ResponseLength", response.data, logId);
+        }
+        break;
       case "assignees":
         response = await getAssignees(event);
         if (response.status === 200) {

package/getJob.js

@@ -2,82 +2,13 @@ const config = require("./config.json");
 const { init } = require("@plusscommunities/pluss-core-aws/config");
 const { getBody } = require("@plusscommunities/pluss-core-aws/helper");
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
-const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
-const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
-const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
-const getSessionUser = require("@plusscommunities/pluss-core-aws/helper/auth/getSessionUser");
-const isValidAssignee = require("./requests/helper/isValidAssignee");
-const { values } = require("./values.config");
+const getRequest = require("./requests/getRequest");
 
 module.exports.getJob = async (event, context, callback) => {
   init(config);
   const data = getBody(event);
 
-  if (!data.site || (!data.id && !data.jobId)) {
-    return callback(
-      null,
-      generateJsonResponse(422, {
-        error: { message: "User Types fetch -- no site or type id detected." },
-      })
-    );
-  }
+  const result = await getRequest(event, data);
 
-  try {
-    let result = null;
-    if (data.jobId) {
-      const query = {
-        IndexName: "MaintenanceSiteJobIdIndex",
-        KeyConditionExpression: "site = :site and jobId = :jobId",
-        ExpressionAttributeValues: {
-          ":site": data.site,
-          ":jobId": data.jobId,
-        },
-      };
-      const { Items } = await indexQuery(values.tableNameMaintenance, query);
-      result = Items[0];
-    }
-    if (!result)
-      result = await getRef(
-        values.tableNameMaintenance,
-        "id",
-        data.id || data.jobId
-      );
-
-    try {
-      const authorised = await validateMasterAuth(
-        event,
-        values.permissionMaintenanceTracking,
-        result.site
-      );
-      const assignAuthorised = await isValidAssignee(
-        event,
-        result.site,
-        result.AssigneeId
-      );
-      if (!authorised && !assignAuthorised) {
-        // Check if the job belongs to the user
-        const userId = await getSessionUser(event.headers.authkey);
-        if (userId !== result.userID) {
-          console.error("Authorization not valid");
-          return callback(
-            null,
-            generateJsonResponse(403, {
-              error: { message: "not authorised." },
-            })
-          );
-        }
-      }
-      return callback(null, generateJsonResponse(200, result));
-    } catch (error) {
-      callback(null, generateJsonResponse(422, { fail: true }));
-    }
-  } catch (error1) {
-    return callback(
-      null,
-      generateJsonResponse(200, {
-        userFetchFail: true,
-        message: "Fail on user query. Please try again.",
-      })
-    );
-  }
+  return callback(null, generateJsonResponse(result.status, result.data));
 };

package/integration/archibus/ArchibusStrategy.js

@@ -9,7 +9,6 @@ const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef"
 const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
 const publishNotifications = require("@plusscommunities/pluss-core-aws/db/notifications/publishNotifications");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
-const { values } = require("../../values.config");
 
 class ArchibusStrategy extends IntegrationStrategy {
   constructor(config) {
@@ -70,7 +69,7 @@ class ArchibusStrategy extends IntegrationStrategy {
           Host: this.host,
         },
         data: {
-          prob_type: "1.ON-SITE",
+          prob_type: "1.ON-SITE|1. MAINTENANCE",
           requestor: "PLUSSDEV",
           description: `${request.title}${
             _.isEmpty(request.description) ? "" : `\n\n${request.description}`
@@ -99,7 +98,7 @@ class ArchibusStrategy extends IntegrationStrategy {
       });
 
       // Save the Archibus ID as the job number
-      await editRef(values.tableNameMaintenance, "id", request.id, {
+      await editRef("maintenance", "id", request.id, {
         jobNo: response.data.wrId,
         jobId: response.data.wrId + "",
       });
@@ -125,7 +124,7 @@ class ArchibusStrategy extends IntegrationStrategy {
       log("Archibus:CreateRequest", "Error", e, logId);
 
       // trigger another attempt
-      // editRef(values.tableNameMaintenance, "id", request.id, {
+      // editRef("maintenance", "id", request.id, {
       //   ExtCreateRetry: moment().valueOf(),
       // });
     }
@@ -190,24 +189,15 @@ class ArchibusStrategy extends IntegrationStrategy {
     log("Archibus:RefreshFromSource", "UpdatedStatus", statusToUse, logId);
 
     if (statusToUse) {
-      let plussRequest = await getRef(
-        values.tableNameMaintenance,
-        "id",
-        requestId
-      );
+      let plussRequest = await getRef("maintenance", "id", requestId);
       // check how the new status map to what is saved in Pluss
 
       if (statusToUse.Status !== plussRequest.status) {
         // save updated status
 
-        plussRequest = await editRef(
-          values.tableNameMaintenance,
-          "id",
-          requestId,
-          {
-            status: statusToUse.Status,
-          }
-        );
+        plussRequest = await editRef("maintenance", "id", requestId, {
+          status: statusToUse.Status,
+        });
         log(
           "Archibus:RefreshFromSource",
           "SavedStatus",
@@ -400,7 +390,7 @@ class ArchibusStrategy extends IntegrationStrategy {
         IndexName: "CommentsEntityIdIndex",
         KeyConditionExpression: "EntityId = :groupId",
         ExpressionAttributeValues: {
-          ":groupId": getRowId(request.id, values.serviceKey),
+          ":groupId": getRowId(request.id, "maintenance"),
         },
       };
 

package/jobChanged.js

@@ -4,6 +4,7 @@ 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 { values } = require("./values.config");
 
 const marshaller = new Marshaller();
 
@@ -67,6 +68,6 @@ module.exports.jobChanged = (event, context, callback) => {
 
       site = previousData.site;
     }
-    logUpdate(site, "jobs");
+    logUpdate(site, values.updateKey);
   });
 };

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws",
-  "version": "2.2.1-beta.0",
+  "version": "2.2.2-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1468,9 +1468,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.8.tgz",
-      "integrity": "sha512-cwSNYnpfxCJXOqmh9rAXjF+fqfBF5r9E/t1zezNxnRD1k456PtbRmDhiUGuQ7w7ysOFuZqP1KNYWLBJ8qsQy6Q==",
+      "version": "2.1.4-beta.0",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.1.4-beta.0.tgz",
+      "integrity": "sha512-rSxTGfX0PqJU+dOTwMcS/w17dwdPmuCd37JpfwJXCJUrQP56jp/4Ly13x7IlmbC7wtBdLBIjpqPBy2d1rpNtlQ==",
       "requires": {
         "@aws/dynamodb-auto-marshaller": "^0.7.1",
         "amazon-cognito-identity-js": "^2.0.19",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws",
-  "version": "2.2.1-beta.0",
+  "version": "2.2.2-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.8",
+    "@plusscommunities/pluss-core-aws": "2.1.4-beta.0",
     "amazon-cognito-identity-js": "^2.0.19",
     "aws-sdk": "^2.1591.0",
     "axios": "^1.6.8",

package/requests/getRequest.js

@@ -0,0 +1,89 @@
+const { log, getRowId } = require("@plusscommunities/pluss-core-aws/helper");
+const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
+const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
+const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
+const isValidAssignee = require("./helper/isValidAssignee");
+const getSessionUserFromReqAuthKey = require("@plusscommunities/pluss-core-aws/helper/auth/getSessionUserFromReqAuthKey");
+const { values } = require("../values.config");
+
+module.exports = async (event, params) => {
+  const data = params || event.queryStringParameters;
+  const logId = log("getRequest", "Params", data);
+  if (!data.id && (!data.site || !data.jobId)) {
+    return {
+      status: 422,
+      data: {
+        error: "Insufficient input",
+      },
+    };
+  }
+
+  try {
+    let result = null;
+    if (data.jobId) {
+      const query = {
+        IndexName: "MaintenanceSiteJobIdIndex",
+        KeyConditionExpression: "site = :site and jobId = :jobId",
+        ExpressionAttributeValues: {
+          ":site": data.site,
+          ":jobId": data.jobId,
+        },
+      };
+      const { Items } = await indexQuery(values.tableNameMaintenance, query);
+      result = Items[0];
+    }
+    if (!result) {
+      result = await getRef(
+        values.tableNameMaintenance,
+        "id",
+        data.id || data.jobId
+      );
+    }
+
+    const authorised = await validateMasterAuth(
+      event,
+      values.permissionMaintenanceTracking,
+      result.site
+    );
+    const assignAuthorised = await isValidAssignee(
+      event,
+      result.site,
+      result.AssigneeId
+    );
+    if (!authorised && !assignAuthorised) {
+      // Check if the job belongs to the user
+      const userId = await getSessionUserFromReqAuthKey(event);
+      if (userId !== result.userID) {
+        return {
+          status: 403,
+          data: {
+            error: "Not authorised",
+          },
+        };
+      }
+    }
+    if (data.includeComments) {
+      const commentsQuery = {
+        IndexName: "CommentsEntityIdIndex",
+        KeyConditionExpression: "EntityId = :groupId",
+        ExpressionAttributeValues: {
+          ":groupId": getRowId(result.id, values.entityKey),
+        },
+      };
+      const commentsData = await indexQuery("comments", commentsQuery);
+      result.Comments = commentsData.Items;
+    }
+    return {
+      status: 200,
+      data: result,
+    };
+  } catch (error) {
+    log("getRequest", "Error", error.toString(), logId);
+  }
+  return {
+    status: 500,
+    data: {
+      error: "Internal error",
+    },
+  };
+};

package/scheduleJobImport.js

@@ -44,7 +44,8 @@ const processBatch = async (strategy, startTime) => {
   const promises = [];
 
   Items.forEach((item) => {
-    promises.push(processSingle(strategy, item));
+    log("processBatch", "ProcessSingle", JSON.stringify(item), logId);
+    promises.push(processSingle(strategy, JSON.parse(JSON.stringify(item))));
   });
 
   await Promise.all(promises);

package/{values.config.maintenancea.js → values.config.a.js}

@@ -1,6 +1,7 @@
 const values = {
   entityKey: "maintenancerequestA",
   serviceKey: "maintenanceA",
+  updateKey: "jobsA",
   tableKeyJobTypes: "jobtypesA",
   tableKeyMaintenance: "maintenanceA",
   tableKeySupportTickets: "supportticketsA",

package/values.config.b.js

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,26 @@
+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;

package/values.config.default.js

@@ -1,6 +1,7 @@
 const values = {
   entityKey: "maintenancerequest",
   serviceKey: "maintenance",
+  updateKey: "jobs",
   tableKeyJobTypes: "jobtypes",
   tableKeyMaintenance: "maintenance",
   tableKeySupportTickets: "supporttickets",

package/values.config.js

@@ -1,6 +1,7 @@
 const values = {
   entityKey: "maintenancerequest",
   serviceKey: "maintenance",
+  updateKey: "jobs",
   tableKeyJobTypes: "jobtypes",
   tableKeyMaintenance: "maintenance",
   tableKeySupportTickets: "supporttickets",