@plusscommunities/pluss-maintenance-aws 1.1.5 → 1.2.1-beta.0

package/db/maintenance/addMaintenanceJob.js

@@ -1,10 +1,11 @@
 const moment = require("moment");
 const _ = require("lodash");
 const uuid = require("uuid");
+const getTableCount = require("@plusscommunities/pluss-core-aws/db/common/getTableCount");
 const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef");
 const { getConfig } = require("@plusscommunities/pluss-core-aws/config");
 
-module.exports = (
+module.exports = async (
   userID,
   userName,
   user,
@@ -19,57 +20,52 @@ module.exports = (
   location,
   audience
 ) => {
-  return new Promise((resolve, reject) => {
-    const requestToSave = {
-      userID,
-      userName,
-      userProfilePic: user ? user.profilePic : null,
-      phone,
-      room,
-      title,
-      description,
-      type,
-      isHome,
-      homeText,
-      images,
-      site: location,
-      audience,
-    };
+  const requestToSave = {
+    userID,
+    userName,
+    userProfilePic: user ? user.profilePic : null,
+    phone,
+    room,
+    title,
+    description,
+    type,
+    isHome,
+    homeText,
+    images,
+    site: location,
+    audience,
+  };
 
-    if (requestToSave.images) {
-      const thumbSource = Array.isArray(requestToSave.images)
-        ? requestToSave.images[0]
-        : requestToSave.images;
-      if (thumbSource) {
-        requestToSave.thumbnail = thumbSource
-          .replace("/general1400/", "/general300/")
-          .replace("/uploads1400/", "/uploads300/");
-      }
+  if (requestToSave.images) {
+    const thumbSource = Array.isArray(requestToSave.images)
+      ? requestToSave.images[0]
+      : requestToSave.images;
+    if (thumbSource) {
+      requestToSave.thumbnail = thumbSource
+        .replace("/general1400/", "/general300/")
+        .replace("/uploads1400/", "/uploads300/");
     }
-    if (_.isEmpty(requestToSave.audience)) {
-      requestToSave.audience = [];
-    }
-    requestToSave.status = getConfig().maintenanceInstantComplete
-      ? "Completed"
-      : "Unassigned";
-    requestToSave.history = [
-      {
-        timestamp: moment.utc().valueOf(),
-        status: requestToSave.status,
-        user,
-      },
-    ];
+  }
+  if (_.isEmpty(requestToSave.audience)) {
+    requestToSave.audience = [];
+  }
+  requestToSave.status = getConfig().maintenanceInstantComplete
+    ? "Completed"
+    : "Unassigned";
+  requestToSave.history = [
+    {
+      timestamp: moment.utc().valueOf(),
+      status: requestToSave.status,
+      user,
+    },
+  ];
 
-    requestToSave.id = uuid.v1();
-    requestToSave.createdTime = moment.utc().toISOString();
-    requestToSave.createdUnix = moment.utc().valueOf();
+  requestToSave.id = uuid.v1();
+  requestToSave.createdTime = moment.utc().toISOString();
+  requestToSave.createdUnix = moment.utc().valueOf();
+  const result = await getTableCount("maintenance");
+  requestToSave.jobId = ++result.Count + "";
 
-    updateRef("maintenance", requestToSave)
-      .then(() => {
-        resolve(requestToSave.id);
-      })
-      .catch((error) => {
-        reject(error);
-      });
-  });
+  await updateRef("maintenance", requestToSave);
+  return requestToSave.id;
 };

package/feature.config.js

@@ -194,6 +194,7 @@ exports.serverless = {
       attributes: [
         { name: "id", type: "S" },
         { name: "site", type: "S" },
+        { name: "jobId", type: "S" },
       ],
       id: "id",
       indexes: [
@@ -201,6 +202,13 @@ exports.serverless = {
           name: "MaintenanceSiteIndex",
           keys: [{ name: "site", type: "HASH" }],
         },
+        {
+          name: "MaintenanceSiteJobIdIndex",
+          keys: [
+            { name: "site", type: "HASH" },
+            { name: "jobId", type: "RANGE" },
+          ],
+        },
       ],
     },
     {

package/getJob.js

@@ -3,6 +3,7 @@ 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");
 
@@ -10,7 +11,7 @@ module.exports.getJob = async (event, context, callback) => {
   init(config);
   const data = getBody(event);
 
-  if (!data.site || !data.jobId) {
+  if (!data.site || (!data.id && !data.jobId)) {
     return callback(
       null,
       generateJsonResponse(422, {
@@ -20,7 +21,22 @@ module.exports.getJob = async (event, context, callback) => {
   }
 
   try {
-    const result = await getRef("maintenance", "id", data.jobId);
+    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,

package/getJobs.js

@@ -36,9 +36,12 @@ module.exports.getJobs = async (event, context, callback) => {
 
     try {
       const res = await indexQuery("maintenance", query);
-      const jobs = userId
+      let jobs = userId
         ? res.Items.filter((job) => job.userID === userId)
         : res.Items;
+      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);
       return callback(null, generateJsonResponse(200, jobs));
     } catch (error1) {

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws",
-  "version": "1.1.5",
+  "version": "1.2.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -13,9 +13,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "1.5.16",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-1.5.16.tgz",
-      "integrity": "sha512-A4LTjsOuD7rUFV1i/aa3I4YzJqyz3EGOwVIwDgxgbzbQ3VDYpExKchhz9OcAHvL4XT/7Hy4X7jKMTubJMAH/CQ==",
+      "version": "1.6.1-beta.0",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-1.6.1-beta.0.tgz",
+      "integrity": "sha512-xWi2i1nJKGLeu6U0HYR9wWaEwgATBdNioVE123d4a54rxJzNzOnvWxtTHCzTRKc87WaEonbnQWLxjQ4Ipp4wJg==",
       "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": "1.1.5",
+  "version": "1.2.1-beta.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -17,7 +17,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "1.5.16",
+    "@plusscommunities/pluss-core-aws": "1.6.1-beta.0",
     "amazon-cognito-identity-js": "^2.0.19",
     "axios": "^0.18.0",
     "expo-server-sdk": "^3.0.1",