@plusscommunities/pluss-maintenance-aws 2.1.45 → 2.1.46

package/db/maintenance/getJobEmail.js

@@ -2,27 +2,27 @@ const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuer
 const { values } = require("../../values.config");
 
 module.exports = (site, typeName) => {
-  return new Promise((resolve, reject) => {
-    const query = {
-      IndexName: "JobTypeSiteIndex",
-      KeyConditionExpression: "site = :site and typeName = :typeName",
-      ExpressionAttributeValues: {
-        ":site": site,
-        ":typeName": typeName,
-      },
-    };
+	return new Promise((resolve, reject) => {
+		const query = {
+			IndexName: "JobTypeSiteIndex",
+			KeyConditionExpression: "site = :site and typeName = :typeName",
+			ExpressionAttributeValues: {
+				":site": site,
+				":typeName": typeName,
+			},
+		};
 
-    console.log("running jobType email query");
-    console.log(query);
-    indexQuery(values.tableNameJobTypes, query)
-      .then((data) => {
-        console.log("successful query");
-        resolve(data.Items[0]);
-      })
-      .catch((error) => {
-        console.log("query failed");
-        console.log(error);
-        reject();
-      });
-  });
+		console.log("running jobType email query");
+		console.log(query);
+		indexQuery(values.tableNameJobTypes, query)
+			.then((data) => {
+				console.log("successful query");
+				resolve(data.Items[0]);
+			})
+			.catch((error) => {
+				console.log("query failed");
+				console.log(error);
+				reject();
+			});
+	});
 };

package/deleteJob.js

@@ -10,65 +10,65 @@ const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/g
 const { values } = require("./values.config");
 
 module.exports.deleteJob = (event, context, callback) => {
-  init(config);
-  const data = getBody(event);
+	init(config);
+	const data = getBody(event);
 
-  if (!data.site || !data.id) {
-    callback(
-      null,
-      generateJsonResponse(422, { error: "No site or id attached" })
-    );
-    return;
-  }
+	if (!data.site || !data.id) {
+		callback(
+			null,
+			generateJsonResponse(422, { error: "No site or id attached" }),
+		);
+		return;
+	}
 
-  validateMasterAuth(event, values.permissionMaintenanceTracking).then(
-    (authorised) => {
-      if (!authorised) {
-        console.error("Authorization not valid");
-        callback(
-          null,
-          generateJsonResponse(403, {
-            error: {
-              message: "Authorization not valid.",
-            },
-          })
-        );
-        return;
-      }
+	validateMasterAuth(event, values.permissionMaintenanceTracking).then(
+		(authorised) => {
+			if (!authorised) {
+				console.error("Authorization not valid");
+				callback(
+					null,
+					generateJsonResponse(403, {
+						error: {
+							message: "Authorization not valid.",
+						},
+					}),
+				);
+				return;
+			}
 
-      getRef(values.tableNameMaintenance, "id", data.id).then((result) => {
-        if (result.site !== data.site) {
-          return callback(
-            null,
-            generateJsonResponse(422, {
-              error: {
-                message: "Incorrect site.",
-              },
-            })
-          );
-        }
-        deleteRef(values.tableNameMaintenance, "id", data.id)
-          .then(() => {
-            getUserPreviewFromReq(event).then((user) => {
-              publishActivity(
-                values.activityDeleteMaintenanceJob,
-                data.site,
-                data.id,
-                user,
-                {
-                  title: result.title,
-                  description: result.description,
-                }
-              );
-            });
-            callback(null, generateJsonResponse(200, { success: true }));
-            return;
-          })
-          .catch((error) => {
-            callback(null, generateJsonResponse(422, { error }));
-            return;
-          });
-      });
-    }
-  );
+			getRef(values.tableNameMaintenance, "id", data.id).then((result) => {
+				if (result.site !== data.site) {
+					return callback(
+						null,
+						generateJsonResponse(422, {
+							error: {
+								message: "Incorrect site.",
+							},
+						}),
+					);
+				}
+				deleteRef(values.tableNameMaintenance, "id", data.id)
+					.then(() => {
+						getUserPreviewFromReq(event).then((user) => {
+							publishActivity(
+								values.activityDeleteMaintenanceJob,
+								data.site,
+								data.id,
+								user,
+								{
+									title: result.title,
+									description: result.description,
+								},
+							);
+						});
+						callback(null, generateJsonResponse(200, { success: true }));
+						return;
+					})
+					.catch((error) => {
+						callback(null, generateJsonResponse(422, { error }));
+						return;
+					});
+			});
+		},
+	);
 };

package/deleteJobType.js

@@ -8,47 +8,47 @@ const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
 const { values } = require("./values.config");
 
 module.exports.deleteJobType = (event, context, callback) => {
-  init(config);
-  const data = getBody(event);
+	init(config);
+	const data = getBody(event);
 
-  if (!data.site || !data.id) {
-    return callback(
-      null,
-      generateJsonResponse(422, { error: "No site or id attached" })
-    );
-  }
+	if (!data.site || !data.id) {
+		return callback(
+			null,
+			generateJsonResponse(422, { error: "No site or id attached" }),
+		);
+	}
 
-  validateMasterAuth(event, values.permissionMaintenanceTypes).then(
-    (authorised) => {
-      if (!authorised) {
-        console.error("Authorization not valid");
-        return callback(
-          null,
-          generateJsonResponse(422, {
-            error: { message: "Admin - Create User - not authorized." },
-          })
-        );
-      }
+	validateMasterAuth(event, values.permissionMaintenanceTypes).then(
+		(authorised) => {
+			if (!authorised) {
+				console.error("Authorization not valid");
+				return callback(
+					null,
+					generateJsonResponse(422, {
+						error: { message: "Admin - Create User - not authorized." },
+					}),
+				);
+			}
 
-      getRef(values.tableNameJobTypes, "id", data.id).then((result) => {
-        if (result.site !== data.site) {
-          return callback(
-            null,
-            generateJsonResponse(422, {
-              error: {
-                message: "Incorrect site.",
-              },
-            })
-          );
-        }
-        deleteRef(values.tableNameJobTypes, "id", data.id)
-          .then(() => {
-            return callback(null, generateJsonResponse(200, { success: true }));
-          })
-          .catch((error) => {
-            return callback(null, generateJsonResponse(422, { error }));
-          });
-      });
-    }
-  );
+			getRef(values.tableNameJobTypes, "id", data.id).then((result) => {
+				if (result.site !== data.site) {
+					return callback(
+						null,
+						generateJsonResponse(422, {
+							error: {
+								message: "Incorrect site.",
+							},
+						}),
+					);
+				}
+				deleteRef(values.tableNameJobTypes, "id", data.id)
+					.then(() => {
+						return callback(null, generateJsonResponse(200, { success: true }));
+					})
+					.catch((error) => {
+						return callback(null, generateJsonResponse(422, { error }));
+					});
+			});
+		},
+	);
 };

package/editJob.js

@@ -1,7 +1,7 @@
 const _ = require("lodash");
 const config = require("./config.json");
 const { init } = require("@plusscommunities/pluss-core-aws/config");
-const { getBody } = require("@plusscommunities/pluss-core-aws/helper");
+const { getBody, log } = require("@plusscommunities/pluss-core-aws/helper");
 const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/generateJsonResponse");
 const sendJobEmail = require("./sendJobEmail");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
@@ -10,74 +10,135 @@ const editMaintenanceJob = require("./db/maintenance/editMaintenanceJob");
 const { getConfig } = require("@plusscommunities/pluss-core-aws/config");
 const hasRequestPermission = require("./requests/helper/hasRequestPermission");
 const getUserPreviewFromReq = require("@plusscommunities/pluss-core-aws/helper/getUserPreviewFromReq");
+const {
+	PropertyRepository,
+} = require("@plusscommunities/pluss-core-aws/db/property/PropertyRepository");
 const { values } = require("./values.config");
 
+const properties = new PropertyRepository();
+
 module.exports.editJob = (event, context, callback) => {
-  init(config);
-  const data = getBody(event);
+	// Avoids waiting on the pooled DB connection to close before returning.
+	context.callbackWaitsForEmptyEventLoop = false;
+	init(config);
+	const data = getBody(event);
 
-  if (!data.job) {
-    return callback(
-      null,
-      generateJsonResponse(422, { error: { message: "No data for edit job." } })
-    );
-  }
+	if (!data.job) {
+		return callback(
+			null,
+			generateJsonResponse(422, {
+				error: { message: "No data for edit job." },
+			}),
+		);
+	}
 
-  getRef(values.tableNameMaintenance, "id", data.job.id)
-    .then((prevData) => {
-      hasRequestPermission(event, prevData).then((authorised) => {
-        if (!authorised) {
-          console.error("Authorization not valid");
-          return callback(
-            null,
-            generateJsonResponse(422, {
-              error: { message: "not authorized." },
-            })
-          );
-        }
-        getUserPreviewFromReq(event).then((user) => {
-          editMaintenanceJob(data.job)
-            .then((result) => {
-              if (!getConfig().maintenanceInstantComplete) {
-                sendJobEmail(data.job, true);
-                publishActivity(
-                  values.activityEditMaintenanceJob,
-                  data.site,
-                  data.job.id,
-                  user,
-                  { title: result.title, description: result.description }
-                );
-              }
+	getRef(values.tableNameMaintenance, "id", data.job.id)
+		.then((prevData) => {
+			// Returned so a rejection reaches the outer catch instead of hanging the Lambda.
+			return hasRequestPermission(event, prevData).then(async (authorised) => {
+				if (!authorised) {
+					console.error("Authorization not valid");
+					return callback(
+						null,
+						generateJsonResponse(422, {
+							error: { message: "not authorized." },
+						}),
+					);
+				}
+				if (values.linkToProperty) {
+					// A set propertyId is client input; verify it against the job's own
+					// site (the site the edit was authorised for), failing closed.
+					if (data.job.propertyId != null) {
+						let property;
+						try {
+							property = await properties.byId({
+								site: prevData.site,
+								propertyId: data.job.propertyId,
+							});
+						} catch (error) {
+							// A resolver outage is not invalid input.
+							log("editJob", "PropertyResolveError", error.message);
+							return callback(
+								null,
+								generateJsonResponse(500, {
+									error: { message: "Internal Error" },
+								}),
+							);
+						}
+						if (!property) {
+							return callback(
+								null,
+								generateJsonResponse(422, {
+									error: { message: "Invalid property for this site" },
+								}),
+							);
+						}
+						// Record keeps the verified name so link and label never disagree.
+						data.job.propertyName = property.name;
+						data.job.room = property.name;
+					} else if (
+						_.isUndefined(data.job.propertyId) &&
+						prevData.propertyId &&
+						prevData.propertyName
+					) {
+						// An omitted propertyId keeps the link, so the label stays pinned to it.
+						data.job.propertyName = prevData.propertyName;
+						data.job.room = prevData.propertyName;
+					}
+				}
+				return getUserPreviewFromReq(event).then((user) => {
+					return editMaintenanceJob(data.job)
+						.then(async (result) => {
+							if (!getConfig().maintenanceInstantComplete) {
+								// Awaited (allSettled) — the frozen event loop would drop
+								// fire-and-forget work, one failure must not strand the other,
+								// and a failed side effect must not fail the edit.
+								const settled = await Promise.allSettled([
+									sendJobEmail(data.job, true),
+									publishActivity(
+										values.activityEditMaintenanceJob,
+										data.site,
+										data.job.id,
+										user,
+										{ title: result.title, description: result.description },
+									),
+								]);
+								settled
+									.filter((r) => r.status === "rejected")
+									.forEach((r) => {
+										log("editJob", "SideEffectError", r.reason);
+									});
+							}
 
-              return callback(
-                null,
-                generateJsonResponse(200, {
-                  success: true,
-                  job: result,
-                })
-              );
-            })
-            .catch((error) => {
-              console.log(error);
-              console.error("Failed to edit maintenance node -->", data.job.id);
-              return callback(
-                null,
-                generateJsonResponse(422, {
-                  error,
-                })
-              );
-            });
-        });
-      });
-    })
-    .catch((error) => {
-      console.log("Fail on edit job authentication");
-      console.log(error);
-      return callback(
-        null,
-        generateJsonResponse(422, {
-          error,
-        })
-      );
-    });
+							return callback(
+								null,
+								generateJsonResponse(200, {
+									success: true,
+									job: result,
+								}),
+							);
+						})
+						.catch((error) => {
+							console.log(error);
+							console.error("Failed to edit maintenance node -->", data.job.id);
+							return callback(
+								null,
+								generateJsonResponse(422, {
+									error,
+								}),
+							);
+						});
+				});
+			});
+		})
+		.catch((error) => {
+			console.log("Fail on edit job authentication");
+			console.log(error);
+			return callback(
+				null,
+				generateJsonResponse(422, {
+					error,
+				}),
+			);
+		});
 };

package/editJobStatus.js

@@ -14,68 +14,68 @@ const hasRequestPermission = require("./requests/helper/hasRequestPermission");
 const { values } = require("./values.config");
 
 module.exports.editJobStatus = async (event, context, callback) => {
-  init(config);
-  const data = getBody(event);
+	init(config);
+	const data = getBody(event);
 
-  try {
-    const job = await getRef(values.tableNameMaintenance, "id", data.id);
-    const authorised = await hasRequestPermission(event, job);
-    if (!authorised) {
-      console.error("Authorization not valid");
-      return callback(
-        null,
-        generateJsonResponse(403, {
-          error: {
-            message: "Authorization not valid.",
-          },
-        })
-      );
-    }
+	try {
+		const job = await getRef(values.tableNameMaintenance, "id", data.id);
+		const authorised = await hasRequestPermission(event, job);
+		if (!authorised) {
+			console.error("Authorization not valid");
+			return callback(
+				null,
+				generateJsonResponse(403, {
+					error: {
+						message: "Authorization not valid.",
+					},
+				}),
+			);
+		}
 
-    const user = await getUserPreviewFromReq(event);
+		const user = await getUserPreviewFromReq(event);
 
-    // Update history
-    if (!job.history) job.history = [];
-    job.history.push({
-      timestamp: moment.utc().valueOf(),
-      status: data.status,
-      user,
-    });
-    job.status = data.status;
-    const result = await editMaintenanceJob(job);
+		// Update history
+		if (!job.history) job.history = [];
+		job.history.push({
+			timestamp: moment.utc().valueOf(),
+			status: data.status,
+			user,
+		});
+		job.status = data.status;
+		const result = await editMaintenanceJob(job);
 
-    // Log activity & notify
-    publishActivity(
-      values.activityMaintenanceJobStatusChanged,
-      result.site,
-      result.id,
-      user,
-      { title: result.title, status: result.status }
-    );
+		// Log activity & notify
+		publishActivity(
+			values.activityMaintenanceJobStatusChanged,
+			result.site,
+			result.id,
+			user,
+			{ title: result.title, status: result.status },
+		);
 
-    if (job.status === "Completed") {
-      logAnalyticsActivity(
-        `RequestCompleted`,
-        values.entityKey,
-        result.site,
-        user,
-        result.id
-      );
-    }
+		if (job.status === "Completed") {
+			logAnalyticsActivity(
+				`RequestCompleted`,
+				values.entityKey,
+				result.site,
+				user,
+				result.id,
+			);
+		}
 
-    if (result.userID) {
-      publishNotifications(
-        [result.userID],
-        values.activityMaintenanceJobStatusChanged,
-        result.site,
-        result.id,
-        result,
-        true
-      );
-    }
+		if (result.userID) {
+			publishNotifications(
+				[result.userID],
+				values.activityMaintenanceJobStatusChanged,
+				result.site,
+				result.id,
+				result,
+				true,
+			);
+		}
 
-    callback(null, generateJsonResponse(200, { success: true, job: result }));
-  } catch (error) {
-    callback(null, generateJsonResponse(422, { error }));
-  }
+		callback(null, generateJsonResponse(200, { success: true, job: result }));
+	} catch (error) {
+		callback(null, generateJsonResponse(422, { error }));
+	}
 };