Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ meta {
post {
url: {{base_url}}/patient/$gpc.getstructuredrecord
body: json
auth: inherit
auth: none
}

body:json {
Expand All @@ -18,7 +18,7 @@ body:json {
"name": "patientNHSNumber",
"valueIdentifier": {
"system": "https://fhir.nhs.uk/Id/nhs-number",
"value": "9999999999"
"value": "{{nhs_number}}"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions bruno/gateway-api/collections/Steel_Thread/collection.bru
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
headers {
Ssp-TraceID: test-teace-id
ODS-from: test-ods-code
Ssp-TraceID: d525685c-1baf-41f0-952b-9c588a83ec96
ODS-from: S44444
}

auth {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ vars {
base_url: https://{{apigee_env}}.api.service.nhs.uk/{{proxy_base_path}}
apigee_env: internal-dev
proxy_base_path: clinical-data-gateway-api-poc-pr-{{process.env.PR_NUMBER}}
nhs_number: 9999999999
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vars {
base_url: http://localhost:5000
nhs_number: 9999999999
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
vars {
base_url: http://localhost:5000
nhs_number: 9690937278
}
1 change: 1 addition & 0 deletions gateway-api/src/fhir/stu3/elements/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class Parameters(Resource, resource_type="Parameters"):
class Parameter(ABC):
"""A FHIR STU3 Parameter resource."""

name: Annotated[str, Field(frozen=True)]
valueIdentifier: Annotated[PatientIdentifier, Field(frozen=True)]

parameter: Annotated[list[Parameter], Field(frozen=True, min_length=1)]
10 changes: 9 additions & 1 deletion gateway-api/src/fhir/stu3/elements/test_elements.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class TestParameters:
def test_create(self) -> None:
"""Test creating a Parameters resource."""
parameter = Parameters.Parameter(
name="patientNHSNumber",
valueIdentifier=PatientIdentifier(
value="9000000009",
),
Expand All @@ -26,11 +27,13 @@ def test_create(self) -> None:
def test_create_with_multiple_parameters(self) -> None:
"""Test creating a Parameters resource with multiple parameters."""
param_a = Parameters.Parameter(
name="patientNHSNumber",
valueIdentifier=PatientIdentifier(
value="9000000009",
),
)
param_b = Parameters.Parameter(
name="patientNHSNumber",
valueIdentifier=PatientIdentifier(
value="9000000017",
),
Expand Down Expand Up @@ -143,6 +146,7 @@ def test_model_dump_json_roundtrip(self) -> None:
params = Parameters.create(
parameter=[
Parameters.Parameter(
name="patientNHSNumber",
valueIdentifier=PatientIdentifier(
value="9000000009",
),
Expand All @@ -164,6 +168,7 @@ def test_is_frozen(self) -> None:
params = Parameters.create(
parameter=[
Parameters.Parameter(
name="patientNHSNumber",
valueIdentifier=PatientIdentifier(
value="9000000009",
),
Expand All @@ -181,7 +186,9 @@ def test_create(self) -> None:
identifier = PatientIdentifier(
value="9000000009",
)
parameter = Parameters.Parameter(valueIdentifier=identifier)
parameter = Parameters.Parameter(
name="patientNHSNumber", valueIdentifier=identifier
)

assert parameter.valueIdentifier == identifier, (
"valueIdentifier should match the provided identifier"
Expand All @@ -196,6 +203,7 @@ def test_create(self) -> None:
def test_is_frozen(self) -> None:
"""Test that Parameter fields are frozen (immutable)."""
parameter = Parameters.Parameter(
name="patientNHSNumber",
valueIdentifier=PatientIdentifier(
value="9000000009",
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"id": "1",
"type": "Organization",
"identifier": {
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
"value": "S55555",
"period": {"start": "2020-01-01", "end": "9999-12-31"}
}
Expand Down
Loading