@plusscommunities/pluss-maintenance-aws 2.1.45 → 2.1.46

package/jobChanged.js

@@ -12,27 +12,27 @@ const { values } = require("./values.config");
 const marshaller = new Marshaller();
 
 const pushRequestToIntegration = async (request) => {
-  const integrationStrategy = await getStrategy(request.site);
-  // const mockRes = {
-  //   data: { wrId: moment().valueOf() },
-  // };
-  // await integrationStrategy.createRequest(request, mockRes);
-  await integrationStrategy.createRequest(request);
+	const integrationStrategy = await getStrategy(request.site);
+	// const mockRes = {
+	//   data: { wrId: moment().valueOf() },
+	// };
+	// await integrationStrategy.createRequest(request, mockRes);
+	await integrationStrategy.createRequest(request);
 };
 
 const onStatusChanged = async (request) => {
-  const integrationStrategy = await getStrategy(request.site);
-  await integrationStrategy.onStatusChanged(request);
+	const integrationStrategy = await getStrategy(request.site);
+	await integrationStrategy.onStatusChanged(request);
 };
 
 const onCommentAdded = async (request) => {
-  const integrationStrategy = await getStrategy(request.site);
-  await integrationStrategy.onCommentAdded(request);
+	const integrationStrategy = await getStrategy(request.site);
+	await integrationStrategy.onCommentAdded(request);
 };
 
 const onNotesAdded = async (request) => {
-  const integrationStrategy = await getStrategy(request.site);
-  await integrationStrategy.onNotesAdded(request);
+	const integrationStrategy = await getStrategy(request.site);
+	await integrationStrategy.onNotesAdded(request);
 };
 
 /**
@@ -41,87 +41,86 @@ const onNotesAdded = async (request) => {
  * @param {Object} prevRequest The previous request data
  */
 const checkIntegrationActions = async (request, prevRequest) => {
-  if (
-    request.ExtCreateRetry &&
-    request.ExtCreateRetry > prevRequest.ExtCreateRetry
-  ) {
-    log("checkIntegrationActions", "Retrying", true);
-    await pushRequestToIntegration(request);
-  }
-
-  if (request.status !== prevRequest.status) {
-    log("checkIntegrationActions", "StatusChanaged", {
-      new: request.status,
-      old: prevRequest.status,
-    });
-    await onStatusChanged(request);
-  }
-
-  if (request.commentCount > prevRequest.commentCount) {
-    log("checkIntegrationActions", "CommentCountChanged", {
-      new: request.commentCount,
-      old: prevRequest.commentCount,
-    });
-    await onCommentAdded(request);
-  }
-
-  if ((request.Notes ?? []).length > (prevRequest.Notes ?? []).length) {
-    log("checkIntegrationActions", "NotesAdded", {
-      new: (request.Notes ?? []).length,
-      old: (prevRequest.Notes ?? []).length,
-    });
-    await onNotesAdded(request);
-  }
+	if ((request.ExtCreateRetry ?? 0) > (prevRequest.ExtCreateRetry ?? 0)) {
+		log("checkIntegrationActions", "Retrying", true);
+		await pushRequestToIntegration(request);
+	}
+
+	if (request.status !== prevRequest.status) {
+		log("checkIntegrationActions", "StatusChanaged", {
+			new: request.status,
+			old: prevRequest.status,
+		});
+		await onStatusChanged(request);
+	}
+
+	if (request.commentCount > prevRequest.commentCount) {
+		log("checkIntegrationActions", "CommentCountChanged", {
+			new: request.commentCount,
+			old: prevRequest.commentCount,
+		});
+		await onCommentAdded(request);
+	}
+
+	if ((request.Notes ?? []).length > (prevRequest.Notes ?? []).length) {
+		log("checkIntegrationActions", "NotesAdded", {
+			new: (request.Notes ?? []).length,
+			old: (prevRequest.Notes ?? []).length,
+		});
+		await onNotesAdded(request);
+	}
 };
 
 const checkAutomatedActions = async (request, prevRequest) => {
-  if (request.status !== prevRequest.status) {
-    log("checkAutomatedActions", "StatusChanaged", {
-      new: request.status,
-      old: prevRequest.status,
-    });
-    await triggerAutomatedAction(
-      request.site,
-      values.triggerMaintenanceStatusChanged,
-      {
-        JobNumber: request.jobNo,
-        status: request.status,
-      }
-    );
-  }
+	if (request.status !== prevRequest.status) {
+		log("checkAutomatedActions", "StatusChanaged", {
+			new: request.status,
+			old: prevRequest.status,
+		});
+		await triggerAutomatedAction(
+			request.site,
+			values.triggerMaintenanceStatusChanged,
+			{
+				JobNumber: request.jobNo,
+				status: request.status,
+			},
+		);
+	}
 };
 
+module.exports.checkIntegrationActions = checkIntegrationActions;
+
 module.exports.jobChanged = (event, context, callback) => {
-  init(config);
-
-  event.Records.forEach((record) => {
-    let site;
-    if (record.eventName == "INSERT") {
-      console.log("INSERT");
-      const data = marshaller.unmarshallItem(record.dynamodb.NewImage);
-      console.log("Record: ", JSON.stringify(data));
-
-      site = data.site;
-
-      pushRequestToIntegration(data);
-    } else if (record.eventName == "MODIFY") {
-      console.log("MODIFY");
-      const data = marshaller.unmarshallItem(record.dynamodb.NewImage);
-      const previousData = marshaller.unmarshallItem(record.dynamodb.OldImage);
-      console.log("New record: ", JSON.stringify(data));
-      console.log("Old record: ", JSON.stringify(previousData));
-
-      checkIntegrationActions(data, previousData);
-      checkAutomatedActions(data, previousData);
-
-      site = data.site;
-    } else if (record.eventName == "REMOVE") {
-      console.log("REMOVE");
-      const previousData = marshaller.unmarshallItem(record.dynamodb.OldImage);
-      console.log("Old record: ", JSON.stringify(previousData));
-
-      site = previousData.site;
-    }
-    logUpdate(site, values.updateKey);
-  });
+	init(config);
+
+	event.Records.forEach((record) => {
+		let site;
+		if (record.eventName === "INSERT") {
+			console.log("INSERT");
+			const data = marshaller.unmarshallItem(record.dynamodb.NewImage);
+			console.log("Record: ", JSON.stringify(data));
+
+			site = data.site;
+
+			pushRequestToIntegration(data);
+		} else if (record.eventName === "MODIFY") {
+			console.log("MODIFY");
+			const data = marshaller.unmarshallItem(record.dynamodb.NewImage);
+			const previousData = marshaller.unmarshallItem(record.dynamodb.OldImage);
+			console.log("New record: ", JSON.stringify(data));
+			console.log("Old record: ", JSON.stringify(previousData));
+
+			checkIntegrationActions(data, previousData);
+			checkAutomatedActions(data, previousData);
+
+			site = data.site;
+		} else if (record.eventName === "REMOVE") {
+			console.log("REMOVE");
+			const previousData = marshaller.unmarshallItem(record.dynamodb.OldImage);
+			console.log("Old record: ", JSON.stringify(previousData));
+
+			site = previousData.site;
+		}
+		logUpdate(site, values.updateKey);
+	});
 };

package/jobTypesChanged.js

@@ -13,43 +13,56 @@ const notifySiteConfigs = require("@plusscommunities/pluss-core-aws/helper/notif
 const { values } = require("./values.config");
 
 module.exports.jobTypesChanged = async (event, context, callback) => {
-  const logId = log("jobTypesChanged", "Start", { recordCount: event.Records.length, serviceKey: values.serviceKey });
-
-  // Check if this variant supports siteConfigs propagation
-  if (!values.enableSiteConfigsPropagation) {
-    log("jobTypesChanged", "SkipPropagation", { serviceKey: values.serviceKey }, logId);
-    return;
-  }
-
-  const promises = [];
-
-  event.Records.forEach((record) => {
-    log("jobTypesChanged", "Record", { eventName: record.eventName }, logId);
-
-    if (record.eventName === "INSERT") {
-      const data = marshaller.unmarshallItem(record.dynamodb.NewImage);
-      log("jobTypesChanged", "Insert", { id: data.id, site: data.site }, logId);
-
-      if (data.site) {
-        promises.push(notifySiteConfigs(data.site, logId));
-      }
-    } else if (record.eventName === "MODIFY") {
-      const data = marshaller.unmarshallItem(record.dynamodb.NewImage);
-      log("jobTypesChanged", "Modify", { id: data.id, site: data.site }, logId);
-
-      if (data.site) {
-        promises.push(notifySiteConfigs(data.site, logId));
-      }
-    } else if (record.eventName === "REMOVE") {
-      const previousData = marshaller.unmarshallItem(record.dynamodb.OldImage);
-      log("jobTypesChanged", "Remove", { id: previousData.id, site: previousData.site }, logId);
-
-      if (previousData.site) {
-        promises.push(notifySiteConfigs(previousData.site, logId));
-      }
-    }
-  });
-
-  await Promise.all(promises);
-  log("jobTypesChanged", "Complete", { promiseCount: promises.length }, logId);
+	const logId = log("jobTypesChanged", "Start", {
+		recordCount: event.Records.length,
+		serviceKey: values.serviceKey,
+	});
+
+	// Check if this variant supports siteConfigs propagation
+	if (!values.enableSiteConfigsPropagation) {
+		log(
+			"jobTypesChanged",
+			"SkipPropagation",
+			{ serviceKey: values.serviceKey },
+			logId,
+		);
+		return;
+	}
+
+	const promises = [];
+
+	event.Records.forEach((record) => {
+		log("jobTypesChanged", "Record", { eventName: record.eventName }, logId);
+
+		if (record.eventName === "INSERT") {
+			const data = marshaller.unmarshallItem(record.dynamodb.NewImage);
+			log("jobTypesChanged", "Insert", { id: data.id, site: data.site }, logId);
+
+			if (data.site) {
+				promises.push(notifySiteConfigs(data.site, logId));
+			}
+		} else if (record.eventName === "MODIFY") {
+			const data = marshaller.unmarshallItem(record.dynamodb.NewImage);
+			log("jobTypesChanged", "Modify", { id: data.id, site: data.site }, logId);
+
+			if (data.site) {
+				promises.push(notifySiteConfigs(data.site, logId));
+			}
+		} else if (record.eventName === "REMOVE") {
+			const previousData = marshaller.unmarshallItem(record.dynamodb.OldImage);
+			log(
+				"jobTypesChanged",
+				"Remove",
+				{ id: previousData.id, site: previousData.site },
+				logId,
+			);
+
+			if (previousData.site) {
+				promises.push(notifySiteConfigs(previousData.site, logId));
+			}
+		}
+	});
+
+	await Promise.all(promises);
+	log("jobTypesChanged", "Complete", { promiseCount: promises.length }, logId);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws",
-  "version": "2.1.45",
+  "version": "2.1.46",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -24,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "2.0.24-beta.0",
+    "@plusscommunities/pluss-core-aws": "2.0.27",
     "amazon-cognito-identity-js": "^2.0.19",
     "aws-sdk": "^2.1591.0",
     "axios": "^1.6.8",
@@ -61,4 +61,4 @@
       "^./testing/(.*)$": "<rootDir>/testing/$1"
     }
   }
-}
+}

package/requests/assignRequest.js

@@ -10,97 +10,97 @@ const publishNotifications = require("@plusscommunities/pluss-core-aws/db/notifi
 const { values } = require("../values.config");
 
 module.exports = async (event, data) => {
-  const logId = log("assignRequest", "data", data);
-  // check required data
-  const requiredKeys = ["id", "userId"];
-  if (!data || requiredKeys.some((prop) => !data.hasOwnProperty(prop))) {
-    log("assignRequest", "InsufficientInput", 422, logId);
-    return { status: 422, data: { error: "Insufficient input" } };
-  }
+	const logId = log("assignRequest", "data", data);
+	// check required data
+	const requiredKeys = ["id", "userId"];
+	if (!data || requiredKeys.some((prop) => !data.hasOwnProperty(prop))) {
+		log("assignRequest", "InsufficientInput", 422, logId);
+		return { status: 422, data: { error: "Insufficient input" } };
+	}
 
-  const request = await getRef(values.tableNameMaintenance, "id", data.id);
-  log("assignRequest", "request", request, logId);
-  log("assignRequest", "site", request.site, logId);
+	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,
-    values.permissionMaintenanceTracking,
-    request.site
-  );
-  log("assignRequest", "valid", valid, logId);
-  if (!valid) {
-    const validAssignee = await isValidAssignee(
-      event,
-      request.site,
-      request.AssigneeId
-    );
-    log("assignRequest", "validAssignee", validAssignee, logId);
-    if (!validAssignee) {
-      log("assignRequest", "NotAuthorised", 403, logId);
-      return { status: 403, data: { error: "Not authorised" } };
-    }
-  }
+	// validate authorisation
+	const valid = await validateMasterAuth(
+		event,
+		values.permissionMaintenanceTracking,
+		request.site,
+	);
+	log("assignRequest", "valid", valid, logId);
+	if (!valid) {
+		const validAssignee = await isValidAssignee(
+			event,
+			request.site,
+			request.AssigneeId,
+		);
+		log("assignRequest", "validAssignee", validAssignee, logId);
+		if (!validAssignee) {
+			log("assignRequest", "NotAuthorised", 403, logId);
+			return { status: 403, data: { error: "Not authorised" } };
+		}
+	}
 
-  const user = await getUserPreviewFromReq(event);
-  log("assignRequest", "user", user, logId);
-  const assignedUser = await getUserPreview(data.userId);
-  log("assignRequest", "assignedUser", assignedUser, logId);
+	const user = await getUserPreviewFromReq(event);
+	log("assignRequest", "user", user, logId);
+	const assignedUser = await getUserPreview(data.userId);
+	log("assignRequest", "assignedUser", assignedUser, logId);
 
-  const changes = {
-    history: request.history || [],
-  };
+	const changes = {
+		history: request.history || [],
+	};
 
-  // Update history
-  changes.history.push({
-    timestamp: moment.utc().valueOf(),
-    EntryType: "assignment",
-    user,
-    assignedUser,
-  });
+	// Update history
+	changes.history.push({
+		timestamp: moment.utc().valueOf(),
+		EntryType: "assignment",
+		user,
+		assignedUser,
+	});
 
-  changes.AssigneeId = data.userId;
-  changes.Assignee = assignedUser;
+	changes.AssigneeId = data.userId;
+	changes.Assignee = assignedUser;
 
-  log("assignRequest", "changes", changes, logId);
+	log("assignRequest", "changes", changes, logId);
 
-  const result = await editRef(
-    values.tableNameMaintenance,
-    "id",
-    data.id,
-    changes
-  );
+	const result = await editRef(
+		values.tableNameMaintenance,
+		"id",
+		data.id,
+		changes,
+	);
 
-  log("assignRequest", "result", result, logId);
+	log("assignRequest", "result", result, logId);
 
-  // send notification to assigned user
-  if (user.id !== assignedUser.id) {
-    await publishNotifications(
-      [assignedUser.id],
-      values.notificationMaintenanceJobAssigned,
-      result.site,
-      result.id,
-      result,
-      true
-    );
-  }
+	// send notification to assigned user
+	if (user.id !== assignedUser.id) {
+		await publishNotifications(
+			[assignedUser.id],
+			values.notificationMaintenanceJobAssigned,
+			result.site,
+			result.id,
+			result,
+			true,
+		);
+	}
 
-  // send notification to previous assignee
-  if (request.AssigneeId && result.AssigneeId !== request.AssigneeId) {
-    await publishNotifications(
-      [request.AssigneeId],
-      values.notificationMaintenanceJobUnassigned,
-      result.site,
-      result.id,
-      result,
-      true
-    );
-  }
+	// send notification to previous assignee
+	if (request.AssigneeId && result.AssigneeId !== request.AssigneeId) {
+		await publishNotifications(
+			[request.AssigneeId],
+			values.notificationMaintenanceJobUnassigned,
+			result.site,
+			result.id,
+			result,
+			true,
+		);
+	}
 
-  return {
-    status: 200,
-    data: {
-      job: result,
-    },
-  };
+	return {
+		status: 200,
+		data: {
+			job: result,
+		},
+	};
 };

package/requests/getAssignees.js

@@ -5,36 +5,36 @@ const { values } = require("../values.config");
 
 // Define the new function to get assignees
 module.exports = async (event) => {
-  const qParams = event.queryStringParameters || {};
-  const logId = log("getAssignees", "Input", qParams);
+	const qParams = event.queryStringParameters || {};
+	const logId = log("getAssignees", "Input", qParams);
 
-  const isAdmin = await validateMasterAuth(
-    event,
-    values.permissionMaintenanceTracking,
-    qParams.site
-  );
-  const isAssignee = await validateMasterAuth(
-    event,
-    values.permissionMaintenanceAssignment,
-    qParams.site
-  );
+	const isAdmin = await validateMasterAuth(
+		event,
+		values.permissionMaintenanceTracking,
+		qParams.site,
+	);
+	const isAssignee = await validateMasterAuth(
+		event,
+		values.permissionMaintenanceAssignment,
+		qParams.site,
+	);
 
-  const valid = isAdmin || isAssignee;
-  log("getRequests", "valid", valid, logId);
-  if (!valid) {
-    return { status: 403, data: { error: "Not authorised" } };
-  }
+	const valid = isAdmin || isAssignee;
+	log("getRequests", "valid", valid, logId);
+	if (!valid) {
+		return { status: 403, data: { error: "Not authorised" } };
+	}
 
-  // get assignees
-  const assignees = await getUsersByPermission(qParams.site, [
-    values.permissionMaintenanceTracking,
-    values.permissionMaintenanceAssignment,
-  ]);
+	// get assignees
+	const assignees = await getUsersByPermission(qParams.site, [
+		values.permissionMaintenanceTracking,
+		values.permissionMaintenanceAssignment,
+	]);
 
-  log("getAssignees", "AssigneesLength", assignees.length, logId);
+	log("getAssignees", "AssigneesLength", assignees.length, logId);
 
-  // compile results
-  const results = { Users: assignees };
-  log("getAssignees", "Done", true, logId);
-  return { status: 200, data: results };
+	// compile results
+	const results = { Users: assignees };
+	log("getAssignees", "Done", true, logId);
+	return { status: 200, data: results };
 };