@plusscommunities/pluss-maintenance-aws 2.0.3-beta.0 → 2.0.3

package/createJob.js

@@ -5,10 +5,10 @@ const { getBody } = require("@plusscommunities/pluss-core-aws/helper");
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
 const addMaintenanceJob = require("./db/maintenance/addMaintenanceJob");
 const validateSiteAccess = require("@plusscommunities/pluss-core-aws/helper/auth/validateSiteAccess");
-const getUserPreviewFromHeader = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromHeader");
+const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
 const publishActivity = require("@plusscommunities/pluss-core-aws/db/activity/publishActivity");
-const getUser = require("@plusscommunities/pluss-core-aws/db/users/getUser");
 const sendJobEmail = require("./sendJobEmail");
+const logAnalyticsActivity = require("@plusscommunities/pluss-core-aws/db/analytics/logAnalyticsActivity");
 
 module.exports.createJob = (event, context, callback) => {
   init(config);
@@ -19,7 +19,7 @@ module.exports.createJob = (event, context, callback) => {
       if (!authorised) {
         return callback(
           null,
-          generateJsonResponse(422, { fail: true, error: "not authorised" })
+          generateJsonResponse(403, { fail: true, error: "not authorised" })
         );
       }
       if (
@@ -28,18 +28,18 @@ module.exports.createJob = (event, context, callback) => {
         _.isUndefined(data.room) ||
         _.isUndefined(data.description)
       ) {
-        console.error("insufficient input -- maintenance request", data.userID);
+        console.error("insufficient input", data.userID);
         return callback(
           null,
           generateJsonResponse(422, { error: "Insufficient input" })
         );
       }
-      const requestUser = data.userID ? await getUser(data.userID) : null;
+      const user = await getUserPreviewFromReq(event);
 
       addMaintenanceJob(
-        data.userID,
-        data.userName,
-        requestUser,
+        user.id,
+        user.displayName,
+        user,
         data.phone,
         data.room,
         data.title,
@@ -50,55 +50,58 @@ module.exports.createJob = (event, context, callback) => {
         data.images || data.image,
         data.location,
         data.audience
-      )
-        .then((id) => {
-          sendJobEmail({
-            userID: data.userID,
-            userName: data.userName,
-            phone: data.phone,
-            room: data.room,
-            title: data.title,
-            description: data.description,
-            type: data.type,
-            isHome: data.isHome,
-            homeText: data.homeText,
-            image: data.image,
-            images: data.images,
-            site: data.location,
-            audience: data.audience,
-            id,
-          });
-
-          getUserPreviewFromHeader(event.headers.authkey).then((user) => {
-            publishActivity("AddMaintenanceJob", data.location, id, user, {
-              title: data.title,
-              description: data.description,
-            });
-          });
+      ).then((id) => {
+        sendJobEmail({
+          userID: user.id,
+          userName: user.displayName,
+          phone: data.phone,
+          room: data.room,
+          title: data.title,
+          description: data.description,
+          type: data.type,
+          isHome: data.isHome,
+          homeText: data.homeText,
+          image: data.image,
+          images: data.images,
+          site: data.location,
+          audience: data.audience,
+          id,
+        });
 
-          return callback(
-            null,
-            generateJsonResponse(200, {
-              success: true,
-              searchResult: id,
-            })
-          );
-        })
-        .catch((error) => {
-          console.error(
-            "Failed to save maintenance node --> email successful",
-            data.userID
-          );
-          console.log(error);
-          return callback(
-            null,
-            generateJsonResponse(422, {
-              error,
-            })
-          );
+        publishActivity("AddMaintenanceJob", data.location, id, user, {
+          title: data.title,
+          description: data.description,
         });
+
+        logAnalyticsActivity(
+          `Request`,
+          "maintenancerequest",
+          data.location,
+          user,
+          id
+        );
+
+        return callback(
+          null,
+          generateJsonResponse(200, {
+            success: true,
+            id,
+            searchResult: id,
+          })
+        );
+      });
     })
     .catch((error) => {
-      callback(null, generateJsonResponse(422, { fail: true, error }));
+      console.error(
+        "Failed to save maintenance node --> email successful",
+        data.userID
+      );
+      console.log(error);
+      return callback(
+        null,
+        generateJsonResponse(422, {
+          error,
+        })
+      );
     });
 };

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,39 @@ 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 + "";
+  if (!requestToSave.jobId) {
+    const jobNoQ = {
+      IndexName: "MaintenanceSiteJobNoIndex",
+      KeyConditionExpression: "site = :site",
+      ExpressionAttributeValues: {
+        ":site": requestToSave.site,
+      },
+      Limit: 1,
+      ScanIndexForward: false,
+    };
+
+    const queryRes = await indexQuery("maintenance", jobNoQ);
+
+    if (!_.isEmpty(queryRes.Items)) {
+      requestToSave.jobNo = queryRes.Items[0].jobNo + 1;
+    } else {
+      const query = {
+        IndexName: "MaintenanceSiteJobIdIndex",
+        KeyConditionExpression: "site = :site",
+        ExpressionAttributeValues: {
+          ":site": requestToSave.site,
+        },
+        Limit: 1,
+        ScanIndexForward: false,
+      };
+      const { Items } = await indexQuery("maintenance", query);
+      requestToSave.jobNo =
+        !_.isEmpty(Items) && Items[0].jobId
+          ? Number.parseInt(Items[0].jobId) + 1
+          : 0;
+    }
+    requestToSave.jobId = (requestToSave.jobNo || 0) + "";
+  }
 
   await updateRef("maintenance", requestToSave);
   return requestToSave.id;

package/deleteJob.js

@@ -5,8 +5,8 @@ const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/ge
 const deleteRef = require("@plusscommunities/pluss-core-aws/db/common/deleteRef");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
 const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
-const getUserPreviewFromHeader = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromHeader");
 const publishActivity = require("@plusscommunities/pluss-core-aws/db/activity/publishActivity");
+const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
 
 module.exports.deleteJob = (event, context, callback) => {
   init(config);
@@ -25,7 +25,7 @@ module.exports.deleteJob = (event, context, callback) => {
       console.error("Authorization not valid");
       callback(
         null,
-        generateJsonResponse(422, {
+        generateJsonResponse(403, {
           error: {
             message: "Authorization not valid.",
           },
@@ -47,7 +47,7 @@ module.exports.deleteJob = (event, context, callback) => {
       }
       deleteRef("maintenance", "id", data.id)
         .then(() => {
-          getUserPreviewFromHeader(event.headers.authkey).then((user) => {
+          getUserPreviewFromReq(event).then((user) => {
             publishActivity("DeleteMaintenanceJob", data.site, data.id, user, {
               title: result.title,
               description: result.description,

package/editJob.js

@@ -2,14 +2,14 @@ const _ = require("lodash");
 const config = require("./config.json");
 const { init } = require("@plusscommunities/pluss-core-aws/config");
 const { getBody } = require("@plusscommunities/pluss-core-aws/helper");
-const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
 const sendJobEmail = require("./sendJobEmail");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
 const publishActivity = require("@plusscommunities/pluss-core-aws/db/activity/publishActivity");
-const getUserPreviewFromHeader = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromHeader");
 const editMaintenanceJob = require("./db/maintenance/editMaintenanceJob");
 const { getConfig } = require("@plusscommunities/pluss-core-aws/config");
+const hasRequestPermission = require("./requests/helper/hasRequestPermission");
+const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
 
 module.exports.editJob = (event, context, callback) => {
   init(config);
@@ -24,55 +24,50 @@ module.exports.editJob = (event, context, callback) => {
 
   getRef("maintenance", "id", data.job.id)
     .then((prevData) => {
-      validateMasterAuth(event, "maintenanceTracking", prevData.site).then(
-        (authorised) => {
-          if (!authorised) {
-            console.error("Authorization not valid");
-            return callback(
-              null,
-              generateJsonResponse(422, {
-                error: { message: "not authorized." },
-              })
-            );
-          }
-          getUserPreviewFromHeader(event.headers.authkey).then((user) => {
-            editMaintenanceJob(data.job)
-              .then((result) => {
-                if (!getConfig().maintenanceInstantComplete) {
-                  sendJobEmail(data.job, true);
-                  publishActivity(
-                    "EditMaintenanceJob",
-                    data.site,
-                    data.job.id,
-                    user,
-                    { title: result.title, description: result.description }
-                  );
-                }
-
-                return callback(
-                  null,
-                  generateJsonResponse(200, {
-                    success: true,
-                    job: result,
-                  })
-                );
-              })
-              .catch((error) => {
-                console.log(error);
-                console.error(
-                  "Failed to edit maintenance node -->",
-                  data.job.id
-                );
-                return callback(
-                  null,
-                  generateJsonResponse(422, {
-                    error,
-                  })
-                );
-              });
-          });
+      hasRequestPermission(event, prevData).then((authorised) => {
+        if (!authorised) {
+          console.error("Authorization not valid");
+          return callback(
+            null,
+            generateJsonResponse(422, {
+              error: { message: "not authorized." },
+            })
+          );
         }
-      );
+        getUserPreviewFromReq(event).then((user) => {
+          editMaintenanceJob(data.job)
+            .then((result) => {
+              if (!getConfig().maintenanceInstantComplete) {
+                sendJobEmail(data.job, true);
+                publishActivity(
+                  "EditMaintenanceJob",
+                  data.site,
+                  data.job.id,
+                  user,
+                  { title: result.title, description: result.description }
+                );
+              }
+
+              return callback(
+                null,
+                generateJsonResponse(200, {
+                  success: true,
+                  job: result,
+                })
+              );
+            })
+            .catch((error) => {
+              console.log(error);
+              console.error("Failed to edit maintenance node -->", data.job.id);
+              return callback(
+                null,
+                generateJsonResponse(422, {
+                  error,
+                })
+              );
+            });
+        });
+      });
     })
     .catch((error) => {
       console.log("Fail on edit job authentication");

package/editJobStatus.js

@@ -5,11 +5,12 @@ 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 validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
-const getUserPreviewFromHeader = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromHeader");
+const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
 const publishActivity = require("@plusscommunities/pluss-core-aws/db/activity/publishActivity");
 const publishNotifications = require("@plusscommunities/pluss-core-aws/db/notifications/publishNotifications");
 const editMaintenanceJob = require("./db/maintenance/editMaintenanceJob");
+const logAnalyticsActivity = require("@plusscommunities/pluss-core-aws/db/analytics/logAnalyticsActivity");
+const hasRequestPermission = require("./requests/helper/hasRequestPermission");
 
 module.exports.editJobStatus = async (event, context, callback) => {
   init(config);
@@ -17,16 +18,12 @@ module.exports.editJobStatus = async (event, context, callback) => {
 
   try {
     const job = await getRef("maintenance", "id", data.id);
-    const authorised = await validateMasterAuth(
-      event,
-      "maintenanceTracking",
-      job.site || job.location
-    );
+    const authorised = await hasRequestPermission(event, job);
     if (!authorised) {
       console.error("Authorization not valid");
       return callback(
         null,
-        generateJsonResponse(422, {
+        generateJsonResponse(403, {
           error: {
             message: "Authorization not valid.",
           },
@@ -34,7 +31,7 @@ module.exports.editJobStatus = async (event, context, callback) => {
       );
     }
 
-    const user = await getUserPreviewFromHeader(event.headers.authkey);
+    const user = await getUserPreviewFromReq(event);
 
     // Update history
     if (!job.history) job.history = [];
@@ -55,6 +52,16 @@ module.exports.editJobStatus = async (event, context, callback) => {
       { title: result.title, status: result.status }
     );
 
+    if (job.status === "Completed") {
+      logAnalyticsActivity(
+        `RequestCompleted`,
+        "maintenancerequest",
+        result.site,
+        user,
+        result.id
+      );
+    }
+
     if (result.userID) {
       publishNotifications(
         [result.userID],

package/editNote.js

@@ -4,12 +4,12 @@ const moment = require("moment");
 const config = require("./config.json");
 const { init } = require("@plusscommunities/pluss-core-aws/config");
 const { getBody } = require("@plusscommunities/pluss-core-aws/helper");
-const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
 const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef");
 const publishActivity = require("@plusscommunities/pluss-core-aws/db/activity/publishActivity");
-const getUserPreviewFromHeader = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromHeader");
+const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
+const hasRequestPermission = require("./requests/helper/hasRequestPermission");
 
 module.exports.editNote = (event, context, callback) => {
   init(config);
@@ -51,18 +51,18 @@ module.exports.editNote = (event, context, callback) => {
   }
 
   getRef("maintenance", "id", data.id).then((job) => {
-    validateMasterAuth(event, "maintenanceTracking", job.site)
+    hasRequestPermission(event, job)
       .then((authorised) => {
         if (!authorised) {
           console.error("Authorization not valid");
           return callback(
             null,
-            generateJsonResponse(422, {
+            generateJsonResponse(403, {
               error: { message: "not authorized." },
             })
           );
         }
-        getUserPreviewFromHeader(event.headers.authkey).then((user) => {
+        getUserPreviewFromReq(event).then((user) => {
           let activityAction = "";
           switch (data.action) {
             case "AddNote":
@@ -91,7 +91,7 @@ module.exports.editNote = (event, context, callback) => {
               if (!note) {
                 return callback(
                   null,
-                  generateJsonResponse(422, {
+                  generateJsonResponse(404, {
                     error: { message: "Note not found" },
                   })
                 );