Merge branch 'develop' into feature/ERSSUP-61171

NHSDigital · Mar 25, 2022 · 7047abd · 7047abd
2 parents f0a93cb + e6f2bab
commit 7047abd
Show file tree

Hide file tree

Showing 122 changed files with 4,833 additions and 408 deletions.
diff --git a/proxies/sandbox/apiproxy/policies/AssignMessage.AddCors.xml b/proxies/sandbox/apiproxy/policies/AssignMessage.AddCors.xml
@@ -4,7 +4,7 @@
     <Set>
         <Headers>
             <Header name="Access-Control-Allow-Origin">{request.header.origin}</Header>
-            <Header name="Access-Control-Allow-Headers">origin, x-requested-with, x-correlation-id, accept, content-type, nhsd-session-urid, nhsd-end-user-organisation-ods, nhsd-ers-business-function, authorization, nhsd-ers-comm-rule-org, nhsd-ers-file-name, nhsd-ers-referral-id, if-match, nhsd-ers-on-behalf-of-user-id</Header>
+            <Header name="Access-Control-Allow-Headers">origin, x-requested-with, x-correlation-id, accept, content-type, nhsd-session-urid, nhsd-end-user-organisation-ods, nhsd-ers-business-function, nhsd-ers-on-behalf-of-user-id, authorization, nhsd-ers-comm-rule-org, nhsd-ers-file-name, nhsd-ers-referral-id, if-match</Header>
             <Header name="Access-Control-Expose-Headers">x-correlation-id, x-request-id, content-type, Location, ETag, Content-Disposition, Content-Length, Cache-Control</Header>
             <Header name="Access-Control-Max-Age">3628800</Header>
             <Header name="Access-Control-Allow-Methods">GET, PUT, POST, DELETE, HEAD</Header>

diff --git a/sandbox/src/mocks/acceptReferral/responses/ExampleResponse.json b/sandbox/src/mocks/acceptReferral/responses/ExampleResponse.json
@@ -14,6 +14,12 @@
         "reference": "#appointment"
       }
     },
+    {
+      "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Appointment-Reference-1",
+      "valueReference": {
+        "reference": "Appointment/70009"
+      }
+    },
     {
       "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ClinicalInfoFirstSubmitted-1",
       "valueDateTime": "2021-10-13T12:51:16.848Z"
@@ -42,6 +48,19 @@
         "system": "https://fhir.nhs.uk/Id/ods-organization-code",
         "value": "R69"
       }
+    },
+    {
+      "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralState-1",
+      "extension": [
+        {
+          "url": "state",
+          "valueCoding": {
+            "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReferralState-1",
+            "code": "BOOKED",
+            "display": "Booked"
+          }
+        }
+      ]
     }
   ],
   "contained": [

diff --git a/sandbox/src/mocks/availableActionsForUserList/Empty.json b/sandbox/src/mocks/availableActionsForUserList/Empty.json
@@ -11,7 +11,7 @@
 	"link": [
 		{
 			"relation": "self",
-			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070004/_history/6&intent=proposal&status=ready"
+			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070000/_history/6&intent=proposal&status=ready"
 		}
 	],
 	"entry": []

diff --git a/sandbox/src/mocks/availableActionsForUserList/WithCancelDBAppointment.json b/sandbox/src/mocks/availableActionsForUserList/WithCancelDBAppointment.json
@@ -0,0 +1,48 @@
+{
+	"id": "604dc1ea-986c-45ec-b36c-cf9d2fabc5c0",
+	"meta": {
+		"lastUpdated": "2021-11-01T11:05:40.046Z",
+		"profile": [
+			"http://hl7.org/fhir/STU3/StructureDefinition/Bundle"
+		]
+	},
+	"resourceType": "Bundle",
+	"type": "searchset",
+	"link": [
+		{
+			"relation": "self",
+			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070006/_history/6&intent=proposal&status=ready"
+		}
+	],
+	"entry": [
+    {
+      "fullUrl": "_baseUrl_/STU3/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
+      "resource": {
+        "id": "ed4dff57-503c-46ef-9084-4045a23f4c2a",
+        "meta": {
+          "profile": [
+            "https://fhir.hl7.org.uk/STU3/StructureDefinition/CareConnect-Task-1"
+          ]
+        },
+        "resourceType": "Task",
+        "status": "ready",
+        "intent": "proposal",
+        "focus": {
+          "reference": "ReferralRequest/000000070006/_history/6"
+        },
+        "code": {
+          "coding": [
+            {
+              "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-AvailableActionsForUser-1",
+              "code": "CANCEL_DIRECTLY_BOOKED_APPOINTMENT",
+              "display": "Cancel Directly Booked Appointment"
+            }
+          ]
+        }
+      },
+      "search": {
+        "mode": "match"
+      }
+    }
+	]
+}
diff --git a/sandbox/src/mocks/availableActionsForUserList/WithCancelReferral.json b/sandbox/src/mocks/availableActionsForUserList/WithCancelReferral.json
@@ -0,0 +1,48 @@
+{
+	"id": "604dc1ea-986c-45ec-b36c-cf9d2fabc5c0",
+	"meta": {
+		"lastUpdated": "2021-11-01T11:05:40.046Z",
+		"profile": [
+			"http://hl7.org/fhir/STU3/StructureDefinition/Bundle"
+		]
+	},
+	"resourceType": "Bundle",
+	"type": "searchset",
+	"link": [
+		{
+			"relation": "self",
+			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070005/_history/6&intent=proposal&status=ready"
+		}
+	],
+	"entry": [
+    {
+      "fullUrl": "_baseUrl_/STU3/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
+      "resource": {
+        "id": "ed4dff57-503c-46ef-9084-4045a23f4c2a",
+        "meta": {
+          "profile": [
+            "https://fhir.hl7.org.uk/STU3/StructureDefinition/CareConnect-Task-1"
+          ]
+        },
+        "resourceType": "Task",
+        "status": "ready",
+        "intent": "proposal",
+        "focus": {
+          "reference": "ReferralRequest/000000070005/_history/6"
+        },
+        "code": {
+          "coding": [
+            {
+              "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-AvailableActionsForUser-1",
+              "code": "CANCEL_REFERRAL",
+              "display": "Cancel Referral"
+            }
+          ]
+        }
+      },
+      "search": {
+        "mode": "match"
+      }
+    }
+	]
+}
diff --git a/sandbox/src/mocks/availableActionsForUserList/WithChangeShortlist.json b/sandbox/src/mocks/availableActionsForUserList/WithChangeShortlist.json
@@ -11,12 +11,12 @@
 	"link": [
 		{
 			"relation": "self",
-			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070002/_history/6&intent=proposal&status=ready"
+			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070003/_history/6&intent=proposal&status=ready"
 		}
 	],
 	"entry": [
     {
-      "fullUrl": "_baseUrl_/STU3/STU3/v1/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
+      "fullUrl": "_baseUrl_/STU3/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
       "resource": {
         "id": "ed4dff57-503c-46ef-9084-4045a23f4c2a",
         "meta": {
@@ -28,7 +28,7 @@
         "status": "ready",
         "intent": "proposal",
         "focus": {
-          "reference": "ReferralRequest/000000070002/_history/6"
+          "reference": "ReferralRequest/000000070003/_history/6"
         },
         "code": {
           "coding": [

diff --git a/sandbox/src/mocks/availableActionsForUserList/WithChangeShortlistAndSendForTriage.json b/sandbox/src/mocks/availableActionsForUserList/WithChangeShortlistAndSendForTriage.json
@@ -11,12 +11,12 @@
 	"link": [
 		{
 			"relation": "self",
-			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070003/_history/6&intent=proposal&status=ready"
+			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070004/_history/6&intent=proposal&status=ready"
 		}
 	],
 	"entry": [
     {
-      "fullUrl": "_baseUrl_/STU3/STU3/v1/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
+      "fullUrl": "_baseUrl_/STU3/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
       "resource": {
         "id": "ed4dff57-503c-46ef-9084-4045a23f4c2a",
         "meta": {
@@ -28,7 +28,7 @@
         "status": "ready",
         "intent": "proposal",
         "focus": {
-          "reference": "ReferralRequest/000000070003/_history/6"
+          "reference": "ReferralRequest/000000070004/_history/6"
         },
         "code": {
           "coding": [

diff --git a/sandbox/src/mocks/availableActionsForUserList/WithCreateAppointment.json b/sandbox/src/mocks/availableActionsForUserList/WithCreateAppointment.json
@@ -11,12 +11,12 @@
 	"link": [
 		{
 			"relation": "self",
-			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070001/_history/6&intent=proposal&status=ready"
+			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070002/_history/6&intent=proposal&status=ready"
 		}
 	],
 	"entry": [
     {
-      "fullUrl": "_baseUrl_/STU3/STU3/v1/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
+      "fullUrl": "_baseUrl_/STU3/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
       "resource": {
         "id": "ed4dff57-503c-46ef-9084-4045a23f4c2a",
         "meta": {
@@ -28,7 +28,7 @@
         "status": "ready",
         "intent": "proposal",
         "focus": {
-          "reference": "ReferralRequest/000000070001/_history/6"
+          "reference": "ReferralRequest/000000070002/_history/6"
         },
         "code": {
           "coding": [

diff --git a/sandbox/src/mocks/availableActionsForUserList/WithRecordReviewOutcome.json b/sandbox/src/mocks/availableActionsForUserList/WithRecordReviewOutcome.json
@@ -11,12 +11,12 @@
 	"link": [
 		{
 			"relation": "self",
-			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070000/_history/6&intent=proposal&status=ready"
+			"url": "_baseUrl_/STU3/Task?focus=ReferralRequest/000000070001/_history/6&intent=proposal&status=ready"
 		}
 	],
 	"entry": [
     {
-      "fullUrl": "_baseUrl_/STU3/STU3/v1/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
+      "fullUrl": "_baseUrl_/STU3/Task/ed4dff57-503c-46ef-9084-4045a23f4c2a",
       "resource": {
         "id": "ed4dff57-503c-46ef-9084-4045a23f4c2a",
         "meta": {
@@ -28,7 +28,7 @@
         "status": "ready",
         "intent": "proposal",
         "focus": {
-          "reference": "ReferralRequest/000000070000/_history/6"
+          "reference": "ReferralRequest/000000070001/_history/6"
         },
         "code": {
           "coding": [

diff --git a/sandbox/src/mocks/cancelAppointmentActionLater/responses/MinimalExampleDBS.json b/sandbox/src/mocks/cancelAppointmentActionLater/responses/MinimalExampleDBS.json
@@ -14,6 +14,12 @@
 				"reference": "#appointment"
 			}
 		},
+    {
+      "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Appointment-Reference-1",
+      "valueReference": {
+        "reference": "Appointment/70009"
+      }
+    },
 		{
 			"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ClinicalInfoFirstSubmitted-1",
 			"valueDateTime": "2021-11-03T12:54:40.560Z"
@@ -42,6 +48,31 @@
 				"system": "https://fhir.nhs.uk/Id/ods-organization-code",
 				"value": "R69"
 			}
+		},
+		{
+			"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralState-1",
+			"extension": [
+				{
+					"url": "state",
+					"valueCoding": {
+						"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReferralState-1",
+						"code": "TRIAGED_PROVIDER_TO_ACTION",
+						"display": "Triaged - Provider To Action"
+					}
+				},
+				{
+				  "url": "reason",
+				  "valueCoding": {
+					"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReviewOutcome-1",
+					"code": "CANCEL_APPOINTMENT_ACTION_LATER",
+					"display": "Cancel Appointment Action Later"
+				  }
+				},
+				{
+					"url": "comments",
+					"valueString": "Please contact patient to rebook"
+				}
+			]
 		}
 	],
 	"contained": [

diff --git a/sandbox/src/mocks/cancelAppointmentActionLater/responses/MinimalExampleIBS.json b/sandbox/src/mocks/cancelAppointmentActionLater/responses/MinimalExampleIBS.json
@@ -14,6 +14,12 @@
 				"reference": "#appointment"
 			}
 		},
+    {
+      "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Appointment-Reference-1",
+      "valueReference": {
+        "reference": "Appointment/70009"
+      }
+    },
 		{
 			"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ClinicalInfoFirstSubmitted-1",
 			"valueDateTime": "2021-11-03T14:39:17.946Z"
@@ -42,6 +48,31 @@
 				"system": "https://fhir.nhs.uk/Id/ods-organization-code",
 				"value": "R69"
 			}
+		},
+		{
+			"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralState-1",
+			"extension": [
+				{
+					"url": "state",
+					"valueCoding": {
+						"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReferralState-1",
+						"code": "TRIAGED_PROVIDER_TO_ACTION",
+						"display": "Triaged - Provider To Action"
+					}
+				},
+				{
+				  "url": "reason",
+				  "valueCoding": {
+					"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReviewOutcome-1",
+					"code": "CANCEL_APPOINTMENT_ACTION_LATER",
+					"display": "Cancel Appointment Action Later"
+				  }
+				},
+				{
+					"url": "comments",
+					"valueString": "Please contact patient to rebook"
+				}
+			]
 		}
 	],
 	"contained": [

diff --git a/...src/mocks/cancelAppointmentActionLater/responses/PriorityChangeAndWithAttachmentsDBS.json b/...src/mocks/cancelAppointmentActionLater/responses/PriorityChangeAndWithAttachmentsDBS.json
@@ -14,6 +14,12 @@
 				"reference": "#appointment"
 			}
 		},
+    {
+      "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Appointment-Reference-1",
+      "valueReference": {
+        "reference": "Appointment/70009"
+      }
+    },
 		{
 			"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ClinicalInfoFirstSubmitted-1",
 			"valueDateTime": "2021-11-03T14:29:18.239Z"
@@ -42,6 +48,31 @@
 				"system": "https://fhir.nhs.uk/Id/ods-organization-code",
 				"value": "R69"
 			}
+		},
+		{
+			"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralState-1",
+			"extension": [
+				{
+					"url": "state",
+					"valueCoding": {
+						"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReferralState-1",
+						"code": "TRIAGED_PROVIDER_TO_ACTION",
+						"display": "Triaged - Provider To Action"
+					}
+				},
+				{
+				  	"url": "reason",
+				  	"valueCoding": {
+						"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReviewOutcome-1",
+						"code": "CANCEL_APPOINTMENT_ACTION_LATER",
+						"display": "Cancel Appointment Action Later"
+				  }
+				},
+				{
+					"url": "comments",
+					"valueString": "Please contact patient to rebook"
+				}
+			]
 		}
 	],
 	"contained": [