Skip to content

NRL-505 All business validation errors are now 422 Unprocessable Entity #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
axelkrastek1-nhs merged 2 commits into from
May 1, 2025
Merged

NRL-505 All business validation errors are now 422 Unprocessable Entity #891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46708f9
NRL-505 All business validation errors are now 422 Unprocessable Entity
axelkrastek1-nhs Apr 24, 2025
05b54c3
NRL-505 Revert to previous error response as it is part of the query
axelkrastek1-nhs Apr 25, 2025
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
2 changes: 1 addition & 1 deletion api/consumer/countDocumentReference/count_document_reference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def handler(
logger.log(
LogReference.CONCOUNT001, subject_identifier=params.subject_identifier
)
return SpineErrorResponse.INVALID_IDENTIFIER_VALUE(
return SpineErrorResponse.UNPROCESSABLE_ENTITY(
diagnostics="Invalid NHS number provided in the query parameters",
expression="subject:identifier",
)
Expand Down
8 changes: 4 additions & 4 deletions api/consumer/countDocumentReference/tests/test_count_document_reference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def test_count_document_reference_invalid_nhs_number():
body = result.pop("body")

assert result == {
"statusCode": "400",
"statusCode": "422",
"headers": default_response_headers(),
"isBase64Encoded": False,
}
Expand All @@ -111,13 +111,13 @@ def test_count_document_reference_invalid_nhs_number():
"issue": [
{
"severity": "error",
"code": "invalid",
"code": "business-rule",
"details": {
"coding": [
{
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
"code": "INVALID_IDENTIFIER_VALUE",
"display": "Invalid identifier value",
"code": "UNPROCESSABLE_ENTITY",
"display": "Unprocessable Entity",
}
]
},
Expand Down
9 changes: 5 additions & 4 deletions api/producer/createDocumentReference/create_document_reference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def _check_permissions(
ods_code_parts=metadata.ods_code_parts,
custodian_parts=custodian_parts,
)
return SpineErrorResponse.BAD_REQUEST(
return SpineErrorResponse.UNPROCESSABLE_ENTITY(
diagnostics="The custodian of the provided DocumentReference does not match the expected ODS code for this organisation",
expression="custodian.identifier.value",
)
Expand Down Expand Up @@ -201,10 +201,11 @@ def _raise_operation_outcome_error(diagnostics, idx):
"""
raise OperationOutcomeError(
severity="error",
code="invalid",
details=SpineErrorConcept.from_code("BAD_REQUEST"),
code="business-rule",
details=SpineErrorConcept.from_code("UNPROCESSABLE_ENTITY"),
diagnostics=diagnostics,
expression=[f"relatesTo[{idx}].target.identifier.value"],
status_code="422",
)


Expand Down Expand Up @@ -236,7 +237,7 @@ def handler(

if not result.is_valid:
logger.log(LogReference.PROCREATE002)
return Response.from_issues(issues=result.issues, statusCode="400")
return Response.from_issues(issues=result.issues, statusCode="422")

core_model = _create_core_model(result.resource, metadata)
if error_response := _check_permissions(core_model, metadata):
Expand Down
Loading