@plusscommunities/pluss-maintenance-aws 2.1.44 → 2.1.46

package/getJob.js

@@ -5,10 +5,10 @@ const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/ge
 const getRequest = require("./requests/getRequest");
 
 module.exports.getJob = async (event, context, callback) => {
-  init(config);
-  const data = getBody(event);
+	init(config);
+	const data = getBody(event);
 
-  const result = await getRequest(event, data);
+	const result = await getRequest(event, data);
 
-  return callback(null, generateJsonResponse(result.status, result.data));
+	return callback(null, generateJsonResponse(result.status, result.data));
 };

package/getJobType.js

@@ -7,41 +7,41 @@ const validateSiteAccess = require("@plusscommunities/pluss-core-aws/helper/auth
 const { values } = require("./values.config");
 
 module.exports.getJobType = (event, context, callback) => {
-  init(config);
-  const data = getBody(event);
+	init(config);
+	const data = getBody(event);
 
-  if (!data.site || !data.typeId) {
-    return callback(
-      null,
-      generateJsonResponse(422, {
-        error: { message: "User Types fetch -- no site or type id detected." },
-      })
-    );
-  }
+	if (!data.site || !data.typeId) {
+		return callback(
+			null,
+			generateJsonResponse(422, {
+				error: { message: "User Types fetch -- no site or type id detected." },
+			}),
+		);
+	}
 
-  validateSiteAccess(event, data.site)
-    .then((authorised) => {
-      if (!authorised) {
-        return callback(
-          null,
-          generateJsonResponse(422, { fail: true, error: "not authorised" })
-        );
-      }
-      getRef(values.tableNameJobTypes, "id", data.typeId)
-        .then((gweg) => {
-          return callback(null, generateJsonResponse(200, gweg));
-        })
-        .catch((error) => {
-          return callback(
-            null,
-            generateJsonResponse(200, {
-              userFetchFail: true,
-              message: "Fail on user query. Please try again.",
-            })
-          );
-        });
-    })
-    .catch((error) => {
-      callback(null, generateJsonResponse(422, { fail: true, error }));
-    });
+	validateSiteAccess(event, data.site)
+		.then((authorised) => {
+			if (!authorised) {
+				return callback(
+					null,
+					generateJsonResponse(422, { fail: true, error: "not authorised" }),
+				);
+			}
+			getRef(values.tableNameJobTypes, "id", data.typeId)
+				.then((gweg) => {
+					return callback(null, generateJsonResponse(200, gweg));
+				})
+				.catch((error) => {
+					return callback(
+						null,
+						generateJsonResponse(200, {
+							userFetchFail: true,
+							message: "Fail on user query. Please try again.",
+						}),
+					);
+				});
+		})
+		.catch((error) => {
+			callback(null, generateJsonResponse(422, { fail: true, error }));
+		});
 };

package/getJobTypes.js

@@ -10,76 +10,76 @@ const createGuid = require("@plusscommunities/pluss-core-aws/helper/createGuid")
 const { values } = require("./values.config");
 
 module.exports.getJobTypes = (event, context, callback) => {
-  init(config);
-  const data = getBody(event);
+	init(config);
+	const data = getBody(event);
 
-  if (!data.site) {
-    return callback(
-      null,
-      generateJsonResponse(422, {
-        error: { message: "User Types fetch -- no site detected." },
-      })
-    );
-  }
-  validateSiteAccess(event, data.site)
-    .then((authorised) => {
-      if (!authorised) {
-        return callback(
-          null,
-          generateJsonResponse(422, { fail: true, error: "not authorised" })
-        );
-      }
+	if (!data.site) {
+		return callback(
+			null,
+			generateJsonResponse(422, {
+				error: { message: "User Types fetch -- no site detected." },
+			}),
+		);
+	}
+	validateSiteAccess(event, data.site)
+		.then((authorised) => {
+			if (!authorised) {
+				return callback(
+					null,
+					generateJsonResponse(422, { fail: true, error: "not authorised" }),
+				);
+			}
 
-      const query = {
-        IndexName: "JobTypeSiteIndex",
-        KeyConditionExpression: "site = :site",
-        ExpressionAttributeValues: {
-          ":site": data.site,
-        },
-      };
+			const query = {
+				IndexName: "JobTypeSiteIndex",
+				KeyConditionExpression: "site = :site",
+				ExpressionAttributeValues: {
+					":site": data.site,
+				},
+			};
 
-      indexQuery(values.tableNameJobTypes, query)
-        .then(async (typeRes) => {
-          if (!_.isEmpty(typeRes.Items)) {
-            return callback(null, generateJsonResponse(200, typeRes.Items));
-          }
+			indexQuery(values.tableNameJobTypes, query)
+				.then(async (typeRes) => {
+					if (!_.isEmpty(typeRes.Items)) {
+						return callback(null, generateJsonResponse(200, typeRes.Items));
+					}
 
-          const defaultJobTypes = [];
-          if (values.allowGeneralType) {
-            const generalType = {
-              id: createGuid().substring(0, 8),
-              typeName: "General",
-              site: data.site,
-            };
+					const defaultJobTypes = [];
+					if (values.allowGeneralType) {
+						const generalType = {
+							id: createGuid().substring(0, 8),
+							typeName: "General",
+							site: data.site,
+						};
 
-            await updateRef(values.tableNameJobTypes, generalType);
-            defaultJobTypes.push(generalType);
-          }
-          if (values.defaultJobTypes?.length) {
-            for await (const jobType of values.defaultJobTypes) {
-              const defaultType = {
-                ...jobType,
-                id: createGuid().substring(0, 8),
-                site: data.site,
-              };
-              await updateRef(values.tableNameJobTypes, defaultType);
-              defaultJobTypes.push(defaultType);
-            }
-          }
+						await updateRef(values.tableNameJobTypes, generalType);
+						defaultJobTypes.push(generalType);
+					}
+					if (values.defaultJobTypes?.length) {
+						for await (const jobType of values.defaultJobTypes) {
+							const defaultType = {
+								...jobType,
+								id: createGuid().substring(0, 8),
+								site: data.site,
+							};
+							await updateRef(values.tableNameJobTypes, defaultType);
+							defaultJobTypes.push(defaultType);
+						}
+					}
 
-          return callback(null, generateJsonResponse(200, defaultJobTypes));
-        })
-        .catch((error) => {
-          return callback(
-            null,
-            generateJsonResponse(200, {
-              userFetchFail: true,
-              message: "Fail on user query. Please try again.",
-            })
-          );
-        });
-    })
-    .catch((error) => {
-      callback(null, generateJsonResponse(422, { fail: true, error }));
-    });
+					return callback(null, generateJsonResponse(200, defaultJobTypes));
+				})
+				.catch((error) => {
+					return callback(
+						null,
+						generateJsonResponse(200, {
+							userFetchFail: true,
+							message: "Fail on user query. Please try again.",
+						}),
+					);
+				});
+		})
+		.catch((error) => {
+			callback(null, generateJsonResponse(422, { fail: true, error }));
+		});
 };

package/getJobs.js

@@ -8,56 +8,56 @@ const getSessionUser = require("@plusscommunities/pluss-core-aws/helper/auth/get
 const { values } = require("./values.config");
 
 module.exports.getJobs = async (event, context, callback) => {
-  init(config);
-  const data = getBody(event);
+	init(config);
+	const data = getBody(event);
 
-  if (!data.site) {
-    return callback(
-      null,
-      generateJsonResponse(422, {
-        error: { message: "User Types fetch -- no site detected." },
-      })
-    );
-  }
+	if (!data.site) {
+		return callback(
+			null,
+			generateJsonResponse(422, {
+				error: { message: "User Types fetch -- no site detected." },
+			}),
+		);
+	}
 
-  try {
-    const authorised = await validateMasterAuth(
-      event,
-      values.permissionMaintenanceTracking
-    );
-    const userId = authorised
-      ? null
-      : await getSessionUser(event.headers.authkey);
-    console.log("getting jobs for user", userId);
+	try {
+		const authorised = await validateMasterAuth(
+			event,
+			values.permissionMaintenanceTracking,
+		);
+		const userId = authorised
+			? null
+			: await getSessionUser(event.headers.authkey);
+		console.log("getting jobs for user", userId);
 
-    const query = {
-      IndexName: "MaintenanceSiteIndex",
-      KeyConditionExpression: "site = :site",
-      ExpressionAttributeValues: {
-        ":site": data.site,
-      },
-    };
+		const query = {
+			IndexName: "MaintenanceSiteIndex",
+			KeyConditionExpression: "site = :site",
+			ExpressionAttributeValues: {
+				":site": data.site,
+			},
+		};
 
-    try {
-      const res = await indexQuery(values.tableNameMaintenance, query);
-      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 count", jobs?.length);
-      return callback(null, generateJsonResponse(200, jobs));
-    } catch (error1) {
-      return callback(
-        null,
-        generateJsonResponse(200, {
-          userFetchFail: true,
-          message: "Fail on user query. Please try again.",
-        })
-      );
-    }
-  } catch (error) {
-    callback(null, generateJsonResponse(422, { fail: true, error }));
-  }
+		try {
+			const res = await indexQuery(values.tableNameMaintenance, query);
+			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 count", jobs?.length);
+			return callback(null, generateJsonResponse(200, jobs));
+		} catch (error1) {
+			return callback(
+				null,
+				generateJsonResponse(200, {
+					userFetchFail: true,
+					message: "Fail on user query. Please try again.",
+				}),
+			);
+		}
+	} catch (error) {
+		callback(null, generateJsonResponse(422, { fail: true, error }));
+	}
 };

package/integration/IntegrationStrategy.js

@@ -1,56 +1,56 @@
 class IntegrationStrategy {
-  getEntityType = () => {
-    return "maintenance_null";
-  };
-
-  isValidIntegration = () => {
-    return false;
-  };
-
-  getRefreshInterval = () => {
-    return 15 * 60 * 1000; // 15 minutes
-  };
-
-  // creates a request on the integrated system
-  createRequest = async (request) => {
-    return null;
-  };
-
-  // gets a request from the integrated system
-  getRequest = async (requestId) => {
-    return null;
-  };
-
-  // refreshed a request from the integrated system
-  refreshFromSource = async (requestId) => {
-    return null;
-  };
-
-  // actions taken when a request's status has changed
-  onStatusChanged = async (request) => {
-    return null;
-  };
-
-  // actions taken when a comment has been added to a request
-  onCommentAdded = async (request) => {
-    return null;
-  };
-
-  // actions taken when a note has been added to a request
-  onNotesAdded = async (request) => {
-    return null;
-  };
-
-  // actions taken when a request is marked as completed
-  onCompleteRequest = async (request) => {
-    return null;
-  };
-
-  // TODO: Remove once all existing records have ActiveEntityType (PC-1382)
-  // backfills ActiveEntityType on existing externalentities records for the sparse GSI migration
-  backfillActiveEntityType = async (timeout) => {
-    return { backfillCount: 0, complete: true };
-  };
+	getEntityType = () => {
+		return "maintenance_null";
+	};
+
+	isValidIntegration = () => {
+		return false;
+	};
+
+	getRefreshInterval = () => {
+		return 15 * 60 * 1000; // 15 minutes
+	};
+
+	// creates a request on the integrated system
+	createRequest = async (request) => {
+		return null;
+	};
+
+	// gets a request from the integrated system
+	getRequest = async (requestId) => {
+		return null;
+	};
+
+	// refreshed a request from the integrated system
+	refreshFromSource = async (requestId) => {
+		return null;
+	};
+
+	// actions taken when a request's status has changed
+	onStatusChanged = async (request) => {
+		return null;
+	};
+
+	// actions taken when a comment has been added to a request
+	onCommentAdded = async (request) => {
+		return null;
+	};
+
+	// actions taken when a note has been added to a request
+	onNotesAdded = async (request) => {
+		return null;
+	};
+
+	// actions taken when a request is marked as completed
+	onCompleteRequest = async (request) => {
+		return null;
+	};
+
+	// TODO: Remove once all existing records have ActiveEntityType (PC-1382)
+	// backfills ActiveEntityType on existing externalentities records for the sparse GSI migration
+	backfillActiveEntityType = async (timeout) => {
+		return { backfillCount: 0, complete: true };
+	};
 }
 
 module.exports = IntegrationStrategy;

package/integration/archibus/ArchibusStrategy.js

@@ -62,6 +62,33 @@ class ArchibusStrategy extends IntegrationStrategy {
 	 * @param {Object} mockResponse - Mock response from Archibus to simulate response
 	 * @returns {Boolean} Whether the request was created on Archibus
 	 */
+	recordCreateFailure = async (request, logId, reason) => {
+		try {
+			const failedJob = await getRef(
+				values.tableNameMaintenance,
+				"id",
+				request.id,
+			);
+			if (!failedJob.history) failedJob.history = [];
+			failedJob.history.push({
+				timestamp: moment.utc().valueOf(),
+				EntryType: "ExternalIDSetFailed",
+				reason,
+				user: {
+					displayName: "Archibus Integration",
+					id: "system",
+				},
+				systemType: "Archibus",
+			});
+
+			await editRef(values.tableNameMaintenance, "id", request.id, {
+				history: failedJob.history,
+			});
+		} catch (historyError) {
+			log("Archibus:CreateRequest", "HistoryError", historyError, logId);
+		}
+	};
+
 	createRequest = async (request, mockResponse = null) => {
 		const logId = log("Archibus:CreateRequest", "Start", request);
 
@@ -84,7 +111,16 @@ class ArchibusStrategy extends IntegrationStrategy {
 			if (building?.SiteCode) siteId = building.SiteCode.toString();
 			buildingCode = building?.BuildingCode;
 		}
-		if (!siteId) return false;
+		if (!siteId) {
+			log(
+				"Archibus:CreateRequest",
+				"MissingSiteId",
+				{ site: request.site, room: request.room },
+				logId,
+			);
+			await this.recordCreateFailure(request, logId, "Missing site_id mapping");
+			return false;
+		}
 
 		try {
 			const data = {
@@ -111,7 +147,7 @@ class ArchibusStrategy extends IntegrationStrategy {
 				(await axios({
 					method: "PUT",
 					url: `${this.baseUrl}/createWorkRequest`,
-					timeout: 30000,
+					timeout: 120000,
 					headers: {
 						[this.apiKeyHeader]: this.apiKey,
 						"Content-Type": "application/json",
@@ -171,29 +207,7 @@ class ArchibusStrategy extends IntegrationStrategy {
 			log("Archibus:CreateRequest", "Error", e, logId);
 
 			// Add history entry for failed integration
-			try {
-				const failedJob = await getRef(
-					values.tableNameMaintenance,
-					"id",
-					request.id,
-				);
-				if (!failedJob.history) failedJob.history = [];
-				failedJob.history.push({
-					timestamp: moment.utc().valueOf(),
-					EntryType: "ExternalIDSetFailed",
-					user: {
-						displayName: "Archibus Integration",
-						id: "system",
-					},
-					systemType: "Archibus",
-				});
-
-				await editRef(values.tableNameMaintenance, "id", request.id, {
-					history: failedJob.history,
-				});
-			} catch (historyError) {
-				log("Archibus:CreateRequest", "HistoryError", historyError, logId);
-			}
+			await this.recordCreateFailure(request, logId, e.message);
 		}
 		return false;
 	};
@@ -210,7 +224,7 @@ class ArchibusStrategy extends IntegrationStrategy {
 			const response = await axios({
 				method: "GET",
 				url: `${this.baseUrl}/getWorkRequest/${externalId}`,
-				timeout: 30000,
+				timeout: 120000,
 				headers: {
 					[this.apiKeyHeader]: this.apiKey,
 					"Content-Type": "application/json",
@@ -386,7 +400,7 @@ class ArchibusStrategy extends IntegrationStrategy {
 				method: "POST",
 				url: `${this.baseUrl}/addCommentsToWRSteps`,
 				data: postData,
-				timeout: 30000,
+				timeout: 120000,
 				headers: {
 					[this.apiKeyHeader]: this.apiKey,
 					"Content-Type": "application/json",
@@ -455,7 +469,7 @@ class ArchibusStrategy extends IntegrationStrategy {
 				method: "POST",
 				url: `${this.baseUrl}/addDocumentToWorkRequest`,
 				data: postData,
-				timeout: 60000,
+				timeout: 120000,
 				headers: {
 					[this.apiKeyHeader]: this.apiKey,
 					"Content-Type": "application/json",

package/integration/index.js

@@ -6,25 +6,25 @@ const IntegrationStrategy = require("./IntegrationStrategy");
 const { values } = require("../values.config");
 
 exports.getStrategy = async (site) => {
-  let importConfig;
-  const logId = log("getStrategy", "Site", site);
-  try {
-    importConfig = await getString(
-      getRowId(site, `${values.serviceKey}integration`),
-      "plussSpace"
-    );
+	let importConfig;
+	const logId = log("getStrategy", "Site", site);
+	try {
+		importConfig = await getString(
+			getRowId(site, `${values.serviceKey}integration`),
+			"plussSpace",
+		);
 
-    switch (importConfig.Strategy) {
-      case "Archibus":
-        return new ArchibusStrategy(importConfig);
-      case "SeeStuff":
-        return new SeeStuffStrategy(importConfig);
-      default:
-        return new IntegrationStrategy();
-    }
-  } catch (e) {
-    log("getStrategy", "Error", e, logId);
-  }
+		switch (importConfig.Strategy) {
+			case "Archibus":
+				return new ArchibusStrategy(importConfig);
+			case "SeeStuff":
+				return new SeeStuffStrategy(importConfig);
+			default:
+				return new IntegrationStrategy();
+		}
+	} catch (e) {
+		log("getStrategy", "Error", e, logId);
+	}
 
-  return new IntegrationStrategy();
+	return new IntegrationStrategy();
 };