[GPCAPIM-397] Set up INT test provider requests

.vscode/cspell-dictionary.txt

@@ -34,6 +34,7 @@ dpkg
 DSTU
 eamodio
 errstr
+EMIS
 Farsley
 fhir
 getfixturevalue

Makefile

@@ -77,6 +77,9 @@ deploy: clean build # Build project artefact and deploy locally @Pipeline
 deploy-%: # Build project artefact and deploy locally as specified environment - mandatory: name=[name of the environment, e.g. 'dev'] @Pipeline
 	make env-$* deploy
 
+deploy-%: # Build project artefact and deploy locally as specified environment - mandatory: name=[name of the environment, e.g. 'dev'] @Pipeline
+	make env-$* deploy
+
 clean:: stop # Clean-up project resources (main) @Operations
 	@echo "Removing Gateway API container..."
 	@$(docker) rm gateway-api || echo "No Gateway API container currently exists."

bruno/gateway-api/collections/Steel_Thread/environments/INT.yml

@@ -0,0 +1,8 @@
+name: INT
+variables:
+  - name: nhs_number
+    value: "9692140466"
+  - name: from_ods
+    value: A12345
+  - name: base_url
+    value: http://localhost:5000

gateway-api/pyproject.toml

@@ -65,7 +65,7 @@ dev = [
 [tool.mypy]
 strict = true
 
-[tool.pytest.ini_options]
+[tool.pytest]
 bdd_features_base_dir = "tests/acceptance/features"
 markers = [
     "status_auth_headers",

gateway-api/src/gateway_api/provider/client.py

@@ -140,10 +140,12 @@
             headers=headers,
             data=body,
             timeout=TIMEOUT,
+            verify=False,  # TODO: change this.
         )
         log_details = {
             "description": "GPProvider FHIR API response received",
             "status_code": str(response.status_code),
+            "body": response.text,  # TODO: Remove me before putting up for review
         }
         _logger.info(log_details)
 

gateway-api/src/gateway_api/provider/test_client.py

@@ -41,7 +41,7 @@ def _fake_post(
         url: str,
         headers: CaseInsensitiveDict[str],
         data: str,
-        timeout: int,  # NOQA ARG001 (unused in stub)
+        **_kwargs: str,
     ) -> Response:
         """A fake requests.post implementation."""
 

gateway-api/stubs/stubs/data/patients/emis_int_test_9692140466.json

@@ -0,0 +1,83 @@
+{
+        "resourceType": "Patient",
+        "id": "593C97B5-7B99-4326-9140-B329CC03A0D1",
+        "meta": {
+          "versionId": "1533356236474679227",
+          "profile": [
+            "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-Patient-1"
+          ]
+        },
+        "extension": [
+          {
+            "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-CareConnect-GPC-RegistrationDetails-1",
+            "extension": [
+              {
+                "url": "preferredBranchSurgery",
+                "valueReference": {
+                  "reference": "Location/EB3994A6-5A87-4B53-A414-913137072F57"
+                }
+              }
+            ]
+          }
+        ],
+        "identifier": [
+          {
+            "extension": [
+              {
+                "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-CareConnect-GPC-NHSNumberVerificationStatus-1",
+                "valueCodeableConcept": {
+                  "coding": [
+                    {
+                      "system": "https://fhir.nhs.uk/STU3/CodeSystem/CareConnect-NHSNumberVerificationStatus-1",
+                      "code": "01",
+                      "display": "Number present and verified"
+                    }
+                  ],
+                  "text": "Number present and verified"
+                }
+              }
+            ],
+            "system": "https://fhir.nhs.uk/Id/nhs-number",
+            "value": "9692140466"
+          }
+        ],
+        "name": [
+          {
+            "use": "official",
+            "family": "Egan",
+            "given": [
+              "Lester"
+            ],
+            "prefix": [
+              "Mr"
+            ]
+          }
+        ],
+        "gender": "male",
+        "birthDate": "1958-02-02",
+        "address": [
+          {
+            "use": "home",
+            "type": "physical",
+            "line": [
+              "Cornerways",
+              "Leek Hill",
+              "Winterton"
+            ],
+            "city": "Scunthorpe",
+            "district": "S Humberside",
+            "postalCode": "DN15 9SR"
+          }
+        ],
+    "generalPractitioner": [
+        {
+            "id": "1",
+            "type": "Organization",
+            "identifier": {
+                "system": "https://fhir.nhs.uk/Id/ods-organization-code",
+                "value": "EMIS_INT_ODS_CODE",
+                "period": {"start": "2020-01-01", "end": "9999-12-31"}
+            }
+        }
+    ]
+}

gateway-api/stubs/stubs/data/patients/patients.py

@@ -27,3 +27,4 @@ def load_patient(filename: str) -> dict[str, Any]:
     )
     ALICE_JONES_9999999999 = load_patient("alice_jones_9999999999.json")
     ORANGE_BOX_TRIGGER_9690937278 = load_patient("orange_box_trigger_9690937278.json")
+    EMIS_INT_TEST_9692140466 = load_patient("emis_int_test_9692140466.json")

gateway-api/stubs/stubs/pds/stub.py

@@ -53,6 +53,7 @@ def __init__(self, strict_headers: bool = True) -> None:
             ("9000000012", Patients.INDUCE_PROVIDER_ERROR_9000000012),
             ("9000000013", Patients.BLANK_ENDPOINT_SDS_RESULT_9000000013),
             ("9690937278", Patients.ORANGE_BOX_TRIGGER_9690937278),
+            ("9692140466", Patients.EMIS_INT_TEST_9692140466),
         ]
         for nhs_number, patient in test_patients:
             self.upsert_patient(

gateway-api/stubs/stubs/sds/stub.py

@@ -350,7 +350,7 @@ def _seed_default_devices(self) -> None:
             {
                 "org_ods": "CONSUMER",
                 "device_id": "C0C0E921-92CA-4A88-A550-2DBB36F703AF",
-                "asid": "asid_CONS",
+                "asid": "210987654321",
                 "display": "Example Consumer Organisation",
             },
             {
@@ -383,6 +383,13 @@ def _seed_default_devices(self) -> None:
                 "asid": "918999198738",
                 "display": "ODS/ASID triggering Orange Box",
             },
+            {
+                "org_ods": "EMIS_INT_ODS_CODE",
+                "party_key": "EMIS_INT_ODS_CODE-0000809",
+                "device_id": "5CF77971-5732-43C6-959B-90F0DB6E49AD",
+                "asid": "200000000948",
+                "display": "GP with endpoint to get to EMIS INT TEST",
+            },
         ]
 
         # Seed each device for both interaction IDs so the stub works whether
@@ -419,7 +426,7 @@ def _seed_default_endpoints(self) -> None:
             {
                 "org_ods": "CONSUMER",
                 "endpoint_id": "E1E1E921-92CA-4A88-A550-2DBB36F703AF",
-                "asid": "asid_CONS",
+                "asid": "210987654321",
                 "address": "https://consumer.example.com/fhir",
             },
             {
@@ -434,6 +441,13 @@ def _seed_default_endpoints(self) -> None:
                 "asid": "918999198738",
                 "address": "https://orange.testlab.nhs.uk/B82617/STU3/1/gpconnect/structured/fhir/",
             },
+            {
+                "org_ods": "EMIS_INT_ODS_CODE",
+                "party_key": "EMIS_INT_ODS_CODE-0000809",
+                "endpoint_id": "BD635368-97E0-4935-A0D7-55CFDE574C93",
+                "asid": "200000000948",
+                "address": "https://gpcassurance-b86047.emis.thirdparty.nhs.uk/A82038/STU3/1/GPConnect/structured",
+            },
         ]
 
         # Seed each endpoint for both interaction IDs so the stub works whether

gateway-api/tests/README.md

@@ -43,6 +43,7 @@ Use the following commands to create the appropriate `.env.test` file for the ta
 * `make env-test-ci` to write a `.env.test` file for testing a locally deployed application, from outside the dev container.
 * `make env-test-pr-<pr number>` to write a `.env.test` file for testing an application deployed behind a PR proxy.
 * `make env-test-alpha-int` to write a `.env.test` file for testing an application deployed to the "alpha integration" environment.
+* `make env-test-int` to write a `.env.test` file for testing an application that sends requests to PDS, SDS and Provider integration environments.
 
 _Note: Unit tests require the `.env` file, as these tests do not test a deployed application`_
 

gateway-api/tests/conftest.py

@@ -1,10 +1,10 @@
 """Pytest configuration and shared fixtures for gateway API tests."""
 
-import copy
 import os
 from collections.abc import Callable
 from datetime import timedelta
 from typing import Any, cast
+from uuid import uuid4
 
 import pytest
 import requests
@@ -13,7 +13,7 @@
 DEFAULT_REQUEST_HEADERS = {
     "Content-Type": "application/fhir+json",
     "Ods-from": "CONSUMER",
-    "Ssp-TraceID": "test-trace-id",
+    "Ssp-TraceID": str(uuid4()),
 }
 
 
@@ -80,8 +80,25 @@ def send_health_check(self) -> requests.Response:
 
 
 @pytest.fixture
-def simple_request_payload() -> dict[str, Any]:
-    return copy.deepcopy(SIMPLE_PAYLOAD)
+def nhs_number() -> str:
+    return _fetch_env_variable("TEST_NHS_NUMBER", str)
+
+
+@pytest.fixture
+def simple_request_payload(nhs_number: str) -> dict[str, Any]:
+    payload = {
+        "resourceType": "Parameters",
+        "parameter": [
+            {
+                "name": "patientNHSNumber",
+                "valueIdentifier": {
+                    "system": FHIRSystem.NHS_NUMBER,
+                    "value": nhs_number,
+                },
+            },
+        ],
+    }
+    return payload
 
 
 @pytest.fixture

gateway-api/tests/contract/stub/test_sds_stub_contract.py

@@ -238,22 +238,12 @@ def test_endpoint_bundle_matches_expected_response(
         assert body["type"] == "searchset"
         assert body["total"] == len(body["entry"])
 
-        assert len(body["entry"]) == 4
-        endpoint_ids = [
-            "E0E0E921-92CA-4A88-A550-2DBB36F703AF",
-            "E1E1E921-92CA-4A88-A550-2DBB36F703AF",
-            "E2E2E921-92CA-4A88-A550-2DBB36F703AF",
-            "E3E3E921-92CA-4A88-A550-2DBB36F703AF",
-        ]
-        for i in range(len(endpoint_ids)):
-            entry = body["entry"][i]
-
-            endpoint_id = endpoint_ids[i]
+        for entry in body["entry"]:
+            endpoint_id = entry["resource"]["id"]
             assert (
                 entry["fullUrl"]
                 == f"https://sandbox.api.service.nhs.uk/spine-directory/FHIR/R4/Endpoint/{endpoint_id}"
             )
-            assert entry["resource"]["id"] == endpoint_id
             assert entry["search"]["mode"] == "match"
 
     def test_x_correlation_id_echoed_back_when_provided(