@plusscommunities/pluss-maintenance-aws 1.2.4 → 1.2.6

package/db/maintenance/addMaintenanceJob.js

@@ -1,7 +1,7 @@
 const moment = require("moment");
 const _ = require("lodash");
 const uuid = require("uuid");
-const getTableCount = require("@plusscommunities/pluss-core-aws/db/common/getTableCount");
+const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
 const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef");
 const { getConfig } = require("@plusscommunities/pluss-core-aws/config");
 
@@ -63,8 +63,20 @@ module.exports = async (
   requestToSave.id = uuid.v1();
   requestToSave.createdTime = moment.utc().toISOString();
   requestToSave.createdUnix = moment.utc().valueOf();
-  const result = await getTableCount("maintenance");
-  requestToSave.jobId = ++result.Count + "";
+  const query = {
+    IndexName: "MaintenanceSiteJobIdIndex",
+    KeyConditionExpression: "site = :site",
+    ExpressionAttributeValues: {
+      ":site": requestToSave.site,
+    },
+    Limit: 1,
+    ScanIndexForward: false,
+  };
+  const { Items } = await indexQuery("maintenance", query);
+  requestToSave.jobId =
+    !_.isEmpty(Items) && Items[0].jobId
+      ? Number.parseInt(Items[0].jobId) + 1 + ""
+      : "0";
 
   await updateRef("maintenance", requestToSave);
   return requestToSave.id;

package/feature.config.js

@@ -156,6 +156,15 @@ exports.serverless = {
       path: "tickets/get/{id}",
       method: "get",
     },
+    {
+      name: "getData",
+      file: "getData",
+      function: "getData",
+      memorySize: 256,
+      timeout: 10,
+      path: "get/{action}",
+      method: "get",
+    },
   ],
   triggers: [
     {
@@ -195,6 +204,7 @@ exports.serverless = {
         { name: "id", type: "S" },
         { name: "site", type: "S" },
         { name: "jobId", type: "S" },
+        { name: "userID", type: "S" },
       ],
       id: "id",
       indexes: [
@@ -209,6 +219,13 @@ exports.serverless = {
             { name: "jobId", type: "RANGE" },
           ],
         },
+        {
+          name: "MaintenanceSiteUserIdIndex",
+          keys: [
+            { name: "site", type: "HASH" },
+            { name: "userID", type: "RANGE" },
+          ],
+        },
       ],
     },
     {

package/getData.js

@@ -0,0 +1,114 @@
+const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
+const config = require("./config.json");
+const { init } = require("@plusscommunities/pluss-core-aws/config");
+const { log } = require("@plusscommunities/pluss-core-aws/helper");
+const getSessionUser = require("@plusscommunities/pluss-core-aws/helper/auth/getSessionUser");
+const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
+const validateSiteAccess = require("@plusscommunities/pluss-core-aws/helper/auth/validateSiteAccess");
+const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
+
+const getRequests = async (event) => {
+  const qParams = event.queryStringParameters;
+  const logId = log("getRequests", "Params", qParams);
+
+  // insufficient input
+  if (!qParams.site) {
+    return { status: 422, data: { error: "Insufficient input" } };
+  }
+  log("getRequests", "SufficientInput", true, logId);
+
+  // no access to site
+  const valid = await validateSiteAccess(event, qParams.site);
+  log("getRequests", "valid", valid, logId);
+  if (!valid) {
+    return { status: 403, data: { error: "Not authorised" } };
+  }
+
+  // check auth level to determine whether to fetch all requests or only matching requests
+  const authorised = await validateMasterAuth(
+    event,
+    "maintenanceTracking",
+    qParams.site
+  );
+  log("getRequests", "authorised", authorised, logId);
+  const userId = authorised
+    ? null
+    : await getSessionUser(event.headers.authkey);
+
+  log("getRequests", "userId", userId, logId);
+
+  const query = userId
+    ? {
+        IndexName: "MaintenanceSiteUserIdIndex",
+        KeyConditionExpression: "site = :site AND userID = :userId",
+        ExpressionAttributeValues: {
+          ":site": qParams.site,
+          ":userId": userId,
+        },
+      }
+    : {
+        IndexName: "MaintenanceSiteIndex",
+        KeyConditionExpression: "site = :site",
+        ExpressionAttributeValues: {
+          ":site": qParams.site,
+        },
+      };
+  log("getRequests", "query", query, logId);
+
+  // check whether pagination is applied
+  if (qParams.lastKey) {
+    try {
+      query.ExclusiveStartKey = JSON.parse(qParams.lastKey);
+    } catch (e) {}
+  }
+
+  // get jobs
+  const result = await indexQuery("maintenance", query);
+  let jobs = result.Items;
+
+  log("getRequests", "LastEvaluatedKey", result.LastEvaluatedKey, logId);
+  log("getRequests", "JobsLength", jobs.length, logId);
+
+  // filter on status
+  if (qParams.status) {
+    jobs = jobs.filter((j) => qParams.status.includes(j.status));
+    log("getRequests", "FilteredOnStatus", jobs.length, logId);
+  }
+
+  // filter on type
+  if (qParams.type) {
+    jobs = jobs.filter((j) => qParams.type.includes(j.type));
+    log("getRequests", "FilteredOnType", jobs.length, logId);
+  }
+
+  // compile results
+  const results = { Items: jobs, LastKey: result.LastEvaluatedKey };
+  log("getRequests", "Done", true, logId);
+  return { status: 200, data: results };
+};
+
+module.exports.getData = async (event, context, callback) => {
+  init(config);
+  const action = event.pathParameters.action;
+  const logId = log(action, "Input", event.queryStringParameters);
+
+  let response;
+
+  try {
+    switch (action) {
+      case "requests":
+        response = await getRequests(event);
+        log(action, "ResponseLength", response.data.Items.length, logId);
+        break;
+      default:
+        break;
+    }
+  } catch (err) {
+    log(action, "InternalError", err, logId);
+    if (!response) {
+      response = { status: 500, data: { error: "Internal Error" } };
+    }
+  }
+
+  return callback(null, generateJsonResponse(response.status, response.data));
+};

package/getJobs.js

@@ -42,7 +42,7 @@ module.exports.getJobs = async (event, context, callback) => {
       if (data.status)
         jobs = jobs.filter((j) => data.status.includes(j.status));
       if (data.type) jobs = jobs.filter((j) => data.type.includes(j.type));
-      console.log("jobs", jobs);
+      console.log("jobs count", jobs?.length);
       return callback(null, generateJsonResponse(200, jobs));
     } catch (error1) {
       return callback(

package/package-lock.json

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

package/package.json

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