Improve loading expected responses.

Author: davidhamill1-nhs

gateway-api/tests/integration/data/alice_jones_9999999999.json

@@ -0,0 +1,56 @@
+{
+  "resourceType": "Bundle",
+  "type": "collection",
+  "meta": {
+    "profile": [
+      "https://fhir.nhs.uk/STU3/StructureDefinition/GPConnect-StructuredRecord-Bundle-1"
+    ]
+  },
+  "entry": [
+    {
+      "resource": {
+        "resourceType": "Patient",
+        "id": "9999999999",
+        "meta": {
+          "versionId": "1",
+          "lastUpdated": "2020-01-01T00:00:00Z"
+        },
+        "identifier": [
+          {
+            "system": "https://fhir.nhs.uk/Id/nhs-number",
+            "value": "9999999999"
+          }
+        ],
+        "name": [
+          {
+            "use": "official",
+            "family": "Jones",
+            "given": [
+              "Alice"
+            ],
+            "period": {
+              "start": "1900-01-01",
+              "end": "9999-12-31"
+            }
+          }
+        ],
+        "gender": "female",
+        "birthDate": "1980-01-01",
+        "generalPractitioner": [
+          {
+            "id": "1",
+            "type": "Organization",
+            "identifier": {
+              "system": "https://fhir.nhs.uk/Id/ods-organization-code",
+              "value": "A12345",
+              "period": {
+                "start": "2020-01-01",
+                "end": "9999-12-31"
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}

gateway-api/tests/integration/data/emis_int_test_9692140466.json

@@ -1,6 +1,5 @@
 {
   "resourceType": "Bundle",
-  "id": "c55adcd2-17e4-4093-8d31-742e54adee5e",
   "meta": {
     "profile": [
       "https://fhir.nhs.uk/STU3/StructureDefinition/GPConnect-StructuredRecord-Bundle-1"

gateway-api/tests/integration/test_get_structured_record.py

@@ -1,12 +1,12 @@
 """Integration tests for the gateway API using pytest."""
 
 import json
+import os
 from collections.abc import Callable
 from typing import Any, cast
 
 import pytest
 from requests import Response
-from stubs.data.bundles import Bundles
 
 from tests.conftest import Client
 
@@ -367,20 +367,18 @@ def requester(nhs_number: str) -> Response:
     def expected_response_message_for_simple_request(
         self, nhs_number: str
     ) -> dict[str, Any]:
-        # TODO: Do this better.
-        if nhs_number == "9999999999":
-            return Bundles.ALICE_JONES_9999999999
-        elif nhs_number == "9692140466":
-            with open("tests/integration/data/emis_int_test_9692140466.json") as f:
-                expected_response = cast(
-                    "dict[str, Any]", json.load(f)
-                )  # TODO: Avoid cast here
-            del expected_response["id"]
-            return expected_response
-        else:
-            raise ValueError(
-                f"No expected response message defined for nhs_number {nhs_number}"
-            )
+        test_patient_file_path = self.find_test_patient_file(nhs_number)
+        with open(test_patient_file_path) as f:
+            expected_response = cast("dict[str, Any]", json.load(f))
+        return expected_response
+
+    @staticmethod
+    def find_test_patient_file(nhs_number: str) -> str:
+        filenames = os.listdir("tests/integration/data/")
+        for filename in filenames:
+            if nhs_number in filename:
+                return "tests/integration/data/" + filename
+        raise ValueError(f"No test patient file defined for nhs_number {nhs_number}")
 
     @staticmethod
     def strip_randomized_fields(message: dict[str, Any]) -> None: