Merge pull request #689 from Fdawgs/chore/domain

Fdawgs · Apr 11, 2023 · 6adb849 · 6adb849
2 parents 6e2475d + d96c2e8
commit 6adb849
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 15 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -55,7 +55,7 @@ representative at an online or offline event.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leader responsible for enforcement at frazer.smith@ydh.nhs.uk.
+reported to the community leader responsible for enforcement at frazer.smith@somersetft.nhs.uk.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

diff --git a/LICENSE b/LICENSE
@@ -2,6 +2,7 @@ MIT License
 
 Copyright (c) 2022-2023 Frazer Smith
 Copyright (c) 2022-2023 Yeovil District Hospital NHS Foundation Trust
+Copyright (c) 2023 Somerset NHS Foundation Trust
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -129,7 +129,7 @@ Example body of POST request:
 ```json
 {
 	"name": "Example Mirth Connect instance",
-	"email": "frazer.smith@ydh.nhs.uk",
+	"email": "frazer.smith@somersetft.nhs.uk",
 	"expires": "2022-03-09",
 	"scopes": ["contact.read", "contact.search"]
 }

diff --git a/SECURITY.md b/SECURITY.md
@@ -2,7 +2,7 @@
 
 ## Disclosure policy
 
-Please email reports about any security-related issues you find to frazer.smith@ydh.nhs.uk or servicedesk@ydh.nhs.uk for the attention of the Solutions Development Team.
+Please email reports about any security-related issues you find to frazer.smith@somersetft.nhs.uk or servicedesk@somersetft.nhs.uk for the attention of the Solutions Development Team.
 Please use a descriptive subject line in your report email, in addition to a reference or link to this repository in the body of the report.
 After the initial reply to your report, the Solutions Development team will attempt to keep you informed of the progress being made towards a fix.
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -37,7 +37,7 @@ services:
         labels:
             # Using OCI Image Format spec
             # See https://github.com/opencontainers/image-spec/blob/main/annotations.md
-            org.opencontainers.image.authors: Frazer Smith <frazer.smith@ydh.nhs.uk>
+            org.opencontainers.image.authors: Frazer Smith <frazer.smith@somersetft.nhs.uk>
             org.opencontainers.image.licenses: MIT
             org.opencontainers.image.url: https://github.com/Fdawgs/ydh-community-contacts-api
         logging:

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
 		"url": "https://github.com/Fdawgs/ydh-community-contacts-api/issues"
 	},
 	"license": "MIT",
-	"author": "Frazer Smith <frazer.smith@ydh.nhs.uk>",
+	"author": "Frazer Smith <frazer.smith@somersetft.nhs.uk>",
 	"funding": "https://justgiving.com/yeovilhospital",
 	"engines": {
 		"node": ">=18.12.1"

diff --git a/src/config/index.js b/src/config/index.js
@@ -235,7 +235,7 @@ async function getConfig() {
 						'<a href="https://yeovilhospital.co.uk/">Yeovil District Hospital NHSFT</a>\'s Community Contacts RESTful API, a Node.js application using the <a href="https://fastify.io/">Fastify web framework</a>, built to support CRUD (Create, Read, Update, and Delete) functionality of community midwife, health visitor, and school nurse team email addresses in YDH\'s catchment area.',
 					contact: {
 						name: "Author",
-						email: "frazer.smith@ydh.nhs.uk",
+						email: "frazer.smith@somersetft.nhs.uk",
 					},
 					license: {
 						name: license,

diff --git a/src/routes/admin/access/bearer-token/route.test.js b/src/routes/admin/access/bearer-token/route.test.js
@@ -16,7 +16,7 @@ const testId = randomUUID();
 
 const testReqPayload = {
 	name: "Test Clinical System Supplier Product",
-	email: "testFirstName.testLastName@ydh.nhs.uk",
+	email: "testFirstName.testLastName@somersetft.nhs.uk",
 	expires: "2022-11-07",
 	scopes: ["contact.read", "contact.search"],
 };

diff --git a/src/routes/contact/route.test.js b/src/routes/contact/route.test.js
@@ -26,7 +26,7 @@ const testReqPayload = {
 		},
 		{
 			system: "email",
-			value: "examplemidwife@ydh.nhs.uk",
+			value: "examplemidwife@somersetft.nhs.uk",
 			use: "Community Midwives",
 		},
 	],

diff --git a/src/server.test.js b/src/server.test.js
@@ -42,7 +42,7 @@ const testContactTelecom = [
 	},
 	{
 		system: "email",
-		value: "examplemidwife@ydh.nhs.uk",
+		value: "examplemidwife@somersetft.nhs.uk",
 		use: "Community Midwives",
 	},
 ];

diff --git a/test_resources/insomnia_test_requests.json b/test_resources/insomnia_test_requests.json
@@ -15,7 +15,7 @@
 			"method": "POST",
 			"body": {
 				"mimeType": "application/json",
-				"text": "{\n\t\"name\": \"Mirth Connect instance\",\n\t\"email\": \"frazer.smith@ydh.nhs.uk\",\n\t\"expires\": \"2099-03-09\",\n\t\"scopes\": [\n\t\t\"contact.delete\",\n\t\t\"contact.read\",\n\t\t\"contact.search\",\n\t\t\"contact.put\",\n\t\t\"contact.post\"\n\t]\n}"
+				"text": "{\n\t\"name\": \"Mirth Connect instance\",\n\t\"email\": \"frazer.smith@somersetft.nhs.uk\",\n\t\"expires\": \"2099-03-09\",\n\t\"scopes\": [\n\t\t\"contact.delete\",\n\t\t\"contact.read\",\n\t\t\"contact.search\",\n\t\t\"contact.put\",\n\t\t\"contact.post\"\n\t]\n}"
 			},
 			"parameters": [],
 			"headers": [
@@ -301,7 +301,7 @@
 			"method": "PUT",
 			"body": {
 				"mimeType": "application/json",
-				"text": "{\n\t\"match\": {\n\t\t\"type\": \"postcode\",\n\t\t\"value\": \"TA12\",\n\t\t\"receiver\": \"Area North\"\n\t},\n\t\"telecom\": [\n\t\t{\n\t\t\t\"system\": \"email\",\n\t\t\t\"value\": \"examplehv@nhs.net\",\n\t\t\t\"use\": \"Health Visitors\"\n\t\t},\n\t\t{\n\t\t\t\"system\": \"email\",\n\t\t\t\"value\": \"examplemidwife@ydh.nhs.uk\",\n\t\t\t\"use\": \"Community Midwives\"\n\t\t}\n\t]\n}"
+				"text": "{\n\t\"match\": {\n\t\t\"type\": \"postcode\",\n\t\t\"value\": \"TA12\",\n\t\t\"receiver\": \"Area North\"\n\t},\n\t\"telecom\": [\n\t\t{\n\t\t\t\"system\": \"email\",\n\t\t\t\"value\": \"examplehv@nhs.net\",\n\t\t\t\"use\": \"Health Visitors\"\n\t\t},\n\t\t{\n\t\t\t\"system\": \"email\",\n\t\t\t\"value\": \"examplemidwife@somersetft.nhs.uk\",\n\t\t\t\"use\": \"Community Midwives\"\n\t\t}\n\t]\n}"
 			},
 			"parameters": [],
 			"headers": [
@@ -336,7 +336,7 @@
 			"method": "POST",
 			"body": {
 				"mimeType": "application/json",
-				"text": "{\n\t\"match\": {\n\t\t\"type\": \"postcode\",\n\t\t\"value\": \"TA12233\",\n\t\t\"receiver\": \"Area North\"\n\t},\n\t\"telecom\": [\n\t\t{\n\t\t\t\"system\": \"email\",\n\t\t\t\"value\": \"examplehv@nhs.net\",\n\t\t\t\"use\": \"\",\n\t\t\t\"test\": \"true\"\n\t\t},\n\t\t{\n\t\t\t\"system\": \"email\",\n\t\t\t\"value\": \"examplemidwife@ydh.nhs.uk\",\n\t\t\t\"use\": \"Community Midwives\"\n\t\t}\n\t]\n}"
+				"text": "{\n\t\"match\": {\n\t\t\"type\": \"postcode\",\n\t\t\"value\": \"TA12233\",\n\t\t\"receiver\": \"Area North\"\n\t},\n\t\"telecom\": [\n\t\t{\n\t\t\t\"system\": \"email\",\n\t\t\t\"value\": \"examplehv@nhs.net\",\n\t\t\t\"use\": \"\",\n\t\t\t\"test\": \"true\"\n\t\t},\n\t\t{\n\t\t\t\"system\": \"email\",\n\t\t\t\"value\": \"examplemidwife@somersetft.nhs.uk\",\n\t\t\t\"use\": \"Community Midwives\"\n\t\t}\n\t]\n}"
 			},
 			"parameters": [],
 			"headers": [

diff --git a/test_resources/test_records/create_test_records.sql b/test_resources/test_records/create_test_records.sql
@@ -1,8 +1,8 @@
 INSERT INTO lookup.contacts
     (match_type, match_value, match_receiver, telecom)
 VALUES
-    ('postcode', 'TA126JU', 'Area North', '[{ "system": "email", "value": "examplehv@nhs.net", "use": "Health Visitors"}, { "system": "email", "value": "examplemidwife@ydh.nhs.uk", "use": "Community Midwives"}]'),
-    ('postcode', 'TA12', 'Area North', '[{ "system": "email", "value": "examplehv@nhs.net", "use": "Health Visitors"}, { "system": "email", "value": "examplemidwife@ydh.nhs.uk", "use": "Community Midwives"}]'),
-    ('postcode', 'BA22', 'Yeovil', '[{ "system": "email", "value": "examplehv@nhs.net", "use": "Health Visitors"}, { "system": "email", "value": "examplemidwife@ydh.nhs.uk", "use": "Community Midwives"}]'),
+    ('postcode', 'TA126JU', 'Area North', '[{ "system": "email", "value": "examplehv@nhs.net", "use": "Health Visitors"}, { "system": "email", "value": "examplemidwife@somersetft.nhs.uk", "use": "Community Midwives"}]'),
+    ('postcode', 'TA12', 'Area North', '[{ "system": "email", "value": "examplehv@nhs.net", "use": "Health Visitors"}, { "system": "email", "value": "examplemidwife@somersetft.nhs.uk", "use": "Community Midwives"}]'),
+    ('postcode', 'BA22', 'Yeovil', '[{ "system": "email", "value": "examplehv@nhs.net", "use": "Health Visitors"}, { "system": "email", "value": "examplemidwife@somersetft.nhs.uk", "use": "Community Midwives"}]'),
     ('gp_id', 'J81019', 'Whitecliff Group Practice', '[{ "system": "email", "value": "examplemidwife@dchft.nhs.uk", "use": "Community Midwives"}]'),
     ('school_code', 'EE106751', 'Our Lady Of Mount Carmel Catholic Primary School, Wincanton,Wincanton', '[{"system": "email", "value": "exampleschoolnurse@somerset.gov.uk", "use": "School Nurse"}]')