Skip to content

Commit 61f3844

Browse files
committed
NRL-000 Merge remote-tracking branch 'origin' into feature/jale13-turn-dev-reporting-on
2 parents fd193cd + 543df9d commit 61f3844

File tree

39 files changed

+770
-315
lines changed

39 files changed

+770
-315
lines changed

api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_read_document_reference_not_found(repository: DocumentPointerRepository
6767
{
6868
"code": "NO_RECORD_FOUND",
6969
"display": "No record found",
70-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
70+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
7171
}
7272
]
7373
},
@@ -101,7 +101,7 @@ def test_read_document_reference_missing_id():
101101
{
102102
"code": "INVALID_PARAMETER",
103103
"display": "Invalid parameter",
104-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
104+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
105105
}
106106
]
107107
},
@@ -147,7 +147,7 @@ def test_read_document_reference_unauthorised_for_type(
147147
{
148148
"code": "ACCESS DENIED",
149149
"display": "Access has been denied to process this request",
150-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
150+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
151151
}
152152
]
153153
},
@@ -192,7 +192,7 @@ def test_document_reference_invalid_json(repository: DocumentPointerRepository):
192192
{
193193
"code": "INTERNAL_SERVER_ERROR",
194194
"display": "Unexpected internal server error",
195-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
195+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
196196
}
197197
]
198198
},

api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ def test_search_document_reference_missing_nhs_number(
576576
{
577577
"code": "INVALID_PARAMETER",
578578
"display": "Invalid parameter",
579-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
579+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
580580
}
581581
]
582582
},
@@ -620,7 +620,7 @@ def test_search_document_reference_invalid_nhs_number(
620620
{
621621
"code": "INVALID_NHS_NUMBER",
622622
"display": "Invalid NHS number",
623-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
623+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
624624
}
625625
]
626626
},
@@ -663,7 +663,7 @@ def test_search_document_reference_invalid_type(repository: DocumentPointerRepos
663663
{
664664
"code": "INVALID_CODE_SYSTEM",
665665
"display": "Invalid code system",
666-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
666+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
667667
}
668668
]
669669
},
@@ -708,7 +708,7 @@ def test_search_document_reference_invalid_category(
708708
{
709709
"code": "INVALID_CODE_SYSTEM",
710710
"display": "Invalid code system",
711-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
711+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
712712
}
713713
]
714714
},
@@ -803,7 +803,7 @@ def test_search_document_reference_invalid_json(
803803
{
804804
"code": "INTERNAL_SERVER_ERROR",
805805
"display": "Unexpected internal server error",
806-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
806+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
807807
}
808808
]
809809
},

api/consumer/searchPostDocumentReference/tests/test_search_post_document_reference_consumer.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ def test_search_post_document_reference_missing_nhs_number(
330330
{
331331
"code": "MESSAGE_NOT_WELL_FORMED",
332332
"display": "Message not well formed",
333-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
333+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
334334
}
335335
]
336336
},
@@ -374,7 +374,7 @@ def test_search_post_document_reference_invalid_nhs_number(
374374
{
375375
"code": "INVALID_NHS_NUMBER",
376376
"display": "Invalid NHS number",
377-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
377+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
378378
}
379379
]
380380
},
@@ -421,7 +421,7 @@ def test_search_post_document_reference_invalid_type(
421421
{
422422
"code": "INVALID_CODE_SYSTEM",
423423
"display": "Invalid code system",
424-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
424+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
425425
}
426426
]
427427
},
@@ -468,7 +468,7 @@ def test_search_document_reference_invalid_category(
468468
{
469469
"code": "INVALID_CODE_SYSTEM",
470470
"display": "Invalid code system",
471-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
471+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
472472
}
473473
]
474474
},
@@ -567,7 +567,7 @@ def test_search_post_document_reference_invalid_json_adds_operation_outcome(
567567
{
568568
"code": "INTERNAL_SERVER_ERROR",
569569
"display": "Unexpected internal server error",
570-
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
570+
"system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
571571
}
572572
]
573573
},

0 commit comments

Comments
 (0)