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

package/createJob.js

@@ -11,6 +11,7 @@ const getUserPreview = require("@plusscommunities/pluss-core-aws/helper/getUserP
 const publishActivity = require("@plusscommunities/pluss-core-aws/db/activity/publishActivity");
 const sendJobEmail = require("./sendJobEmail");
 const logAnalyticsActivity = require("@plusscommunities/pluss-core-aws/db/analytics/logAnalyticsActivity");
+const { values } = require("./values.config");
 
 module.exports.createJob = (event, context, callback) => {
   init(config);
@@ -40,7 +41,7 @@ module.exports.createJob = (event, context, callback) => {
       if (data.userID !== "undefined" && user.id !== data.userID) {
         const canRequest = await validateMasterAuth(
           event,
-          "maintenanceTracking",
+          values.permissionMaintenanceTracking,
           data.location
         );
         if (!canRequest) {
@@ -95,7 +96,7 @@ module.exports.createJob = (event, context, callback) => {
 
         logAnalyticsActivity(
           `Request`,
-          "maintenancerequest",
+          values.entityKey,
           data.location,
           user,
           id

package/createJobType.js

@@ -5,6 +5,7 @@ const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
 const createGuid = require("@plusscommunities/pluss-core-aws/helper/createGuid");
 const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef");
+const { values } = require("./values.config");
 
 module.exports.createJobType = (event, context, callback) => {
   init(config);
@@ -17,43 +18,45 @@ module.exports.createJobType = (event, context, callback) => {
     );
   }
 
-  validateMasterAuth(event, "maintenanceTypes").then((authorised) => {
-    if (!authorised) {
-      console.error("Authorization not valid");
-      return callback(
-        null,
-        generateJsonResponse(422, {
-          error: { message: "Admin - Create User - not authorized." },
-        })
-      );
-    }
-
-    const jobType = {
-      id: createGuid().substring(0, 8),
-      email: data.email,
-      typeName: data.name,
-      description: data.description,
-      level: data.level,
-      site: data.site,
-    };
-
-    updateRef("jobTypes", jobType)
-      .then((result) => {
-        return callback(
-          null,
-          generateJsonResponse(200, {
-            success: true,
-            jobType: result,
-          })
-        );
-      })
-      .catch((error) => {
+  validateMasterAuth(event, values.permissionMaintenanceTypes).then(
+    (authorised) => {
+      if (!authorised) {
+        console.error("Authorization not valid");
         return callback(
           null,
           generateJsonResponse(422, {
-            error,
+            error: { message: "Admin - Create User - not authorized." },
           })
         );
-      });
-  });
+      }
+
+      const jobType = {
+        id: createGuid().substring(0, 8),
+        email: data.email,
+        typeName: data.name,
+        description: data.description,
+        level: data.level,
+        site: data.site,
+      };
+
+      updateRef(values.tableNameJobTypes, jobType)
+        .then((result) => {
+          return callback(
+            null,
+            generateJsonResponse(200, {
+              success: true,
+              jobType: result,
+            })
+          );
+        })
+        .catch((error) => {
+          return callback(
+            null,
+            generateJsonResponse(422, {
+              error,
+            })
+          );
+        });
+    }
+  );
 };

package/db/maintenance/addMaintenanceJob.js

@@ -4,6 +4,7 @@ const uuid = require("uuid");
 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");
+const { values } = require("../../values.config");
 
 module.exports = async (
   userID,
@@ -74,7 +75,7 @@ module.exports = async (
       ScanIndexForward: false,
     };
 
-    const queryRes = await indexQuery("maintenance", jobNoQ);
+    const queryRes = await indexQuery(values.tableNameMaintenance, jobNoQ);
 
     if (!_.isEmpty(queryRes.Items)) {
       requestToSave.jobNo = queryRes.Items[0].jobNo + 1;
@@ -88,7 +89,7 @@ module.exports = async (
         Limit: 1,
         ScanIndexForward: false,
       };
-      const { Items } = await indexQuery("maintenance", query);
+      const { Items } = await indexQuery(values.tableNameMaintenance, query);
       requestToSave.jobNo =
         !_.isEmpty(Items) && Items[0].jobId
           ? Number.parseInt(Items[0].jobId) + 1
@@ -97,6 +98,6 @@ module.exports = async (
     requestToSave.jobId = (requestToSave.jobNo || 0) + "";
   }
 
-  await updateRef("maintenance", requestToSave);
+  await updateRef(values.tableNameMaintenance, requestToSave);
   return requestToSave.id;
 };

package/db/maintenance/editMaintenanceJob.js

@@ -1,12 +1,13 @@
 const moment = require("moment");
 const editRef = require("@plusscommunities/pluss-core-aws/db/common/editRef");
+const { values } = require("../../values.config");
 
 module.exports = (job) => {
   return new Promise((resolve, reject) => {
     job.lastActivity = moment.utc().toISOString();
     job.lastActivityUnix = moment.utc().valueOf();
 
-    editRef("maintenance", "id", job.id, job)
+    editRef(values.tableNameMaintenance, "id", job.id, job)
       .then((result) => {
         resolve(result);
       })

package/db/maintenance/getJobEmail.js

@@ -1,4 +1,5 @@
 const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
+const { values } = require("../../values.config");
 
 module.exports = (site, typeName) => {
   return new Promise((resolve, reject) => {
@@ -13,7 +14,7 @@ module.exports = (site, typeName) => {
 
     console.log("running jobType email query");
     console.log(query);
-    indexQuery("jobTypes", query)
+    indexQuery(values.tableNameJobTypes, query)
       .then((data) => {
         console.log("successful query");
         resolve(data.Items[0]);

package/deleteJob.js

@@ -7,6 +7,7 @@ const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
 const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
 const publishActivity = require("@plusscommunities/pluss-core-aws/db/activity/publishActivity");
 const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
+const { values } = require("./values.config");
 
 module.exports.deleteJob = (event, context, callback) => {
   init(config);
@@ -20,46 +21,54 @@ module.exports.deleteJob = (event, context, callback) => {
     return;
   }
 
-  validateMasterAuth(event, "maintenanceTracking").then((authorised) => {
-    if (!authorised) {
-      console.error("Authorization not valid");
-      callback(
-        null,
-        generateJsonResponse(403, {
-          error: {
-            message: "Authorization not valid.",
-          },
-        })
-      );
-      return;
-    }
-
-    getRef("maintenance", "id", data.id).then((result) => {
-      if (result.site !== data.site) {
-        return callback(
+  validateMasterAuth(event, values.permissionMaintenanceTracking).then(
+    (authorised) => {
+      if (!authorised) {
+        console.error("Authorization not valid");
+        callback(
           null,
-          generateJsonResponse(422, {
+          generateJsonResponse(403, {
             error: {
-              message: "Incorrect site.",
+              message: "Authorization not valid.",
             },
           })
         );
+        return;
       }
-      deleteRef("maintenance", "id", data.id)
-        .then(() => {
-          getUserPreviewFromReq(event).then((user) => {
-            publishActivity("DeleteMaintenanceJob", data.site, data.id, user, {
-              title: result.title,
-              description: result.description,
+
+      getRef(values.tableNameMaintenance, "id", data.id).then((result) => {
+        if (result.site !== data.site) {
+          return callback(
+            null,
+            generateJsonResponse(422, {
+              error: {
+                message: "Incorrect site.",
+              },
+            })
+          );
+        }
+        deleteRef(values.tableNameMaintenance, "id", data.id)
+          .then(() => {
+            getUserPreviewFromReq(event).then((user) => {
+              publishActivity(
+                values.activityDeleteMaintenanceJob,
+                data.site,
+                data.id,
+                user,
+                {
+                  title: result.title,
+                  description: result.description,
+                }
+              );
             });
+            callback(null, generateJsonResponse(200, { success: true }));
+            return;
+          })
+          .catch((error) => {
+            callback(null, generateJsonResponse(422, { error }));
+            return;
           });
-          callback(null, generateJsonResponse(200, { success: true }));
-          return;
-        })
-        .catch((error) => {
-          callback(null, generateJsonResponse(422, { error }));
-          return;
-        });
-    });
-  });
+      });
+    }
+  );
 };

package/deleteJobType.js

@@ -5,6 +5,7 @@ const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
 const deleteRef = require("@plusscommunities/pluss-core-aws/db/common/deleteRef");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
+const { values } = require("./values.config");
 
 module.exports.deleteJobType = (event, context, callback) => {
   init(config);
@@ -17,35 +18,37 @@ module.exports.deleteJobType = (event, context, callback) => {
     );
   }
 
-  validateMasterAuth(event, "maintenanceTypes").then((authorised) => {
-    if (!authorised) {
-      console.error("Authorization not valid");
-      return callback(
-        null,
-        generateJsonResponse(422, {
-          error: { message: "Admin - Create User - not authorized." },
-        })
-      );
-    }
-
-    getRef("jobTypes", "id", data.id).then((result) => {
-      if (result.site !== data.site) {
+  validateMasterAuth(event, values.permissionMaintenanceTypes).then(
+    (authorised) => {
+      if (!authorised) {
+        console.error("Authorization not valid");
         return callback(
           null,
           generateJsonResponse(422, {
-            error: {
-              message: "Incorrect site.",
-            },
+            error: { message: "Admin - Create User - not authorized." },
           })
         );
       }
-      deleteRef("jobTypes", "id", data.id)
-        .then(() => {
-          return callback(null, generateJsonResponse(200, { success: true }));
-        })
-        .catch((error) => {
-          return callback(null, generateJsonResponse(422, { error }));
-        });
-    });
-  });
+
+      getRef(values.tableNameJobTypes, "id", data.id).then((result) => {
+        if (result.site !== data.site) {
+          return callback(
+            null,
+            generateJsonResponse(422, {
+              error: {
+                message: "Incorrect site.",
+              },
+            })
+          );
+        }
+        deleteRef(values.tableNameJobTypes, "id", data.id)
+          .then(() => {
+            return callback(null, generateJsonResponse(200, { success: true }));
+          })
+          .catch((error) => {
+            return callback(null, generateJsonResponse(422, { error }));
+          });
+      });
+    }
+  );
 };

package/editJob.js

@@ -10,6 +10,7 @@ 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");
+const { values } = require("./values.config");
 
 module.exports.editJob = (event, context, callback) => {
   init(config);
@@ -22,7 +23,7 @@ module.exports.editJob = (event, context, callback) => {
     );
   }
 
-  getRef("maintenance", "id", data.job.id)
+  getRef(values.tableNameMaintenance, "id", data.job.id)
     .then((prevData) => {
       hasRequestPermission(event, prevData).then((authorised) => {
         if (!authorised) {
@@ -40,7 +41,7 @@ module.exports.editJob = (event, context, callback) => {
               if (!getConfig().maintenanceInstantComplete) {
                 sendJobEmail(data.job, true);
                 publishActivity(
-                  "EditMaintenanceJob",
+                  values.activityEditMaintenanceJob,
                   data.site,
                   data.job.id,
                   user,

package/editJobStatus.js

@@ -11,13 +11,14 @@ const publishNotifications = require("@plusscommunities/pluss-core-aws/db/notifi
 const editMaintenanceJob = require("./db/maintenance/editMaintenanceJob");
 const logAnalyticsActivity = require("@plusscommunities/pluss-core-aws/db/analytics/logAnalyticsActivity");
 const hasRequestPermission = require("./requests/helper/hasRequestPermission");
+const { values } = require("./values.config");
 
 module.exports.editJobStatus = async (event, context, callback) => {
   init(config);
   const data = getBody(event);
 
   try {
-    const job = await getRef("maintenance", "id", data.id);
+    const job = await getRef(values.tableNameMaintenance, "id", data.id);
     const authorised = await hasRequestPermission(event, job);
     if (!authorised) {
       console.error("Authorization not valid");
@@ -45,7 +46,7 @@ module.exports.editJobStatus = async (event, context, callback) => {
 
     // Log activity & notify
     publishActivity(
-      "MaintenanceJobStatusChanged",
+      values.activityMaintenanceJobStatusChanged,
       result.site,
       result.id,
       user,
@@ -55,7 +56,7 @@ module.exports.editJobStatus = async (event, context, callback) => {
     if (job.status === "Completed") {
       logAnalyticsActivity(
         `RequestCompleted`,
-        "maintenancerequest",
+        values.entityKey,
         result.site,
         user,
         result.id
@@ -65,7 +66,7 @@ module.exports.editJobStatus = async (event, context, callback) => {
     if (result.userID) {
       publishNotifications(
         [result.userID],
-        "MaintenanceJobStatusChanged",
+        values.activityMaintenanceJobStatusChanged,
         result.site,
         result.id,
         result,

package/editJobType.js

@@ -5,6 +5,7 @@ const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
 const editRef = require("@plusscommunities/pluss-core-aws/db/common/editRef");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
+const { values } = require("./values.config");
 
 module.exports.editJobType = (event, context, callback) => {
   init(config);
@@ -17,55 +18,57 @@ module.exports.editJobType = (event, context, callback) => {
     );
   }
 
-  validateMasterAuth(event, "maintenanceTypes").then((authorised) => {
-    if (!authorised) {
-      console.error("Authorization not valid");
-      return callback(
-        null,
-        generateJsonResponse(422, {
-          error: { message: "Admin - Create User - not authorized." },
-        })
-      );
-    }
-
-    const jobType = {
-      id: data.id,
-      email: data.email,
-      typeName: data.name,
-      description: data.description,
-      level: data.level,
-      site: data.site,
-    };
-
-    getRef("jobTypes", "id", data.id).then((result) => {
-      if (result.site !== data.site) {
+  validateMasterAuth(event, values.permissionMaintenanceTypes).then(
+    (authorised) => {
+      if (!authorised) {
+        console.error("Authorization not valid");
         return callback(
           null,
           generateJsonResponse(422, {
-            error: {
-              message: "Incorrect site.",
-            },
+            error: { message: "Admin - Create User - not authorized." },
           })
         );
       }
-      editRef("jobTypes", "id", data.id, jobType)
-        .then((result) => {
-          return callback(
-            null,
-            generateJsonResponse(200, {
-              success: true,
-              jobType: result,
-            })
-          );
-        })
-        .catch((error) => {
+
+      const jobType = {
+        id: data.id,
+        email: data.email,
+        typeName: data.name,
+        description: data.description,
+        level: data.level,
+        site: data.site,
+      };
+
+      getRef(values.tableNameJobTypes, "id", data.id).then((result) => {
+        if (result.site !== data.site) {
           return callback(
             null,
             generateJsonResponse(422, {
-              error,
+              error: {
+                message: "Incorrect site.",
+              },
             })
           );
-        });
-    });
-  });
+        }
+        editRef(values.tableNameJobTypes, "id", data.id, jobType)
+          .then((result) => {
+            return callback(
+              null,
+              generateJsonResponse(200, {
+                success: true,
+                jobType: result,
+              })
+            );
+          })
+          .catch((error) => {
+            return callback(
+              null,
+              generateJsonResponse(422, {
+                error,
+              })
+            );
+          });
+      });
+    }
+  );
 };

package/editNote.js

@@ -10,6 +10,7 @@ const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef"
 const publishActivity = require("@plusscommunities/pluss-core-aws/db/activity/publishActivity");
 const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
 const hasRequestPermission = require("./requests/helper/hasRequestPermission");
+const { values } = require("./values.config");
 
 module.exports.editNote = (event, context, callback) => {
   init(config);
@@ -50,7 +51,7 @@ module.exports.editNote = (event, context, callback) => {
       break;
   }
 
-  getRef("maintenance", "id", data.id).then((job) => {
+  getRef(values.tableNameMaintenance, "id", data.id).then((job) => {
     hasRequestPermission(event, job)
       .then((authorised) => {
         if (!authorised) {
@@ -76,13 +77,13 @@ module.exports.editNote = (event, context, callback) => {
                 Note: data.note,
                 Attachments: data.attachments,
               });
-              activityAction = "AddMaintenanceNote";
+              activityAction = values.activityAddMaintenanceNote;
               break;
             case "DeleteNote":
               job.Notes = _.filter(job.Notes, (n) => {
                 return n.Id !== data.noteId;
               });
-              activityAction = "DeleteMaintenanceNote";
+              activityAction = values.activityDeleteMaintenanceNote;
               break;
             case "EditNote":
               const note = _.find(job.Notes, (n) => {
@@ -98,12 +99,12 @@ module.exports.editNote = (event, context, callback) => {
               }
               note.Note = data.note;
               note.Attachments = data.attachments;
-              activityAction = "EditMaintenanceNote";
+              activityAction = values.activityEditMaintenanceNote;
               break;
             default:
               break;
           }
-          updateRef("maintenance", job).then((result) => {
+          updateRef(values.tableNameMaintenance, job).then((result) => {
             publishActivity(activityAction, result.site, result.id, user, {
               title: result.title,
               description: result.description,

package/feature.config.js

@@ -1,20 +1,22 @@
+const { values } = require("./values.config");
+
 exports.permissions = [
-  "maintenanceTracking",
-  "maintenanceAssignment",
-  "maintenanceTypes",
+  values.permissionMaintenanceTracking,
+  values.permissionMaintenanceAssignment,
+  values.permissionMaintenanceTypes,
 ];
 
 exports.entity = {
-  key: "maintenancerequest",
-  permission: "maintenanceTracking",
-  table: "maintenance",
+  key: values.entityKey,
+  permission: values.permissionMaintenanceTracking,
+  table: values.tableNameMaintenance,
   id: "id",
-  webPath: "/requestsHub/jobDetails/:id",
-  appPath: "requestDetail",
+  webPath: values.routeEntityPath,
+  appPath: values.screenMaintenanceDetail,
 };
 
 exports.serverless = {
-  name: "maintenance",
+  name: values.serviceKey,
   apis: [
     {
       name: "getJobType",
@@ -150,7 +152,7 @@ exports.serverless = {
       function: "jobChanged",
       memorySize: 2048,
       timeout: 300,
-      table: "maintenance",
+      table: values.tableKeyMaintenance,
     },
   ],
   schedules: [
@@ -173,8 +175,8 @@ exports.serverless = {
   ],
   tables: [
     {
-      key: "jobtypes",
-      name: "jobTypes",
+      key: values.tableKeyJobTypes,
+      name: values.tableNameJobTypes,
       attributes: [
         { name: "id", type: "S" },
         { name: "site", type: "S" },
@@ -192,8 +194,8 @@ exports.serverless = {
       ],
     },
     {
-      key: "maintenance",
-      name: "maintenance",
+      key: values.tableKeyMaintenance,
+      name: values.tableNameMaintenance,
       attributes: [
         { name: "id", type: "S" },
         { name: "site", type: "S" },
@@ -231,8 +233,8 @@ exports.serverless = {
       ],
     },
     {
-      key: "supporttickets",
-      name: "supporttickets",
+      key: values.tableKeySupportTickets,
+      name: values.tableNameSupportTickets,
       attributes: [
         { name: "Id", type: "S" },
         { name: "Site", type: "S" },

package/getJob.js

@@ -7,6 +7,7 @@ const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuer
 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");
 
 module.exports.getJob = async (event, context, callback) => {
   init(config);
@@ -32,16 +33,20 @@ module.exports.getJob = async (event, context, callback) => {
           ":jobId": data.jobId,
         },
       };
-      const { Items } = await indexQuery("maintenance", query);
+      const { Items } = await indexQuery(values.tableNameMaintenance, query);
       result = Items[0];
     }
     if (!result)
-      result = await getRef("maintenance", "id", data.id || data.jobId);
+      result = await getRef(
+        values.tableNameMaintenance,
+        "id",
+        data.id || data.jobId
+      );
 
     try {
       const authorised = await validateMasterAuth(
         event,
-        "maintenanceTracking",
+        values.permissionMaintenanceTracking,
         result.site
       );
       const assignAuthorised = await isValidAssignee(

package/getJobType.js

@@ -4,6 +4,7 @@ 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 validateSiteAccess = require("@plusscommunities/pluss-core-aws/helper/auth/validateSiteAccess");
+const { values } = require("./values.config");
 
 module.exports.getJobType = (event, context, callback) => {
   init(config);
@@ -26,7 +27,7 @@ module.exports.getJobType = (event, context, callback) => {
           generateJsonResponse(422, { fail: true, error: "not authorised" })
         );
       }
-      getRef("jobTypes", "id", data.typeId)
+      getRef(values.tableNameJobTypes, "id", data.typeId)
         .then((gweg) => {
           return callback(null, generateJsonResponse(200, gweg));
         })

package/getJobTypes.js

@@ -7,6 +7,7 @@ const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuer
 const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef");
 const validateSiteAccess = require("@plusscommunities/pluss-core-aws/helper/auth/validateSiteAccess");
 const createGuid = require("@plusscommunities/pluss-core-aws/helper/createGuid");
+const { values } = require("./values.config");
 
 module.exports.getJobTypes = (event, context, callback) => {
   init(config);
@@ -37,7 +38,7 @@ module.exports.getJobTypes = (event, context, callback) => {
         },
       };
 
-      indexQuery("jobTypes", query)
+      indexQuery(values.tableNameJobTypes, query)
         .then((typeRes) => {
           if (!_.isEmpty(typeRes.Items)) {
             return callback(null, generateJsonResponse(200, typeRes.Items));
@@ -49,7 +50,7 @@ module.exports.getJobTypes = (event, context, callback) => {
             site: data.site,
           };
 
-          updateRef("jobTypes", jobType).then(() => {
+          updateRef(values.tableNameJobTypes, jobType).then(() => {
             return callback(null, generateJsonResponse(200, [jobType]));
           });
         })

package/getJobs.js

@@ -5,6 +5,7 @@ const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/ge
 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 { values } = require("./values.config");
 
 module.exports.getJobs = async (event, context, callback) => {
   init(config);
@@ -20,7 +21,10 @@ module.exports.getJobs = async (event, context, callback) => {
   }
 
   try {
-    const authorised = await validateMasterAuth(event, "maintenanceTracking");
+    const authorised = await validateMasterAuth(
+      event,
+      values.permissionMaintenanceTracking
+    );
     const userId = authorised
       ? null
       : await getSessionUser(event.headers.authkey);
@@ -35,7 +39,7 @@ module.exports.getJobs = async (event, context, callback) => {
     };
 
     try {
-      const res = await indexQuery("maintenance", query);
+      const res = await indexQuery(values.tableNameMaintenance, query);
       let jobs = userId
         ? res.Items.filter((job) => job.userID === userId)
         : res.Items;

package/integration/archibus/ArchibusStrategy.js

@@ -9,6 +9,7 @@ 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) {
@@ -69,7 +70,7 @@ class ArchibusStrategy extends IntegrationStrategy {
           Host: this.host,
         },
         data: {
-          prob_type: "1.ON-SITE|1. MAINTENANCE",
+          prob_type: "1.ON-SITE",
           requestor: "PLUSSDEV",
           description: `${request.title}${
             _.isEmpty(request.description) ? "" : `\n\n${request.description}`
@@ -98,7 +99,7 @@ class ArchibusStrategy extends IntegrationStrategy {
       });
 
       // Save the Archibus ID as the job number
-      await editRef("maintenance", "id", request.id, {
+      await editRef(values.tableNameMaintenance, "id", request.id, {
         jobNo: response.data.wrId,
         jobId: response.data.wrId + "",
       });
@@ -124,7 +125,7 @@ class ArchibusStrategy extends IntegrationStrategy {
       log("Archibus:CreateRequest", "Error", e, logId);
 
       // trigger another attempt
-      // editRef("maintenance", "id", request.id, {
+      // editRef(values.tableNameMaintenance, "id", request.id, {
       //   ExtCreateRetry: moment().valueOf(),
       // });
     }
@@ -189,15 +190,24 @@ class ArchibusStrategy extends IntegrationStrategy {
     log("Archibus:RefreshFromSource", "UpdatedStatus", statusToUse, logId);
 
     if (statusToUse) {
-      let plussRequest = await getRef("maintenance", "id", requestId);
+      let plussRequest = await getRef(
+        values.tableNameMaintenance,
+        "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("maintenance", "id", requestId, {
-          status: statusToUse.Status,
-        });
+        plussRequest = await editRef(
+          values.tableNameMaintenance,
+          "id",
+          requestId,
+          {
+            status: statusToUse.Status,
+          }
+        );
         log(
           "Archibus:RefreshFromSource",
           "SavedStatus",
@@ -390,7 +400,7 @@ class ArchibusStrategy extends IntegrationStrategy {
         IndexName: "CommentsEntityIdIndex",
         KeyConditionExpression: "EntityId = :groupId",
         ExpressionAttributeValues: {
-          ":groupId": getRowId(request.id, "maintenance"),
+          ":groupId": getRowId(request.id, values.serviceKey),
         },
       };
 

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws",
-  "version": "2.1.1",
+  "version": "2.2.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1743,7 +1743,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",
@@ -2578,7 +2578,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",
@@ -3076,7 +3076,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",
@@ -6648,7 +6648,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",
@@ -6799,7 +6799,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",
@@ -7299,7 +7299,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",
-  "version": "2.1.1",
+  "version": "2.2.1-beta.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -12,6 +12,12 @@
     "betaupload:p": "npm run betapatch && npm run betaupload",
     "upload": "rm -rf .serverless && npm i && npm publish --access public",
     "upload:p": "npm run patch && npm run upload",
+    "copy:add": "run(){ ext=${1:-default}; test -f values.config.$ext.js || cp values.config.default.js values.config.$ext.js; }; run",
+    "copy:get": "echo $npm_package_name",
+    "copy:set": "run(){ target='\\@plusscommunities\\/pluss-maintenance-aws'; ext=${1:-default}; [ $ext == 'default' ] && replace=$target || replace=$target'-'$ext; echo 'Setting target to '$replace; test -f values.config.$ext.js && cp -f values.config.$ext.js values.config.js; sed -i '' -e 's/'$target'.*\"/'$replace'\"/g' package.json; }; run",
+    "copy:deploy": "for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run deploy; done; npm run copy:set; npm run gs;",
+    "copy:betaupload": "npm run betapatch; for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;",
+    "copy:upload": "npm run patch; for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run upload; done; npm run copy:set;",
     "test": "jest tests -i"
   },
   "author": "Thorbjorn Kappel Davis",

package/requests/assignRequest.js

@@ -7,6 +7,7 @@ const isValidAssignee = require("./helper/isValidAssignee");
 const getUserPreview = require("@plusscommunities/pluss-core-aws/helper/getUserPreview");
 const { log } = require("@plusscommunities/pluss-core-aws/helper");
 const publishNotifications = require("@plusscommunities/pluss-core-aws/db/notifications/publishNotifications");
+const { values } = require("../values.config");
 
 module.exports = async (event, data) => {
   const logId = log("assignRequest", "data", data);
@@ -17,14 +18,14 @@ module.exports = async (event, data) => {
     return { status: 422, data: { error: "Insufficient input" } };
   }
 
-  const request = await getRef("maintenance", "id", data.id);
+  const request = await getRef(values.tableNameMaintenance, "id", data.id);
   log("assignRequest", "request", request, logId);
   log("assignRequest", "site", request.site, logId);
 
   // validate authorisation
   const valid = await validateMasterAuth(
     event,
-    "maintenanceTracking",
+    values.permissionMaintenanceTracking,
     request.site
   );
   log("assignRequest", "valid", valid, logId);
@@ -63,7 +64,12 @@ module.exports = async (event, data) => {
 
   log("assignRequest", "changes", changes, logId);
 
-  const result = await editRef("maintenance", "id", data.id, changes);
+  const result = await editRef(
+    values.tableNameMaintenance,
+    "id",
+    data.id,
+    changes
+  );
 
   log("assignRequest", "result", result, logId);
 
@@ -71,7 +77,7 @@ module.exports = async (event, data) => {
   if (user.id !== assignedUser.id) {
     await publishNotifications(
       [assignedUser.id],
-      "MaintenanceJobAssigned",
+      values.notificationMaintenanceJobAssigned,
       result.site,
       result.id,
       result,
@@ -83,7 +89,7 @@ module.exports = async (event, data) => {
   if (request.AssigneeId && result.AssigneeId !== request.AssigneeId) {
     await publishNotifications(
       [request.AssigneeId],
-      "MaintenanceJobUnassigned",
+      values.notificationMaintenanceJobUnassigned,
       result.site,
       result.id,
       result,

package/requests/getAssignees.js

@@ -1,6 +1,7 @@
 const { log } = require("@plusscommunities/pluss-core-aws/helper");
 const getUsersByPermission = require("@plusscommunities/pluss-core-aws/helper/users/getUsersByPermission");
 const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
+const { values } = require("../values.config");
 
 // Define the new function to get assignees
 module.exports = async (event) => {
@@ -9,12 +10,12 @@ module.exports = async (event) => {
 
   const isAdmin = await validateMasterAuth(
     event,
-    "maintenanceTracking",
+    values.permissionMaintenanceTracking,
     qParams.site
   );
   const isAssignee = await validateMasterAuth(
     event,
-    "maintenanceAssignment",
+    values.permissionMaintenanceAssignment,
     qParams.site
   );
 
@@ -26,8 +27,8 @@ module.exports = async (event) => {
 
   // get assignees
   const assignees = await getUsersByPermission(qParams.site, [
-    "maintenanceTracking",
-    "maintenanceAssignment",
+    values.permissionMaintenanceTracking,
+    values.permissionMaintenanceAssignment,
   ]);
 
   log("getAssignees", "AssigneesLength", assignees.length, logId);

package/requests/getRequests.js

@@ -3,6 +3,7 @@ const getSessionUserFromReqAuthKey = require("@plusscommunities/pluss-core-aws/h
 const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
 const validateSiteAccess = require("@plusscommunities/pluss-core-aws/helper/auth/validateSiteAccess");
 const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
+const { values } = require("../values.config");
 
 module.exports = async (event) => {
   const qParams = event.queryStringParameters;
@@ -24,14 +25,14 @@ module.exports = async (event) => {
   // check auth level to determine whether to fetch all requests or only matching requests
   const authorised = await validateMasterAuth(
     event,
-    "maintenanceTracking",
+    values.permissionMaintenanceTracking,
     qParams.site
   );
   let assigneeTracking = false;
   if (!authorised) {
     assigneeTracking = await validateMasterAuth(
       event,
-      "maintenanceAssignment",
+      values.permissionMaintenanceAssignment,
       qParams.site
     );
   }
@@ -68,7 +69,7 @@ module.exports = async (event) => {
   }
 
   // get jobs
-  const result = await indexQuery("maintenance", query);
+  const result = await indexQuery(values.tableNameMaintenance, query);
   let jobs = result.Items;
 
   log("getRequests", "LastEvaluatedKey", result.LastEvaluatedKey, logId);

package/requests/helper/hasRequestPermission.js

@@ -7,11 +7,12 @@
  */
 const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
 const isValidAssignee = require("./isValidAssignee");
+const { values } = require("../../values.config");
 
 module.exports = async (event, job) => {
   const valid = await validateMasterAuth(
     event,
-    "maintenanceTracking",
+    values.permissionMaintenanceTracking,
     job.site
   );
   if (valid) {

package/requests/helper/isValidAssignee.js

@@ -1,5 +1,6 @@
 const getSessionUserFromReqAuthKey = require("@plusscommunities/pluss-core-aws/helper/auth/getSessionUserFromReqAuthKey");
 const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
+const { values } = require("../../values.config");
 
 /**
  * Checks whether the logged in user is the assignee as has the assignment permission for that site
@@ -9,7 +10,11 @@ const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth
  * @returns {Boolean} true if valid
  */
 module.exports = async (event, site, userId) => {
-  const valid = await validateMasterAuth(event, "maintenanceAssignment", site);
+  const valid = await validateMasterAuth(
+    event,
+    values.permissionMaintenanceAssignment,
+    site
+  );
   if (!valid) {
     return false;
   }

package/sendJobEmail.js

@@ -2,6 +2,7 @@ const _ = require("lodash");
 const getJobEmail = require("./db/maintenance/getJobEmail");
 const sendEmail = require("@plusscommunities/pluss-core-aws/helper/sendEmail");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
+const { values } = require("./values.config");
 
 module.exports = function (job, updated) {
   const whenEvs = job.isHome
@@ -14,9 +15,9 @@ module.exports = function (job, updated) {
 
       let htmlString = `
             <div>
-                <p><b>Service Request ${job.id != null ? `#${job.id}` : ""}${
-        updated ? "-DETAILS EDITED- " : " "
-      }(${job.type}):</b> ${job.room}</p>
+                <p><b>${values.textJobEmailTitle} ${
+        job.id != null ? `#${job.id}` : ""
+      }${updated ? "-DETAILS EDITED- " : " "}(${job.type}):</b> ${job.room}</p>
                 <div>
                     <b>Title: </b>${job.title}
                 </div>  
@@ -51,9 +52,11 @@ module.exports = function (job, updated) {
       if (!_.isNil(job.images) || !_.isNil(job.image)) {
         htmlString = `
         <div>
-            <p><b>Service Request ${job.id != null ? `#${job.id}` : ""}${
-          updated ? "-DETAILS EDITED- " : " "
-        }(${job.type}):</b> ${job.room}</p>
+            <p><b>${values.textJobEmailTitle} ${
+          job.id != null ? `#${job.id}` : ""
+        }${updated ? "-DETAILS EDITED- " : " "}(${job.type}):</b> ${
+          job.room
+        }</p>
             <div>
                 <b>Title: </b>${job.title}
             </div>  
@@ -105,9 +108,9 @@ module.exports = function (job, updated) {
 
           sendEmail(
             email,
-            `Service Request #${job.id}${updated ? " -DETAILS EDITED" : ""}- (${
-              job.type
-            }) - ${job.room}`,
+            `${values.textJobEmailTitle} #${job.id}${
+              updated ? " -DETAILS EDITED" : ""
+            }- (${job.type}) - ${job.room}`,
             htmlString
           )
             .then((result) => {

package/values.config.default.js

@@ -0,0 +1,25 @@
+const values = {
+  entityKey: "maintenancerequest",
+  serviceKey: "maintenance",
+  tableKeyJobTypes: "jobtypes",
+  tableKeyMaintenance: "maintenance",
+  tableKeySupportTickets: "supporttickets",
+  tableNameJobTypes: "jobTypes",
+  tableNameMaintenance: "maintenance",
+  tableNameSupportTickets: "supporttickets",
+  permissionMaintenanceTracking: "maintenanceTracking",
+  permissionMaintenanceAssignment: "maintenanceAssignment",
+  permissionMaintenanceTypes: "maintenanceTypes",
+  routeEntityPath: "/requestsHub/jobDetails/:id",
+  screenMaintenanceDetail: "requestDetail",
+  notificationMaintenanceJobAssigned: "MaintenanceJobAssigned",
+  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassigned",
+  activityDeleteMaintenanceJob: "DeleteMaintenanceJob",
+  activityEditMaintenanceJob: "EditMaintenanceJob",
+  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChanged",
+  activityAddMaintenanceNote: "AddMaintenanceNote",
+  activityDeleteMaintenanceNote: "DeleteMaintenanceNote",
+  activityEditMaintenanceNote: "EditMaintenanceNote",
+  textJobEmailTitle: "Service Request",
+};
+exports.values = values;

package/values.config.js

@@ -0,0 +1,25 @@
+const values = {
+  entityKey: "maintenancerequest",
+  serviceKey: "maintenance",
+  tableKeyJobTypes: "jobtypes",
+  tableKeyMaintenance: "maintenance",
+  tableKeySupportTickets: "supporttickets",
+  tableNameJobTypes: "jobTypes",
+  tableNameMaintenance: "maintenance",
+  tableNameSupportTickets: "supporttickets",
+  permissionMaintenanceTracking: "maintenanceTracking",
+  permissionMaintenanceAssignment: "maintenanceAssignment",
+  permissionMaintenanceTypes: "maintenanceTypes",
+  routeEntityPath: "/requestsHub/jobDetails/:id",
+  screenMaintenanceDetail: "requestDetail",
+  notificationMaintenanceJobAssigned: "MaintenanceJobAssigned",
+  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassigned",
+  activityDeleteMaintenanceJob: "DeleteMaintenanceJob",
+  activityEditMaintenanceJob: "EditMaintenanceJob",
+  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChanged",
+  activityAddMaintenanceNote: "AddMaintenanceNote",
+  activityDeleteMaintenanceNote: "DeleteMaintenanceNote",
+  activityEditMaintenanceNote: "EditMaintenanceNote",
+  textJobEmailTitle: "Service Request",
+};
+exports.values = values;

package/values.config.maintenancea.js

@@ -0,0 +1,25 @@
+const values = {
+  entityKey: "maintenancerequestA",
+  serviceKey: "maintenanceA",
+  tableKeyJobTypes: "jobtypesA",
+  tableKeyMaintenance: "maintenanceA",
+  tableKeySupportTickets: "supportticketsA",
+  tableNameJobTypes: "jobTypesA",
+  tableNameMaintenance: "maintenanceA",
+  tableNameSupportTickets: "supportticketsA",
+  permissionMaintenanceTracking: "maintenanceTrackingA",
+  permissionMaintenanceAssignment: "maintenanceAssignmentA",
+  permissionMaintenanceTypes: "maintenanceTypesA",
+  routeEntityPath: "/requestsHubA/jobDetails/:id",
+  screenMaintenanceDetail: "requestDetailA",
+  notificationMaintenanceJobAssigned: "MaintenanceJobAssignedA",
+  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassignedA",
+  activityDeleteMaintenanceJob: "DeleteMaintenanceJobA",
+  activityEditMaintenanceJob: "EditMaintenanceJobA",
+  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChangedA",
+  activityAddMaintenanceNote: "AddMaintenanceNoteA",
+  activityDeleteMaintenanceNote: "DeleteMaintenanceNoteA",
+  activityEditMaintenanceNote: "EditMaintenanceNoteA",
+  textJobEmailTitle: "Service Request",
+};
+exports.values = values;

package/watchJobs.js

@@ -8,6 +8,7 @@ const editRef = require("@plusscommunities/pluss-core-aws/db/common/editRef");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
 const { getRowId, log } = require("@plusscommunities/pluss-core-aws/helper");
 const getUserPreview = require("@plusscommunities/pluss-core-aws/helper/getUserPreview");
+const { values } = require("./values.config");
 
 const checkFixCompleted = async (job) => {
   const logId = log("checkFixCompleted", "Input", job.id);
@@ -35,7 +36,7 @@ const checkFixCompleted = async (job) => {
   // add old log
   await logAnalyticsActivity(
     "RequestCompleted",
-    "maintenancerequest",
+    values.entityKey,
     job.site,
     user,
     job.id,
@@ -61,11 +62,7 @@ const fixActivityLog = async (job, startTime) => {
   }
 
   // check whether it's already been logged
-  const exists = await checkActivityExists(
-    job.id,
-    "maintenancerequest",
-    "Request"
-  );
+  const exists = await checkActivityExists(job.id, values.entityKey, "Request");
   const logId = log("fixActivityLog", "exists", exists);
 
   if (!exists) {
@@ -74,7 +71,7 @@ const fixActivityLog = async (job, startTime) => {
     // add old log
     await logAnalyticsActivity(
       "Request",
-      "maintenancerequest",
+      values.entityKey,
       job.site,
       user,
       job.id,
@@ -97,7 +94,7 @@ const fixActivityLog = async (job, startTime) => {
   }
 
   // update entry to show it's been logged
-  await editRef("maintenance", "id", job.id, {
+  await editRef(values.tableNameMaintenance, "id", job.id, {
     ActivityLogged: true,
   });
 
@@ -121,7 +118,7 @@ const checkFixLog = async (startTime) => {
   }
 
   // Scans the DynamoDB table and fetch all items. The parameters describe which attributes to get.
-  const items = await scanRefRecursive("maintenance", {
+  const items = await scanRefRecursive(values.tableNameMaintenance, {
     ProjectionExpression:
       "#id, site, createdTime, #status, lastActivity, history, ActivityLogged",
     ExpressionAttributeNames: {