Skip to content

Commit 74d2bc0

Browse files
JackPlowmanJackPlowman
committed
Hard code expected changes
1 parent 01c5ced commit 74d2bc0

File tree

8 files changed

+20
-61
lines changed

8 files changed

+20
-61
lines changed

‎proxies/sandbox/apiproxy/policies/AssignMessage.AddProxyURL.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎proxies/sandbox/apiproxy/targets/sandbox.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
<Step>
1212
<Name>FlowCallout.ApplyRateLimiting</Name>
1313
</Step>
14-
<Step>
15-
<Name>AddProxyURL</Name>
16-
</Step>
1714
<Response>
1815
<Step>
1916
<Name>AssignMessage.AddCors</Name>

‎sandbox/api/app.py‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from flask import Flask, request
55

6-
from .utils import check_for_errors, get_response, get_error
6+
from .utils import check_for_errors, get_response
77

88
app = Flask(__name__)
99
basicConfig(level=INFO, format="%(asctime)s - %(message)s")
@@ -28,9 +28,8 @@ def get_related_persons() -> Union[dict, tuple]:
2828
Returns:
2929
Union[dict, tuple]: Response for GET /RelatedPerson
3030
"""
31-
try:
32-
proxy_url = request.args.get("Proxy-URL")
3331

32+
try:
3433
# Check Headers
3534
if errors := check_for_errors(request):
3635
return errors
@@ -43,31 +42,27 @@ def get_related_persons() -> Union[dict, tuple]:
4342
):
4443
# Request with identifier, patient and _include=patient
4544
return get_response(
46-
proxy_url,
47-
"./api/responses/GET_RelatedPerson/identifier_and_patient_identifier_include.json",
45+
"./api/responses/GET_RelatedPerson/identifier_and_patient_identifier_include.json"
4846
)
4947
elif request.args.get("identifier") and request.args.get("patient"):
5048
# Request with identifier and patient
5149
return get_response(
52-
proxy_url,
53-
"./api/responses/GET_RelatedPerson/identifier_and_patient_identifier.json",
50+
"./api/responses/GET_RelatedPerson/identifier_and_patient_identifier.json"
5451
)
5552
elif (
5653
request.args.get("identifier")
5754
and request.args.get("_include") == "RelatedPerson:patient"
5855
):
5956
# Request with identifier and _include=patient
6057
return get_response(
61-
proxy_url, "./api/responses/GET_RelatedPerson/identifier_include.json"
58+
"./api/responses/GET_RelatedPerson/identifier_include.json"
6259
)
6360
elif request.args.get("identifier"):
6461
# Request with identifier
65-
return get_response(
66-
proxy_url, "./api/responses/GET_RelatedPerson/identifier.json"
67-
)
62+
return get_response("./api/responses/GET_RelatedPerson/identifier.json")
6863
else:
6964
raise ValueError("Invalid request")
7065

7166
except Exception as e:
7267
logger.error(e)
73-
return get_error("./api/responses/internal_server_error.json"), 500
68+
return get_response("./api/responses/internal_server_error.json"), 500

‎sandbox/api/responses/GET_RelatedPerson/identifier.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"entry": [
33
{
4-
"fullUrl": "{{proxy_url}}/FHIR/R4/RelatedPerson/ABCD1234",
4+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/ABCD1234",
55
"resource": {
66
"id": "ABCD1234",
77
"identifier": [

‎sandbox/api/responses/GET_RelatedPerson/identifier_and_patient_identifier.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"entry": [
33
{
4-
"fullUrl": "{{proxy_url}}/FHIR/R4/RelatedPerson/BE974742",
4+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/BE974742",
55
"resource": {
66
"id": "BE974742",
77
"identifier": [
@@ -33,7 +33,7 @@
3333
"search": { "mode": "match" }
3434
},
3535
{
36-
"fullUrl": "{{proxy_url}}/FHIR/R4/RelatedPerson/A3CC67E2",
36+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/A3CC67E2",
3737
"resource": {
3838
"id": "A3CC67E2",
3939
"identifier": [

‎sandbox/api/responses/GET_RelatedPerson/identifier_and_patient_identifier_include.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"entry": [
33
{
4-
"fullUrl": "{{proxy_url}}/FHIR/R4/Patient/3456789101",
4+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/Patient/3456789101",
55
"resource": {
66
"id": "3456789101",
77
"birthDate": "2017-09-23",
@@ -26,7 +26,7 @@
2626
"search": { "mode": "include" }
2727
},
2828
{
29-
"fullUrl": "{{proxy_url}}/FHIR/R4/RelatedPerson/BE974742",
29+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/BE974742",
3030
"resource": {
3131
"id": "BE974742",
3232
"identifier": [
@@ -58,7 +58,7 @@
5858
"search": { "mode": "match" }
5959
},
6060
{
61-
"fullUrl": "{{proxy_url}}/FHIR/R4/Patient/5678910123",
61+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/Patient/5678910123",
6262
"resource": {
6363
"id": "5678910123",
6464
"birthDate": "2018-04-27",
@@ -83,7 +83,7 @@
8383
"search": { "mode": "include" }
8484
},
8585
{
86-
"fullUrl": "{{proxy_url}}/FHIR/R4/RelatedPerson/A3CC67E2",
86+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/A3CC67E2",
8787
"resource": {
8888
"id": "A3CC67E2",
8989
"identifier": [

‎sandbox/api/responses/GET_RelatedPerson/identifier_include.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"entry": [
33
{
4-
"fullUrl": "{{proxy_url}}/FHIR/R4/Patient/0987654321",
4+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/Patient/0987654321",
55
"resource": {
66
"id": "0987654321",
77
"birthDate": "2014-09-21",
@@ -26,7 +26,7 @@
2626
"search": { "mode": "include" }
2727
},
2828
{
29-
"fullUrl": "{{proxy_url}}/FHIR/R4/RelatedPerson/ABCD1234",
29+
"fullUrl": "https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/ABCD1234",
3030
"resource": {
3131
"id": "ABCD1234",
3232
"identifier": [

‎sandbox/api/utils.py‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,8 @@
44
from flask import request
55

66

7-
def get_response(proxy_url: str, file_name: str) -> dict:
8-
"""Get response from file. Expected file content is a JSON.
9-
10-
Args:
11-
proxy_url (str): Proxy URL
12-
file_name (str): File name
13-
14-
Returns:
15-
dict: Response from file
16-
"""
17-
with open(file_name, "r") as file:
18-
file_contents = load(file)
19-
return file_contents.replace("{{proxy_url}}", proxy_url)
20-
21-
22-
def get_error(file_name: str) -> dict:
23-
"""Get response from file. Expected file content is a JSON.
24-
25-
Args:
26-
file_name (str): File name
27-
28-
Returns:
29-
dict: Response from file
30-
"""
7+
def get_response(file_name: str) -> dict:
8+
"""Get response from file. Expected file content is a JSON."""
319
with open(file_name, "r") as file:
3210
return load(file)
3311

@@ -43,14 +21,14 @@ def check_for_errors(request: request) -> Optional[tuple]:
4321
"""
4422
if not request.args.get("identifier"):
4523
return (
46-
get_error(
24+
get_response(
4725
"./api/responses/GET_RelatedPerson/bad_request_identifier_missing.json"
4826
),
4927
400,
5028
)
5129
elif request.args.get("identifier") and len(request.args.get("identifier")) != 10:
5230
return (
53-
get_error(
31+
get_response(
5432
"./api/responses/GET_RelatedPerson/bad_request_identifier_not_as_expected.json"
5533
),
5634
400,

0 commit comments

Comments
 (0)