Minor self review and linting

Author: dlzhry2nhs

lambdas/backend/src/controller/constants.py

@@ -5,10 +5,7 @@
 SUPPLIER_SYSTEM_HEADER_NAME = "SupplierSystem"
 E_TAG_HEADER_NAME = "E-Tag"
 
-SEARCH_USING_POST_PATH = "/Immunization/_search"
-
-# TODO - could create string enum for different parameters
-# Once parameter parser is tidier, consider moving it there
+SEARCH_IMMS_POST_PATH = "/Immunization/_search"
 
 
 class IdentifierSearchParameterName(StrEnum):

lambdas/backend/src/controller/parameter_parser.py

@@ -2,10 +2,10 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from controller.constants import IdentifierSearchElement, IdentifierSearchParameterName, ImmunizationSearchParameterName
 from common.models.constants import Constants
 from common.models.utils.generic_utils import nhs_number_mod11_check
 from common.redis_client import get_redis_client
+from controller.constants import IdentifierSearchElement, IdentifierSearchParameterName, ImmunizationSearchParameterName
 from models.errors import ParameterException
 
 DUPLICATED_PARAMETERS_ERROR_MESSAGE = 'Parameters may not be duplicated. Use commas for "or".'

lambdas/backend/src/models/errors.py

@@ -126,7 +126,7 @@ def to_operation_outcome(self) -> dict:
             diagnostics=f"Validation errors: Immunization resource version:{self.resource_version} in the request "
             f"headers is invalid.",
         )
-    
+
 
 @dataclass
 class TooManyResultsError(ApiValidationError):

lambdas/backend/src/search_imms_handler.py

@@ -5,7 +5,7 @@
 from aws_lambda_typing.context import Context
 from aws_lambda_typing.events import APIGatewayProxyEventV1
 
-from controller.constants import SEARCH_USING_POST_PATH
+from controller.constants import SEARCH_IMMS_POST_PATH
 from controller.fhir_controller import FhirController, make_controller
 from log_structure import function_info
 
@@ -16,7 +16,7 @@ def search_imms_handler(event: APIGatewayProxyEventV1, _context: Context):
 
 
 def search_imms(event: APIGatewayProxyEventV1, controller: FhirController):
-    return controller.search_immunizations(event, is_post_endpoint_req=event.get("path") == SEARCH_USING_POST_PATH)
+    return controller.search_immunizations(event, is_post_endpoint_req=event.get("path") == SEARCH_IMMS_POST_PATH)
 
 
 if __name__ == "__main__":

lambdas/backend/src/service/fhir_service.py

@@ -21,9 +21,6 @@
 
 from authorisation.api_operation_code import ApiOperationCode
 from authorisation.authoriser import Authoriser
-from controller.constants import IMMUNIZATION_TARGET_LEGACY_KEY_NAME, ImmunizationSearchParameterName
-from controller.parameter_parser import PATIENT_IDENTIFIER_SYSTEM
-from filter import Filter
 from common.models.constants import Constants
 from common.models.errors import (
     Code,
@@ -46,6 +43,8 @@
     validate_identifiers_match,
     validate_resource_versions_match,
 )
+from controller.constants import IMMUNIZATION_TARGET_LEGACY_KEY_NAME, ImmunizationSearchParameterName
+from controller.parameter_parser import PATIENT_IDENTIFIER_SYSTEM
 from filter import Filter
 from models.errors import UnauthorizedVaxError
 from repository.fhir_repository import ImmunizationRepository

lambdas/backend/tests/controller/test_fhir_controller.py

@@ -20,13 +20,11 @@
 from controller.fhir_controller import FhirController
 from controller.parameter_parser import PATIENT_IDENTIFIER_SYSTEM
 from models.errors import (
-    ParameterException,
     UnauthorizedVaxError,
     UnhandledResponseError,
 )
 from repository.fhir_repository import ImmunizationRepository
 from service.fhir_service import FhirService
-from test_common.testing_utils.generic_utils import load_json_data
 from test_common.testing_utils.immunization_utils import create_covid_immunization
 
 

lambdas/backend/tests/service/test_fhir_service.py

@@ -3,7 +3,6 @@
 import os
 import unittest
 from copy import deepcopy
-from decimal import Decimal
 from unittest.mock import Mock, create_autospec, patch
 
 from fhir.resources.R4B.bundle import BundleLink

lambdas/shared/tests/test_common/models/utils/test_generic_utils.py

@@ -3,7 +3,7 @@
 import unittest
 from datetime import date, datetime
 
-from test_common.testing_utils.generic_utils import format_date_types, load_json_data
+from test_common.testing_utils.generic_utils import format_date_types
 
 
 class TestFormatFutureDates(unittest.TestCase):