Merge pull request #924 from Fdawgs/chore/tidy

.eslintrc.js

@@ -12,7 +12,6 @@ module.exports = {
 		"plugin:promise/recommended",
 		"plugin:regexp/recommended",
 		"plugin:security/recommended",
-		"plugin:security-node/recommended",
 		"prettier",
 	],
 	overrides: [
@@ -40,14 +39,7 @@ module.exports = {
 		// Explicitly tell ESLint to parse JavaScript as CommonJS, as airbnb-base sets this to "modules" for ECMAScript
 		sourceType: "script",
 	},
-	plugins: [
-		"import",
-		"jsdoc",
-		"promise",
-		"regexp",
-		"security",
-		"security-node",
-	],
+	plugins: ["import", "jsdoc", "promise", "regexp", "security"],
 	root: true,
 	rules: {
 		"@eslint-community/eslint-comments/disable-enable-pair": "off",
@@ -57,6 +49,7 @@ module.exports = {
 		"jsdoc/check-syntax": "error",
 		"jsdoc/require-hyphen-before-param-description": "error",
 		"no-multiple-empty-lines": ["error", { max: 1 }],
+		"no-param-reassign": ["error", { props: false }],
 		"prefer-destructuring": ["error", { object: true, array: false }],
 		"promise/prefer-await-to-callbacks": "warn",
 		"promise/prefer-await-to-then": "warn",

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:20-alpine
 
 # Workdir
 WORKDIR /usr/app

README.md

@@ -1,7 +1,6 @@
 > **Note**
-> As of 2023-05-03 I am no longer employed by Somerset NHS Foundation Trust.
-> However, this repository will continue to be maintained as it acts as
-> a 'canary in the coalmine' for changes to Node and other dependencies.
+> This repository is unmaintained as of 2023-05-03 as
+> I am no longer employed by Somerset NHS Foundation Trust.
 
 <a href="https://somersetft.nhs.uk/yeovilhospital/">
 	<img alttext="Somerset NHSFT logo" src="https://raw.githubusercontent.com/Fdawgs/yh-community-contacts-api/main/docs/images/somerset-nhsft-logo-left-aligned-transparent-background.png" width="480" />

package.json

@@ -21,12 +21,12 @@
 		"db:migrate": "node src/migrate.js",
 		"jest": "jest",
 		"jest:coverage": "jest --coverage",
-		"lint": "eslint . --cache --ext js,jsx,ts,tsx --ignore-path .gitignore",
+		"lint": "eslint . --cache --ext js,jsx --ignore-path .gitignore",
 		"lint:licenses": "node scripts/license-checker.js",
 		"lint:lockfile": "lockfile-lint -p package-lock.json -t npm -a npm -s -i",
 		"lint:prettier": "prettier . -c -u",
 		"lint:prettier:fix": "prettier . -w -u",
-		"prepare": "husky install",
+		"prepare": "husky install && npx playwright install firefox --with-deps",
 		"start": "node .",
 		"start:dev": "nodemon src/app.js | pino-pretty",
 		"test": "npm run lint && npm run jest",
@@ -91,7 +91,6 @@
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-regexp": "^2.1.1",
 		"eslint-plugin-security": "^1.7.1",
-		"eslint-plugin-security-node": "^1.1.1",
 		"glob": "^10.3.10",
 		"husky": "^8.0.3",
 		"jest": "^29.7.0",

src/plugins/clean-object/index.js

@@ -18,15 +18,14 @@ async function plugin(server) {
 	 * @returns {object} cleaned object.
 	 */
 	function cleanObject(object = {}) {
-		const obj = object;
-		Object.keys(obj).forEach((key) => {
-			if (obj[key] && typeof obj[key] === "object") {
-				cleanObject(obj[key]);
-			} else if (obj[key] === null || obj[key] === undefined) {
-				delete obj[key];
+		Object.keys(object).forEach((key) => {
+			if (object[key] && typeof object[key] === "object") {
+				cleanObject(object[key]);
+			} else if (object[key] === null || object[key] === undefined) {
+				delete object[key];
 			}
 		});
-		return obj;
+		return object;
 	}
 
 	server.decorate("cleanObject", cleanObject);

src/plugins/clean-object/plugin.test.js

@@ -22,9 +22,7 @@ describe("Clean-Object plugin", () => {
 		await server.ready();
 	});
 
-	afterAll(async () => {
-		await server.close();
-	});
+	afterAll(async () => server.close());
 
 	it("Recursively removes keys from request object where value is undefined or null", async () => {
 		const response = await server.inject({

src/plugins/convert-date-param-operator/index.js

@@ -2,6 +2,18 @@
 
 const fp = require("fastify-plugin");
 
+const operatorMap = {
+	ap: "=",
+	eb: "<",
+	eq: "=",
+	ge: ">=",
+	gt: ">",
+	le: "<=",
+	lt: "<",
+	ne: "!=",
+	sa: ">",
+};
+
 /**
  * @author Frazer Smith
  * @description Plugin that decorates Fastify instance with `convertDateParamOperator` function,
@@ -11,34 +23,12 @@ const fp = require("fastify-plugin");
 async function plugin(server) {
 	/**
 	 * @author Frazer Smith
-	 * @author NextGen Healthcare
 	 * @description Converts date param operator to corresponding value.
 	 * @param {string} operator - Date param operator, in any letter case.
 	 * @returns {string} converted date param operator.
 	 */
 	function convDateParamOperator(operator) {
-		switch (operator.toLowerCase()) {
-			case "ap":
-				return "=";
-			case "eb":
-				return "<";
-			case "eq":
-				return "=";
-			case "ge":
-				return ">=";
-			case "gt":
-				return ">";
-			case "le":
-				return "<=";
-			case "lt":
-				return "<";
-			case "ne":
-				return "!=";
-			case "sa":
-				return ">";
-			default:
-				return "=";
-		}
+		return operatorMap[operator.toLowerCase()] || "=";
 	}
 
 	server.decorate("convertDateParamOperator", convDateParamOperator);

src/plugins/convert-date-param-operator/plugin.test.js

@@ -18,9 +18,7 @@ describe("Convert-Date-Param-Operator plugin", () => {
 		await server.ready();
 	});
 
-	afterAll(async () => {
-		await server.close();
-	});
+	afterAll(async () => server.close());
 
 	it("Converts date param operators to expected value", async () => {
 		const values = {

src/plugins/db/plugin.test.js

@@ -50,9 +50,7 @@ describe("DB plugin", () => {
 			await server.ready();
 		});
 
-		afterAll(async () => {
-			await server.close();
-		});
+		afterAll(async () => server.close());
 
 		it("Returns 'test' string", async () => {
 			const response = await server.inject({
@@ -88,9 +86,7 @@ describe("DB plugin", () => {
 			await server.ready();
 		});
 
-		afterAll(async () => {
-			await server.close();
-		});
+		afterAll(async () => server.close());
 
 		it("Returns 'test' string", async () => {
 			const response = await server.inject({

src/routes/admin/access/bearer-token/route.test.js

@@ -219,9 +219,7 @@ describe("Access route", () => {
 				.ready();
 		});
 
-		afterAll(async () => {
-			await server.close();
-		});
+		afterAll(async () => server.close());
 
 		describe("/:id DELETE requests", () => {
 			it("Deletes a bearer token record", async () => {

src/routes/admin/healthcheck/route.test.js

@@ -25,9 +25,7 @@ describe("Healthcheck route", () => {
 				.ready();
 		});
 
-		afterAll(async () => {
-			await server.close();
-		});
+		afterAll(async () => server.close());
 
 		it("Returns `ok`", async () => {
 			const response = await server.inject({

src/routes/contact/route.test.js

@@ -229,9 +229,7 @@ describe("Contact route", () => {
 					.ready();
 			});
 
-			afterAll(async () => {
-				await server.close();
-			});
+			afterAll(async () => server.close());
 
 			describe("/:id DELETE requests", () => {
 				it("Deletes a contact record", async () => {
@@ -875,9 +873,7 @@ describe("Contact route", () => {
 					.ready();
 			});
 
-			afterAll(async () => {
-				await server.close();
-			});
+			afterAll(async () => server.close());
 
 			describe("/:id DELETE requests", () => {
 				it("Returns HTTP status code 401 if not in permitted access", async () => {

src/routes/docs/openapi/route.test.js

@@ -27,9 +27,7 @@ describe("OpenAPI route", () => {
 				.ready();
 		});
 
-		afterAll(async () => {
-			await server.close();
-		});
+		afterAll(async () => server.close());
 
 		it("Returns OpenAPI definitions", async () => {
 			const response = await server.inject({

src/routes/docs/route.test.js

@@ -25,9 +25,7 @@ describe("Docs route", () => {
 				.ready();
 		});
 
-		afterAll(async () => {
-			await server.close();
-		});
+		afterAll(async () => server.close());
 
 		it("Returns HTML", async () => {
 			const response = await server.inject({

src/server.test.js

@@ -284,9 +284,7 @@ describe("Server deployment", () => {
 				await server.register(startServer, config).ready();
 			});
 
-			afterAll(async () => {
-				await server.close();
-			});
+			afterAll(async () => server.close());
 
 			describe("/admin/healthcheck route", () => {
 				it("Returns `ok`", async () => {
@@ -388,9 +386,7 @@ describe("Server deployment", () => {
 				await server.register(startServer, config).ready();
 			});
 
-			afterAll(async () => {
-				await server.close();
-			});
+			afterAll(async () => server.close());
 
 			describe("/admin/healthcheck route", () => {
 				it("Returns `ok`", async () => {
@@ -578,9 +574,7 @@ describe("Server deployment", () => {
 				await server.register(startServer, config).ready();
 			});
 
-			afterAll(async () => {
-				await server.close();
-			});
+			afterAll(async () => server.close());
 
 			describe("/admin/access/bearer-token/:id route", () => {
 				/** @todo use `it.concurrent.each()` once it is no longer experimental */
@@ -958,9 +952,7 @@ describe("Server deployment", () => {
 			await server.register(startServer, config).listen(config.fastify);
 		});
 
-		afterAll(async () => {
-			await server.close();
-		});
+		afterAll(async () => server.close());
 
 		describe("Content", () => {
 			describe("/docs route", () => {
@@ -1049,9 +1041,7 @@ describe("Server deployment", () => {
 			await server.ready();
 		});
 
-		afterAll(async () => {
-			await server.close();
-		});
+		afterAll(async () => server.close());
 
 		describe("/error route", () => {
 			it("Returns HTTP status code 500", async () => {