@plusscommunities/pluss-maintenance-aws 2.1.45 → 2.1.46

package/requests/retrySync.js

@@ -20,30 +20,30 @@ const { getStrategy } = require("../integration");
  * @returns {Promise<boolean>} True if the job has already been synced
  */
 const isAlreadySynced = async (job, logId) => {
-  const history = job.history || [];
-  const hasSuccessfulSync = history.some(
-    (entry) => entry.EntryType === "ExternalIDSet"
-  );
+	const history = job.history || [];
+	const hasSuccessfulSync = history.some(
+		(entry) => entry.EntryType === "ExternalIDSet",
+	);
 
-  if (hasSuccessfulSync) {
-    log("isAlreadySynced", "FoundInHistory", true, logId);
-    return true;
-  }
+	if (hasSuccessfulSync) {
+		log("isAlreadySynced", "FoundInHistory", true, logId);
+		return true;
+	}
 
-  try {
-    const integrationStrategy = await getStrategy(job.site);
-    if (integrationStrategy.getExternalId) {
-      const externalId = await integrationStrategy.getExternalId(job);
-      if (externalId) {
-        log("isAlreadySynced", "FoundViaStrategy", externalId, logId);
-        return true;
-      }
-    }
-  } catch (error) {
-    log("isAlreadySynced", "StrategyCheckError", error.message, logId);
-  }
+	try {
+		const integrationStrategy = await getStrategy(job.site);
+		if (integrationStrategy.getExternalId) {
+			const externalId = await integrationStrategy.getExternalId(job);
+			if (externalId) {
+				log("isAlreadySynced", "FoundViaStrategy", externalId, logId);
+				return true;
+			}
+		}
+	} catch (error) {
+		log("isAlreadySynced", "StrategyCheckError", error.message, logId);
+	}
 
-  return false;
+	return false;
 };
 
 /**
@@ -80,82 +80,82 @@ const isAlreadySynced = async (job, logId) => {
  * // 500 - Internal error
  */
 module.exports = async (event, data) => {
-  const action = "retrySync";
-  const logId = log(action, "Input", data);
+	const action = "retrySync";
+	const logId = log(action, "Input", data);
 
-  try {
-    // Validate required fields
-    if (!data.id) {
-      return {
-        status: 422,
-        data: { error: "Missing required field: id" },
-      };
-    }
+	try {
+		// Validate required fields
+		if (!data.id) {
+			return {
+				status: 422,
+				data: { error: "Missing required field: id" },
+			};
+		}
 
-    // Fetch the job record
-    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" } };
-    }
+		// Fetch the job record
+		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" } };
-    }
+		if (!job) {
+			log(action, "JobNotFound", { id: data.id }, logId);
+			return { status: 404, data: { error: "Job not found" } };
+		}
 
-    // Validate user has permission to manage maintenance for this site
-    const authorised = await validateMasterAuth(
-      event,
-      values.permissionMaintenanceTracking,
-      job.site
-    );
+		// Validate user has permission to manage maintenance for this 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" } };
-    }
+		if (!authorised) {
+			log(action, "NotAuthorised", { site: job.site }, logId);
+			return { status: 403, data: { error: "Not authorised" } };
+		}
 
-    // Prevent duplicate syncs - check if already synced via history or external entity
-    const alreadySynced = await isAlreadySynced(job, logId);
-    if (alreadySynced) {
-      log(action, "AlreadySynced", { id: job.id }, logId);
-      return {
-        status: 400,
-        data: { error: "Job already synced to external system" },
-      };
-    }
+		// Prevent duplicate syncs - check if already synced via history or external entity
+		const alreadySynced = await isAlreadySynced(job, logId);
+		if (alreadySynced) {
+			log(action, "AlreadySynced", { id: job.id }, logId);
+			return {
+				status: 400,
+				data: { error: "Job already synced to external system" },
+			};
+		}
 
-    // Set ExtCreateRetry to a new timestamp value.
-    // The jobChanged stream handler detects this field change and
-    // triggers pushRequestToIntegration() to retry the external sync.
-    const retryTimestamp = moment.utc().valueOf();
-    const updatedJob = await editRef(
-      values.tableNameMaintenance,
-      "id",
-      job.id,
-      {
-        ExtCreateRetry: retryTimestamp,
-      }
-    );
+		// Set ExtCreateRetry to a new timestamp value.
+		// The jobChanged stream handler detects this field change and
+		// triggers pushRequestToIntegration() to retry the external sync.
+		const retryTimestamp = moment.utc().valueOf();
+		const updatedJob = await editRef(
+			values.tableNameMaintenance,
+			"id",
+			job.id,
+			{
+				ExtCreateRetry: retryTimestamp,
+			},
+		);
 
-    log(action, "RetryTriggered", { ExtCreateRetry: retryTimestamp }, logId);
+		log(action, "RetryTriggered", { ExtCreateRetry: retryTimestamp }, logId);
 
-    return {
-      status: 200,
-      data: {
-        success: true,
-        message: "Sync retry initiated. Check back shortly for results.",
-        job: updatedJob,
-      },
-    };
-  } catch (error) {
-    log(action, "InternalError", error, logId);
-    return {
-      status: 500,
-      data: { error: "Internal error", message: error.message },
-    };
-  }
+		return {
+			status: 200,
+			data: {
+				success: true,
+				message: "Sync retry initiated. Check back shortly for results.",
+				job: updatedJob,
+			},
+		};
+	} catch (error) {
+		log(action, "InternalError", error, logId);
+		return {
+			status: 500,
+			data: { error: "Internal error", message: error.message },
+		};
+	}
 };

package/requests/setExternalJobId.js

@@ -8,117 +8,117 @@ 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,
-      ActiveEntityType: entityType,
-      InternalId: job.id,
-      ExternalId: data.externalId,
-      LastUpdated: moment().valueOf(),
-      TrackedData: data.trackedData || {},
-      Site: job.site, // Store for site-specific queries
-      SystemType: data.systemType,
-    });
-
-    log(action, "ExternalEntityCreated", externalEntity, logId);
-
-    // 7. Add history entry
-    if (!job.history) job.history = [];
-    job.history.push({
-      timestamp: moment.utc().valueOf(),
-      EntryType: "ExternalIDSet",
-      externalId: data.externalId,
-      user,
-      systemType: data.systemType,
-    });
-
-    // 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 },
-    };
-  }
+	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,
+			ActiveEntityType: entityType,
+			InternalId: job.id,
+			ExternalId: data.externalId,
+			LastUpdated: moment().valueOf(),
+			TrackedData: data.trackedData || {},
+			Site: job.site, // Store for site-specific queries
+			SystemType: data.systemType,
+		});
+
+		log(action, "ExternalEntityCreated", externalEntity, logId);
+
+		// 7. Add history entry
+		if (!job.history) job.history = [];
+		job.history.push({
+			timestamp: moment.utc().valueOf(),
+			EntryType: "ExternalIDSet",
+			externalId: data.externalId,
+			user,
+			systemType: data.systemType,
+		});
+
+		// 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/requests/updatePriority.js

@@ -6,41 +6,41 @@ const { log } = require("@plusscommunities/pluss-core-aws/helper");
 const { values } = require("../values.config");
 
 module.exports = async (event, data) => {
-  const logId = log("updatePriority", "data", data);
-  // check required data
-  const requiredKeys = ["id", "priority"];
-  if (!data || requiredKeys.some((prop) => !data.hasOwnProperty(prop))) {
-    log("updatePriority", "InsufficientInput", 422, logId);
-    return { status: 422, data: { error: "Insufficient input" } };
-  }
+	const logId = log("updatePriority", "data", data);
+	// check required data
+	const requiredKeys = ["id", "priority"];
+	if (!data || requiredKeys.some((prop) => !data.hasOwnProperty(prop))) {
+		log("updatePriority", "InsufficientInput", 422, logId);
+		return { status: 422, data: { error: "Insufficient input" } };
+	}
 
-  const job = await getRef(values.tableNameMaintenance, "id", data.id);
-  log("updatePriority", "job", job, logId);
-  log("updatePriority", "site", job.site, logId);
+	const job = await getRef(values.tableNameMaintenance, "id", data.id);
+	log("updatePriority", "job", job, logId);
+	log("updatePriority", "site", job.site, logId);
 
-  // validate authorisation
-  const valid = await validateMasterAuth(
-    event,
-    values.permissionMaintenanceTracking,
-    job.site
-  );
-  log("updatePriority", "valid", valid, logId);
-  if (!valid) {
-    const validAssignee = await isValidAssignee(
-      event,
-      job.site,
-      job.AssigneeId
-    );
-    log("updatePriority", "validAssignee", validAssignee, logId);
-    if (!validAssignee) {
-      log("updatePriority", "NotAuthorised", 403, logId);
-      return { status: 403, data: { error: "Not authorised" } };
-    }
-  }
+	// validate authorisation
+	const valid = await validateMasterAuth(
+		event,
+		values.permissionMaintenanceTracking,
+		job.site,
+	);
+	log("updatePriority", "valid", valid, logId);
+	if (!valid) {
+		const validAssignee = await isValidAssignee(
+			event,
+			job.site,
+			job.AssigneeId,
+		);
+		log("updatePriority", "validAssignee", validAssignee, logId);
+		if (!validAssignee) {
+			log("updatePriority", "NotAuthorised", 403, logId);
+			return { status: 403, data: { error: "Not authorised" } };
+		}
+	}
 
-  job.priority = data.priority;
-  const result = await editMaintenanceJob(job);
+	job.priority = data.priority;
+	const result = await editMaintenanceJob(job);
 
-  log("updatePriority", "result", result, logId);
-  return { status: 200, data: { job: result } };
+	log("updatePriority", "result", result, logId);
+	return { status: 200, data: { job: result } };
 };

package/scheduleJobImport.js

@@ -5,83 +5,83 @@ const { getStrategy } = require("./integration");
 const { log } = require("@plusscommunities/pluss-core-aws/helper");
 
 const processSingle = async (strategy, item) => {
-  // use IDs to refresh request data
-  const logId = log("processSingle", "RefreshFromSource", item.ExternalId);
+	// use IDs to refresh request data
+	const logId = log("processSingle", "RefreshFromSource", item.ExternalId);
 
-  // refresh from external source
-  await strategy.refreshFromSource(
-    item.InternalId,
-    item.ExternalId,
-    item.TrackedData
-  );
+	// refresh from external source
+	await strategy.refreshFromSource(
+		item.InternalId,
+		item.ExternalId,
+		item.TrackedData,
+	);
 
-  // save updated timestamp
-  await editRef("externalentities", "RowId", item.RowId, {
-    LastUpdated: moment().valueOf(),
-  });
+	// save updated timestamp
+	await editRef("externalentities", "RowId", item.RowId, {
+		LastUpdated: moment().valueOf(),
+	});
 
-  log("processBatch", "Refreshed", item.ExternalId, logId);
-  return true;
+	log("processBatch", "Refreshed", item.ExternalId, logId);
+	return true;
 };
 
 const processBatch = async (strategy, startTime) => {
-  const logId = log("processBatch", "StartTime", moment().valueOf());
+	const logId = log("processBatch", "StartTime", moment().valueOf());
 
-  // use index query to fetch IDs of requests
-  const query = {
-    IndexName: "ActiveEntityTypeIndex",
-    KeyConditionExpression:
-      "ActiveEntityType = :activeEntityType AND LastUpdated < :lastUpdate", // only fetch items that haven't been updated in this scan
-    ExpressionAttributeValues: {
-      ":activeEntityType": strategy.getEntityType(),
-      ":lastUpdate": startTime - strategy.getRefreshInterval(),
-    },
-    Limit: 10,
-    ScanIndexForward: false,
-  };
-  const { Items } = await indexQuery("externalentities", query);
+	// use index query to fetch IDs of requests
+	const query = {
+		IndexName: "ActiveEntityTypeIndex",
+		KeyConditionExpression:
+			"ActiveEntityType = :activeEntityType AND LastUpdated < :lastUpdate", // only fetch items that haven't been updated in this scan
+		ExpressionAttributeValues: {
+			":activeEntityType": strategy.getEntityType(),
+			":lastUpdate": startTime - strategy.getRefreshInterval(),
+		},
+		Limit: 10,
+		ScanIndexForward: false,
+	};
+	const { Items } = await indexQuery("externalentities", query);
 
-  const promises = [];
+	const promises = [];
 
-  Items.forEach((item) => {
-    log("processBatch", "ProcessSingle", JSON.stringify(item), logId);
-    promises.push(processSingle(strategy, JSON.parse(JSON.stringify(item))));
-  });
+	Items.forEach((item) => {
+		log("processBatch", "ProcessSingle", JSON.stringify(item), logId);
+		promises.push(processSingle(strategy, JSON.parse(JSON.stringify(item))));
+	});
 
-  await Promise.all(promises);
-  log("processBatch", "EndOfBatch", Items.length, logId);
-  return Items.length;
+	await Promise.all(promises);
+	log("processBatch", "EndOfBatch", Items.length, logId);
+	return Items.length;
 };
 
 module.exports.scheduleJobImport = async (event, context, callback) => {
-  const logId = log("scheduleJobImport", "Start", true);
-  // get active integration
-  const integrationStrategy = await getStrategy("plussSpace");
-  if (!integrationStrategy.isValidIntegration()) {
-    log("scheduleJobImport", "Exit", "No valid integration", logId);
-    return;
-  }
+	const logId = log("scheduleJobImport", "Start", true);
+	// get active integration
+	const integrationStrategy = await getStrategy("plussSpace");
+	if (!integrationStrategy.isValidIntegration()) {
+		log("scheduleJobImport", "Exit", "No valid integration", logId);
+		return;
+	}
 
-  const startTime = moment().valueOf();
-  const timeout = 3 * 60 * 1000; // 3 minutes
-  let noneToProcess = false;
-  log("scheduleJobImport", "StartTime", startTime, logId);
+	const startTime = moment().valueOf();
+	const timeout = 3 * 60 * 1000; // 3 minutes
+	let noneToProcess = false;
+	log("scheduleJobImport", "StartTime", startTime, logId);
 
-  while (!noneToProcess && moment().valueOf() < startTime + timeout) {
-    const logId = log("scheduleJobImport", "StartLoop", moment().valueOf());
-    const count = await processBatch(integrationStrategy, startTime);
-    log("scheduleJobImport", "Count", count, logId);
-    if (!count) {
-      log("scheduleJobImport", "noneToProcess", true, logId);
-      noneToProcess = true;
-    }
-    log("scheduleJobImport", "EndLoop", moment().valueOf(), logId);
-  }
-  // TODO: Remove this call once all existing records have ActiveEntityType (PC-1382)
-  const remainingTime = (startTime + timeout) - moment().valueOf();
-  if (remainingTime > 0) {
-    await integrationStrategy.backfillActiveEntityType(remainingTime);
-  }
+	while (!noneToProcess && moment().valueOf() < startTime + timeout) {
+		const logId = log("scheduleJobImport", "StartLoop", moment().valueOf());
+		const count = await processBatch(integrationStrategy, startTime);
+		log("scheduleJobImport", "Count", count, logId);
+		if (!count) {
+			log("scheduleJobImport", "noneToProcess", true, logId);
+			noneToProcess = true;
+		}
+		log("scheduleJobImport", "EndLoop", moment().valueOf(), logId);
+	}
+	// TODO: Remove this call once all existing records have ActiveEntityType (PC-1382)
+	const remainingTime = startTime + timeout - moment().valueOf();
+	if (remainingTime > 0) {
+		await integrationStrategy.backfillActiveEntityType(remainingTime);
+	}
 
-  log("scheduleJobImport", "End", moment().valueOf(), logId);
+	log("scheduleJobImport", "End", moment().valueOf(), logId);
 };