NRL-505 Revert to previous error response as it is part of the query

Author: axelkrastek1-nhs

api/consumer/countDocumentReference/count_document_reference.py

@@ -29,7 +29,7 @@ def handler(
         logger.log(
             LogReference.CONCOUNT001, subject_identifier=params.subject_identifier
         )
-        return SpineErrorResponse.UNPROCESSABLE_ENTITY(
+        return SpineErrorResponse.INVALID_IDENTIFIER_VALUE(
             diagnostics="Invalid NHS number provided in the query parameters",
             expression="subject:identifier",
         )

api/consumer/countDocumentReference/tests/test_count_document_reference.py

@@ -100,7 +100,7 @@ def test_count_document_reference_invalid_nhs_number():
     body = result.pop("body")
 
     assert result == {
-        "statusCode": "422",
+        "statusCode": "400",
         "headers": default_response_headers(),
         "isBase64Encoded": False,
     }
@@ -111,13 +111,13 @@ def test_count_document_reference_invalid_nhs_number():
         "issue": [
             {
                 "severity": "error",
-                "code": "business-rule",
+                "code": "invalid",
                 "details": {
                     "coding": [
                         {
                             "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
-                            "code": "UNPROCESSABLE_ENTITY",
-                            "display": "Unprocessable Entity",
+                            "code": "INVALID_IDENTIFIER_VALUE",
+                            "display": "Invalid identifier value",
                         }
                     ]
                 },

layer/nrlf/core/codes.py

@@ -55,5 +55,6 @@ class SpineErrorConcept(_CodeableConcept):
         "INVALID_PARAMETER": "Invalid parameter",
         "MESSAGE_NOT_WELL_FORMED": "Message not well formed",
         "MISSING_OR_INVALID_HEADER": "There is a required header missing or invalid",
+        "INVALID_IDENTIFIER_VALUE": "Invalid identifier value",
         "UNPROCESSABLE_ENTITY": "Unprocessable Entity",
     }

layer/nrlf/core/response.py

@@ -149,6 +149,29 @@ def ACCESS_DENIED(cls, diagnostics: str = "Access denied") -> "Response":
             statusCode="403",
         )
 
+    @classmethod
+    def INVALID_IDENTIFIER_VALUE(
+        cls,
+        diagnostics: str = "Invalid identifier value",
+        expression: str | None = None,
+    ):
+        return cls.from_issues(
+            issues=[
+                producer_model.OperationOutcomeIssue(
+                    severity="error",
+                    code="invalid",
+                    details=SpineErrorConcept.from_code("INVALID_IDENTIFIER_VALUE"),
+                    diagnostics=diagnostics,
+                    expression=(
+                        [producer_model.ExpressionItem(root=expression)]
+                        if expression
+                        else None
+                    ),
+                )
+            ],
+            statusCode="400",
+        )
+
     @classmethod
     def INVALID_NHS_NUMBER(
         cls, diagnostics: str = "Invalid NHS number", expression: str | None = None

tests/features/consumer/countDocumentReference-failure.feature

@@ -34,18 +34,18 @@ Feature: Consumer - countDocumentReference - Failure Scenarios
     When consumer 'RX898' counts DocumentReferences with parameters:
       | parameter          | value                                  |
       | subject:identifier | https://fhir.nhs.uk/Id/nhs-number\|123 |
-    Then the response status code is 422
+    Then the response status code is 400
     And the response is an OperationOutcome with 1 issue
     And the OperationOutcome contains the issue:
       """
       {
         "severity": "error",
-        "code": "business-rule",
+        "code": "invalid",
         "details": {
           "coding": [{
             "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
-            "code": "UNPROCESSABLE_ENTITY",
-            "display": "Unprocessable Entity"
+            "code": "INVALID_IDENTIFIER_VALUE",
+            "display": "Invalid identifier value"
           }]
         },
         "diagnostics": "Invalid NHS number provided in the query parameters",