ELI-404: Fix sonar

Author: shweta-nhs

src/eligibility_signposting_api/common/api_error_response.py

@@ -34,19 +34,18 @@ class FHIRSpineErrorCode(str, Enum):
 
 
 class APIErrorResponse:
-    def __init__(  # noqa: PLR0913
+    def __init__(
         self,
         status_code: HTTPStatus,
         fhir_issue_code: FHIRIssueCode,
         fhir_issue_severity: FHIRIssueSeverity,
-        fhir_coding_system: str,
         fhir_error_code: str,
         fhir_display_message: str,
     ) -> None:
         self.status_code = status_code
         self.fhir_issue_code = fhir_issue_code
         self.fhir_issue_severity = fhir_issue_severity
-        self.fhir_coding_system = fhir_coding_system
+        self.fhir_coding_system = "https://fhir.nhs.uk/STU3/ValueSet/Spine-ErrorOrWarningCode-1"
         self.fhir_error_code = fhir_error_code
         self.fhir_display_message = fhir_display_message
 
@@ -96,7 +95,6 @@ def log_and_generate_response(
     status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
     fhir_issue_code=FHIRIssueCode.VALUE,
     fhir_issue_severity=FHIRIssueSeverity.ERROR,
-    fhir_coding_system="https://fhir.nhs.uk/STU3/ValueSet/Spine-ErrorOrWarningCode-1",
     fhir_error_code=FHIRSpineErrorCode.INVALID_PARAMETER,
     fhir_display_message="The supplied value was not recognised by the API.",
 )
@@ -105,7 +103,6 @@ def log_and_generate_response(
     status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
     fhir_issue_code=FHIRIssueCode.VALUE,
     fhir_issue_severity=FHIRIssueSeverity.ERROR,
-    fhir_coding_system="https://fhir.nhs.uk/STU3/ValueSet/Spine-ErrorOrWarningCode-1",
     fhir_error_code=FHIRSpineErrorCode.INVALID_PARAMETER,
     fhir_display_message="The supplied category was not recognised by the API.",
 )
@@ -114,7 +111,6 @@ def log_and_generate_response(
     status_code=HTTPStatus.BAD_REQUEST,
     fhir_issue_code=FHIRIssueCode.VALUE,
     fhir_issue_severity=FHIRIssueSeverity.ERROR,
-    fhir_coding_system="https://fhir.nhs.uk/STU3/ValueSet/Spine-ErrorOrWarningCode-1",
     fhir_error_code=FHIRSpineErrorCode.INVALID_PARAMETER,
     fhir_display_message="The given conditions were not in the expected format.",
 )
@@ -123,7 +119,6 @@ def log_and_generate_response(
     status_code=HTTPStatus.NOT_FOUND,
     fhir_issue_code=FHIRIssueCode.PROCESSING,
     fhir_issue_severity=FHIRIssueSeverity.ERROR,
-    fhir_coding_system="https://fhir.nhs.uk/STU3/ValueSet/Spine-ErrorOrWarningCode-1",
     fhir_error_code=FHIRSpineErrorCode.REFERENCE_NOT_FOUND,
     fhir_display_message="The given NHS number was not found in our datasets. "
     "This could be because the number is incorrect or "
@@ -134,7 +129,6 @@ def log_and_generate_response(
     status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
     fhir_issue_code=FHIRIssueCode.PROCESSING,
     fhir_issue_severity=FHIRIssueSeverity.ERROR,
-    fhir_coding_system="https://fhir.nhs.uk/STU3/ValueSet/Spine-ErrorOrWarningCode-1",
     fhir_error_code=FHIRSpineErrorCode.INTERNAL_SERVER_ERROR,
     fhir_display_message="An unexpected internal server error occurred.",
 )
@@ -143,7 +137,6 @@ def log_and_generate_response(
     status_code=HTTPStatus.FORBIDDEN,
     fhir_issue_code=FHIRIssueCode.FORBIDDEN,
     fhir_issue_severity=FHIRIssueSeverity.ERROR,
-    fhir_coding_system="https://fhir.nhs.uk/STU3/ValueSet/Spine-ErrorOrWarningCode-1",
     fhir_error_code=FHIRSpineErrorCode.ACCESS_DENIED,
     fhir_display_message="Access has been denied to process this request.",
 )
@@ -153,7 +146,6 @@ def log_and_generate_response(
     status_code=HTTPStatus.BAD_REQUEST,
     fhir_issue_code=FHIRIssueCode.INVALID,
     fhir_issue_severity=FHIRIssueSeverity.ERROR,
-    fhir_coding_system="https://fhir.nhs.uk/STU3/ValueSet/Spine-ErrorOrWarningCode-1",
     fhir_error_code=FHIRSpineErrorCode.BAD_REQUEST,
     fhir_display_message="Bad Request",
 )

src/eligibility_signposting_api/common/request_validator.py

@@ -17,7 +17,7 @@
 
 logger = logging.getLogger(__name__)
 
-condition_pattern = re.compile(r"^\s*[a-zA-Z0-9]+\s*$", re.IGNORECASE)
+condition_pattern = re.compile(r"^\s*[a-z0-9]+\s*$", re.IGNORECASE)
 category_pattern = re.compile(r"^\s*(VACCINATIONS|SCREENING|ALL)\s*$", re.IGNORECASE)
 include_actions_pattern = re.compile(r"^\s*([YN])\s*$", re.IGNORECASE)