@plusscommunities/pluss-maintenance-aws 2.1.2 → 2.1.3

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,77 +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 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("maintenance", query);
-      result = Items[0];
-    }
-    if (!result)
-      result = await getRef("maintenance", "id", data.id || data.jobId);
-
-    try {
-      const authorised = await validateMasterAuth(
-        event,
-        "maintenanceTracking",
-        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/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",

package/requests/getRequest.js

@@ -0,0 +1,84 @@
+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");
+
+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("maintenance", query);
+      result = Items[0];
+    }
+    if (!result) {
+      result = await getRef("maintenance", "id", data.id || data.jobId);
+    }
+
+    const authorised = await validateMasterAuth(
+      event,
+      "maintenanceTracking",
+      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, "maintenancerequest"),
+        },
+      };
+      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

@@ -1,7 +1,6 @@
 const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
 const editRef = require("@plusscommunities/pluss-core-aws/db/common/editRef");
 const moment = require("moment");
-const { DynamoDB } = require("aws-sdk");
 const { getStrategy } = require("./integration");
 const { log } = require("@plusscommunities/pluss-core-aws/helper");
 
@@ -45,7 +44,8 @@ const processBatch = async (strategy, startTime) => {
   const promises = [];
 
   Items.forEach((item) => {
-    promises.push(processSingle(strategy, DynamoDB.Converter.unmarshall(item)));
+    log("processBatch", "ProcessSingle", JSON.stringify(item), logId);
+    promises.push(processSingle(strategy, JSON.parse(JSON.stringify(item))));
   });
 
   await Promise.all(promises);