From b34aaeaf8d0b83b3fb0fdec399d941aa5e383347 Mon Sep 17 00:00:00 2001 From: LeoKHoward <38526889+LeoKHoward@users.noreply.github.com> Date: Thu, 17 Jul 2025 11:09:52 +0100 Subject: [PATCH 1/2] NPA-5299: Bundle Examples Have Incorrect Totals --- ...ip Service Sandbox.postman_collection.json | 36 +++++++++---------- ...onships-status-active-include-details.yaml | 2 +- ...ultiple-relationships-include-patient.yaml | 2 +- ...lationships-include-performer-patient.yaml | 2 +- ...tiple-relationships-include-performer.yaml | 2 +- ...nships-single-patient-include-patient.yaml | 2 +- ...gle-patient-include-performer-patient.yaml | 2 +- ...hips-single-patient-include-performer.yaml | 2 +- ...ng-adult-relationship-include-patient.yaml | 2 +- ...elationship-include-performer-patient.yaml | 2 +- ...-adult-relationship-include-performer.yaml | 2 +- ...er-child-relationship-include-patient.yaml | 2 +- ...elationship-include-performer-patient.yaml | 2 +- ...-child-relationship-include-performer.yaml | 2 +- .../list_relationship_9000000017_include.yaml | 2 +- .../list_relationship_9000000042_include.yaml | 2 +- ...erify_relationship_9000000009_include.yaml | 2 +- ...erify_relationship_9000000025_include.yaml | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/postman/Validate Relationship Service Sandbox.postman_collection.json b/postman/Validate Relationship Service Sandbox.postman_collection.json index c7d0c22c..cb0d25a5 100644 --- a/postman/Validate Relationship Service Sandbox.postman_collection.json +++ b/postman/Validate Relationship Service Sandbox.postman_collection.json @@ -1237,7 +1237,7 @@ " ],", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2024-01-01T00:00:00+00:00\",", - " \"total\": 4,", + " \"total\": 2,", " \"type\": \"searchset\"", "};", "", @@ -1492,7 +1492,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2024-01-01T00:00:00+00:00\",", - " \"total\": 2,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"link\": [", " {", @@ -2049,7 +2049,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 6,", + " \"total\": 2,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -2712,7 +2712,7 @@ "response": [] }, { - "name": "Filtered proxy relationships by 'proposed' and 'active' staus", + "name": "Filtered proxy relationships by 'proposed' and 'active' status", "event": [ { "listen": "test", @@ -3458,7 +3458,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 6,", + " \"total\": 3,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -3925,7 +3925,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 6,", + " \"total\": 3,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -4366,7 +4366,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 9,", + " \"total\": 3,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -5274,7 +5274,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 7,", + " \"total\": 3,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -5766,7 +5766,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 6,", + " \"total\": 3,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -6207,7 +6207,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 4,", + " \"total\": 3,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -6765,7 +6765,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 3,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -7138,7 +7138,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 3,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -8250,7 +8250,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 2,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -8397,7 +8397,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 2,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -8535,7 +8535,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 3,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -8900,7 +8900,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 2,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -9051,7 +9051,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 2,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"entry\": [", " {", @@ -9194,7 +9194,7 @@ "const expectedResponseBody = {", " \"resourceType\": \"Bundle\",", " \"timestamp\": \"2020-08-26T14:00:00+00:00\",", - " \"total\": 3,", + " \"total\": 1,", " \"type\": \"searchset\",", " \"entry\": [", " {", diff --git a/specification/examples/responses/GET_Consent/filtered-relationships-status-active-include-details.yaml b/specification/examples/responses/GET_Consent/filtered-relationships-status-active-include-details.yaml index 2842ee78..fc0ac6e0 100644 --- a/specification/examples/responses/GET_Consent/filtered-relationships-status-active-include-details.yaml +++ b/specification/examples/responses/GET_Consent/filtered-relationships-status-active-include-details.yaml @@ -6,7 +6,7 @@ ConsentMultipleRelationshipsStatusActiveIncludeDetailsBundle: value: resourceType: Bundle timestamp: "2020-08-26T14:00:00+00:00" - total: 6 + total: 2 type: searchset entry: - fullUrl: "https://api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/BE974742" diff --git a/specification/examples/responses/GET_Consent/multiple-relationships-include-patient.yaml b/specification/examples/responses/GET_Consent/multiple-relationships-include-patient.yaml index abd35685..92ad038e 100644 --- a/specification/examples/responses/GET_Consent/multiple-relationships-include-patient.yaml +++ b/specification/examples/responses/GET_Consent/multiple-relationships-include-patient.yaml @@ -5,7 +5,7 @@ ConsentMultipleRelationshipsIncludePatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 6 + total: 3 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/Patient/A3CC67E2 diff --git a/specification/examples/responses/GET_Consent/multiple-relationships-include-performer-patient.yaml b/specification/examples/responses/GET_Consent/multiple-relationships-include-performer-patient.yaml index 34c91da2..5289326d 100644 --- a/specification/examples/responses/GET_Consent/multiple-relationships-include-performer-patient.yaml +++ b/specification/examples/responses/GET_Consent/multiple-relationships-include-performer-patient.yaml @@ -6,7 +6,7 @@ ConsentMultipleRelationshipsIncludePerformerPatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 9 + total: 3 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/BE974742 diff --git a/specification/examples/responses/GET_Consent/multiple-relationships-include-performer.yaml b/specification/examples/responses/GET_Consent/multiple-relationships-include-performer.yaml index bcebf569..104cd9b5 100644 --- a/specification/examples/responses/GET_Consent/multiple-relationships-include-performer.yaml +++ b/specification/examples/responses/GET_Consent/multiple-relationships-include-performer.yaml @@ -5,7 +5,7 @@ ConsentMultipleRelationshipsIncludePerformerBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 6 + total: 3 type: searchset entry: - fullUrl: >- diff --git a/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-patient.yaml b/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-patient.yaml index 5b1d12b6..75543ad4 100644 --- a/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-patient.yaml +++ b/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-patient.yaml @@ -4,7 +4,7 @@ ConsentMultipleRelationshipsSinglePatientIncludePatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 4 + total: 3 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/Patient/A3CC67E2 diff --git a/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-performer-patient.yaml b/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-performer-patient.yaml index 89db7bab..5301ff00 100644 --- a/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-performer-patient.yaml +++ b/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-performer-patient.yaml @@ -4,7 +4,7 @@ ConsentMultipleRelationshipsSinglePatientIncludePerformerPatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 7 + total: 3 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/Patient/A3CC67E2 diff --git a/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-performer.yaml b/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-performer.yaml index 2dd72967..d0592898 100644 --- a/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-performer.yaml +++ b/specification/examples/responses/GET_Consent/multiple-relationships-single-patient-include-performer.yaml @@ -4,7 +4,7 @@ ConsentMultipleRelationshipsSinglePatientIncludePerformerPatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 6 + total: 3 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/BE974742 diff --git a/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-patient.yaml b/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-patient.yaml index 9fbb50fc..dee9bed2 100644 --- a/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-patient.yaml +++ b/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-patient.yaml @@ -5,7 +5,7 @@ ConsentSingleConsentingAdultRelationshipIncludePatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 2 + total: 1 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/Patient/DFCC67F5 diff --git a/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-performer-patient.yaml b/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-performer-patient.yaml index d758ee6e..120e6b83 100644 --- a/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-performer-patient.yaml +++ b/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-performer-patient.yaml @@ -6,7 +6,7 @@ ConsentSingleConsentingAdultRelationshipIncludePerformerPatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 3 + total: 1 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/RP974720 diff --git a/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-performer.yaml b/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-performer.yaml index cbdc101b..607eb95d 100644 --- a/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-performer.yaml +++ b/specification/examples/responses/GET_Consent/single-consenting-adult-relationship-include-performer.yaml @@ -5,7 +5,7 @@ ConsentSingleConsentingAdultRelationshipIncludePerformerBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 2 + total: 1 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/RP974720 diff --git a/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-patient.yaml b/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-patient.yaml index a34e27bf..cf32f0de 100644 --- a/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-patient.yaml +++ b/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-patient.yaml @@ -5,7 +5,7 @@ ConsentSingleAdultChildRelationshipIncludePatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 2 + total: 1 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/Patient/A3CC67E2 diff --git a/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-performer-patient.yaml b/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-performer-patient.yaml index 5c275027..57f1c8b4 100644 --- a/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-performer-patient.yaml +++ b/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-performer-patient.yaml @@ -6,7 +6,7 @@ ConsentSingleAdultChildRelationshipIncludePerformerPatientBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 3 + total: 1 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/BE974742 diff --git a/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-performer.yaml b/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-performer.yaml index cd7dc457..5f2584d9 100644 --- a/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-performer.yaml +++ b/specification/examples/responses/GET_Consent/single-mother-child-relationship-include-performer.yaml @@ -5,7 +5,7 @@ ConsentSingleAdultChildRelationshipIncludePerformerBundle: value: resourceType: Bundle timestamp: '2020-08-26T14:00:00+00:00' - total: 2 + total: 1 type: searchset entry: - fullUrl: https://api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/BE974742 diff --git a/specification/examples/responses/GET_RelatedPerson/list_relationship_9000000017_include.yaml b/specification/examples/responses/GET_RelatedPerson/list_relationship_9000000017_include.yaml index 67f5b7d0..d9b7de41 100644 --- a/specification/examples/responses/GET_RelatedPerson/list_relationship_9000000017_include.yaml +++ b/specification/examples/responses/GET_RelatedPerson/list_relationship_9000000017_include.yaml @@ -113,5 +113,5 @@ ListRelationship9000000017Include: url: https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson?identifier=9000000017&_include=RelatedPerson:patient resourceType: Bundle timestamp: '2024-01-01T00:00:00+00:00' - total: 4 + total: 2 type: searchset diff --git a/specification/examples/responses/GET_RelatedPerson/list_relationship_9000000042_include.yaml b/specification/examples/responses/GET_RelatedPerson/list_relationship_9000000042_include.yaml index d049a640..73780670 100644 --- a/specification/examples/responses/GET_RelatedPerson/list_relationship_9000000042_include.yaml +++ b/specification/examples/responses/GET_RelatedPerson/list_relationship_9000000042_include.yaml @@ -64,5 +64,5 @@ ListRelationship9000000042Include: url: https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson?patient:identifier=9000000042 resourceType: Bundle timestamp: '2024-01-01T00:00:00+00:00' - total: 2 + total: 1 type: searchset diff --git a/specification/examples/responses/GET_RelatedPerson/verify_relationship_9000000009_include.yaml b/specification/examples/responses/GET_RelatedPerson/verify_relationship_9000000009_include.yaml index 84d13469..e733ad35 100644 --- a/specification/examples/responses/GET_RelatedPerson/verify_relationship_9000000009_include.yaml +++ b/specification/examples/responses/GET_RelatedPerson/verify_relationship_9000000009_include.yaml @@ -9,7 +9,7 @@ VerifyRelationship9000000009Include: value: resourceType: Bundle timestamp: '2024-01-01T00:00:00+00:00' - total: 2 + total: 1 type: searchset link: - relation: self diff --git a/specification/examples/responses/GET_RelatedPerson/verify_relationship_9000000025_include.yaml b/specification/examples/responses/GET_RelatedPerson/verify_relationship_9000000025_include.yaml index fa4bcd2b..b205055b 100644 --- a/specification/examples/responses/GET_RelatedPerson/verify_relationship_9000000025_include.yaml +++ b/specification/examples/responses/GET_RelatedPerson/verify_relationship_9000000025_include.yaml @@ -63,5 +63,5 @@ VerifyRelationship9000000025Include: url: https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson?patient:identifier=9000000025&identifier=9000000017&_include=RelatedPerson:patient resourceType: Bundle timestamp: '2024-01-01T00:00:00+00:00' - total: 2 + total: 1 type: searchset From dcfbe20f91b780cffcb5ae4a9e1468f5b3ed5e24 Mon Sep 17 00:00:00 2001 From: LeoKHoward <38526889+LeoKHoward@users.noreply.github.com> Date: Thu, 17 Jul 2025 12:02:39 +0100 Subject: [PATCH 2/2] NPA-5299: Update Postman URL --- specification/validated-relationships-service-api.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/validated-relationships-service-api.yaml b/specification/validated-relationships-service-api.yaml index ce7e0044..5b9f58ee 100644 --- a/specification/validated-relationships-service-api.yaml +++ b/specification/validated-relationships-service-api.yaml @@ -141,7 +141,7 @@ info: * only covers a limited set of scenarios * is open access, so does not allow you to test authorisation - [Run In Postman](https://god.gw.postman.com/run-collection/46399153-7043e3fb-54f4-41ea-88f7-43e00a6c00dd?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D46399153-7043e3fb-54f4-41ea-88f7-43e00a6c00dd%26entityType%3Dcollection%26workspaceId%3D98276349-4ae9-4592-84a2-01459d13edc7)) + [Run In Postman](https://god.gw.postman.com/run-collection/46399153-73a3846c-092a-44a1-940f-18736fb1f411?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D46399153-73a3846c-092a-44a1-940f-18736fb1f411%26entityType%3Dcollection%26workspaceId%3D34c06bc9-c5de-4206-b931-9ee51c810dbb)) ### Integration testing