[CDAPI-100]: Fixes to allow schema, accpetance and status endpoints to work remotely

Author: nhsd-rebecca-flynn

pathology-api/openapi.yaml

@@ -32,6 +32,8 @@ paths:
                   enum:
                     - Bundle
                   description: FHIR resource type
+                meta:
+                  $ref: "#/components/schemas/meta"
                 type:
                   type: string
                   enum:
@@ -75,6 +77,8 @@ paths:
                                   - PractitionerRole
                                   - Organization
                                 example: Patient
+                              meta:
+                                $ref: "#/components/schemas/meta"
       responses:
         '200':
           description: Successful response
@@ -147,6 +151,15 @@ components:
       app-level3:
         $ref: https://proxygen.ptl.api.platform.nhs.uk/components/securitySchemes/app-level3
   schemas:
+    meta:
+      type: object
+      properties:
+        profile:
+          type: array
+          items:
+            type: string
+        versionId:
+          type: string
     CompositionResource:
       type: object
       required:
@@ -159,6 +172,8 @@ components:
           enum:
             - Composition
           example: Composition
+        meta:
+          $ref: "#/components/schemas/meta"
         subject:
           type: object
           required:

pathology-api/tests/acceptance/features/bundle_endpoint.feature

@@ -1,3 +1,4 @@
+@status_merged_auth_headers
 Feature: pathology Bundle API
   As an API consumer
   I want to interact with the pathology API

pathology-api/tests/acceptance/steps/bundle_endpoint_steps.py

@@ -17,8 +17,9 @@ def step_api_is_running(client: Client) -> None:
         client: Test client from conftest.py
     """
     response = client.send_without_payload(path="_status", request_method="GET")
-    assert response.text == "OK"
+
     assert response.status_code == 200
+    assert response.text.__contains__('"outcome":"OK"')
 
 
 @when("I send a valid Bundle to the Pathology API")

pathology-api/tests/conftest.py

@@ -161,7 +161,7 @@ def _send(
                 )
 
 
-@pytest.fixture
+@pytest.fixture(scope="module")
 def base_url() -> str:
     """Retrieves the base URL of the currently deployed application."""
     return _fetch_env_variable("BASE_URL", str)
@@ -180,16 +180,30 @@ def client(request: pytest.FixtureRequest, base_url: str) -> Client:
     if env == "local":
         return LocalClient(lambda_url=base_url)
     elif env == "remote":
-        auth_headers = request.getfixturevalue("nhsd_apim_auth_headers")
-        proxy_url = request.getfixturevalue("nhsd_apim_proxy_url")
-        return RemoteClient(
-            api_url=proxy_url,
-            auth_headers=auth_headers,
-        )
+        return _create_remote_client(request)
     else:
         raise ValueError(f"Unknown env: {env}")
 
 
+def _create_remote_client(request: pytest.FixtureRequest) -> RemoteClient:
+    """Create a RemoteClient with appropriate auth headers based on test markers."""
+    proxy_url = request.getfixturevalue("nhsd_apim_proxy_url")
+    default_auth_headers = request.getfixturevalue("nhsd_apim_auth_headers")
+
+    has_status_marker = request.node.get_closest_marker("status_auth_headers")
+    has_merged_marker = request.node.get_closest_marker("status_merged_auth_headers")
+
+    if has_merged_marker:
+        status_headers = request.getfixturevalue("status_endpoint_auth_headers")
+        auth_headers = default_auth_headers | status_headers
+    elif has_status_marker:
+        auth_headers = request.getfixturevalue("status_endpoint_auth_headers")
+    else:
+        auth_headers = default_auth_headers
+
+    return RemoteClient(api_url=proxy_url, auth_headers=auth_headers)
+
+
 def _fetch_env_variable[T](name: str, _: type[T]) -> T:
     value = os.getenv(name)
     if not value:

pathology-api/tests/integration/test_endpoints.py

@@ -246,10 +246,11 @@ def test_invalid_payload_returns_error(
 
 
 class TestStatusEndpoint:
+    @pytest.mark.status_auth_headers
     def test_status_returns_200(self, client: Client) -> None:
         response = client.send_without_payload(request_method="GET", path="_status")
         assert response.status_code == 200
-        assert response.headers["Content-Type"] == "text/plain"
+        assert response.headers["Content-Type"] == "application/json"
 
         response_data = response.text
-        assert response_data == "OK"
+        assert response_data.__contains__('"outcome":"OK"')