@plusscommunities/pluss-maintenance-aws-feedback 2.1.19-auth.0 → 2.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-feedback",
-  "version": "2.1.19-auth.0",
+  "version": "2.1.19",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -10,9 +10,6 @@
     "deploy": "npm run gc && npm run gs && serverless deploy",
     "betaupload": "rm -rf .serverless && npm i && npm publish --access public --tag beta",
     "betaupload:p": "npm run betapatch && npm run betaupload",
-    "authpatch": "npm version prepatch --preid=auth",
-    "authupload": "npm i && npm i && npm publish --access public --tag auth",
-    "authupload:p": "npm run authpatch && npm run authupload",
     "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",
@@ -20,7 +17,6 @@
     "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:authupload": "npm run authpatch; for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run authupload; 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"
   },
@@ -28,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "2.0.24-auth.0",
+    "@plusscommunities/pluss-core-aws": "2.0.23",
     "amazon-cognito-identity-js": "^2.0.19",
     "aws-sdk": "^2.1591.0",
     "axios": "^1.6.8",

package/requests/setExternalJobId.js

@@ -0,0 +1,121 @@
+const editRef = require("@plusscommunities/pluss-core-aws/db/common/editRef");
+const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef");
+const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
+const validateMasterAuth = require("@plusscommunities/pluss-core-aws/helper/auth/validateMasterAuth");
+const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
+const moment = require("moment");
+const { values } = require("../values.config");
+const { log } = require("@plusscommunities/pluss-core-aws/helper");
+
+module.exports = async (event, data) => {
+  const action = "setExternalJobId";
+  const logId = log(action, "Input", data);
+
+  try {
+    // 1. Validate required fields
+    if (!data.id || !data.externalId || !data.systemType) {
+      return {
+        status: 422,
+        data: {
+          error: "Missing required fields: id, externalId, systemType",
+        },
+      };
+    }
+
+    // 2. Find the job by ID (UUID)
+    let job;
+
+    try {
+      job = await getRef(values.tableNameMaintenance, "id", data.id);
+    } catch (error) {
+      log(action, "Error:JobNotFound", { error: error.message }, logId);
+      return { status: 404, data: { error: "Job not found" } };
+    }
+
+    if (!job) {
+      log(action, "JobNotFound", { id: data.id }, logId);
+      return { status: 404, data: { error: "Job not found" } };
+    }
+
+    // 3. Validate authorization using the job's site
+    const authorised = await validateMasterAuth(
+      event,
+      values.permissionMaintenanceTracking,
+      job.site
+    );
+
+    if (!authorised) {
+      log(action, "NotAuthorised", { site: job.site }, logId);
+      return { status: 403, data: { error: "Not authorised" } };
+    }
+
+    // 4. Get user preview for history tracking
+    const user = await getUserPreviewFromReq(event);
+
+    // 5. Create entity type identifier
+    const entityType = `${values.serviceKey}_${data.systemType}`;
+    const rowId = `${entityType}_${data.externalId}`;
+
+    log(action, "CreatingExternalEntity", { entityType, rowId }, logId);
+
+    // 6. Create/update external entity mapping
+    const externalEntity = await updateRef("externalentities", {
+      RowId: rowId,
+      EntityType: entityType,
+      InternalId: job.id,
+      ExternalId: data.externalId,
+      LastUpdated: moment().valueOf(),
+      TrackedData: data.trackedData || {},
+      Site: job.site, // Store for site-specific queries
+    });
+
+    log(action, "ExternalEntityCreated", externalEntity, logId);
+
+    // 7. Add history entry
+    if (!job.history) job.history = [];
+    job.history.push({
+      timestamp: moment.utc().valueOf(),
+      action: "ExternalIDSet",
+      externalId: data.externalId,
+      user,
+    });
+
+    // 8. Update job with history and optionally update job number for system parity
+    let updatedJob = job;
+
+    if (!isNaN(data.externalId)) {
+      log(
+        action,
+        "UpdatingJobNumber",
+        {
+          oldJobNo: job.jobNo,
+          newJobNo: data.externalId,
+        },
+        logId
+      );
+
+      updatedJob = await editRef(values.tableNameMaintenance, "id", job.id, {
+        jobNo: Number(data.externalId),
+        jobId: Number(data.externalId) + "",
+        history: job.history,
+      });
+
+      log(action, "JobNumberUpdated", updatedJob, logId);
+    }
+
+    return {
+      status: 200,
+      data: {
+        success: true,
+        job: updatedJob,
+        externalEntity: externalEntity,
+      },
+    };
+  } catch (error) {
+    log(action, "InternalError", error, logId);
+    return {
+      status: 500,
+      data: { error: "Internal error", message: error.message },
+    };
+  }
+};

package/updateData.js

@@ -4,6 +4,7 @@ const { init } = require("@plusscommunities/pluss-core-aws/config");
 const config = require("./config.json");
 const assignRequest = require("./requests/assignRequest");
 const updatePriority = require("./requests/updatePriority");
+const setExternalJobId = require("./requests/setExternalJobId");
 
 module.exports.updateData = async (event, context, callback) => {
   init(config);
@@ -21,7 +22,11 @@ module.exports.updateData = async (event, context, callback) => {
       case "priority":
         response = await updatePriority(event, data);
         break;
+      case "externalid":
+        response = await setExternalJobId(event, data);
+        break;
       default:
+        response = { status: 404, data: { error: "Action not found" } };
         break;
     }
   } catch (err) {
@@ -33,5 +38,9 @@ module.exports.updateData = async (event, context, callback) => {
 
   log(action, "Response", response, logId);
 
+  if (!response) {
+    response = { status: 500, data: { error: "No response generated" } };
+  }
+
   return callback(null, generateJsonResponse(response.status, response.data));
 };