ruff

Author: JamesW1-NHS

lambdas/recordforwarder/src/forwarding_batch_lambda.py

@@ -10,10 +10,6 @@
 
 from batch.batch_filename_to_events_mapper import BatchFilenameToEventsMapper
 from common.clients import sqs_client
-from controller.fhir_batch_controller import (
-    ImmunizationBatchController,
-    make_batch_controller,
-)
 from common.models.errors import (
     CustomValidationError,
     IdentifierDuplicationError,
@@ -22,6 +18,10 @@
     ResourceFoundError,
     ResourceNotFoundError,
 )
+from controller.fhir_batch_controller import (
+    ImmunizationBatchController,
+    make_batch_controller,
+)
 from repository.fhir_batch_repository import create_table
 
 logging.basicConfig(level="INFO")

lambdas/recordforwarder/src/models/fhir_immunization_pre_validators.py

@@ -1,8 +1,8 @@
 "FHIR Immunization Pre Validators"
 
+from common.models.errors import MandatoryError
 from constants import Urls
 from models.constants import Constants
-from common.models.errors import MandatoryError
 from models.utils.generic_utils import (
     check_for_unknown_elements,
     generate_field_location_for_extension,

lambdas/recordforwarder/src/models/utils/validation_utils.py

@@ -2,10 +2,10 @@
 
 import json
 
+from common.models.errors import MandatoryError
 from common.redis_client import get_redis_client
 from constants import Urls
 from models.constants import Constants
-from common.models.errors import MandatoryError
 from models.field_names import FieldNames
 from models.obtain_field_value import ObtainFieldValue
 from models.utils.base_utils import obtain_field_location

lambdas/recordforwarder/tests/controller/test_fhir_batch_controller.py

@@ -2,13 +2,13 @@
 import uuid
 from unittest.mock import Mock, create_autospec
 
-from controller.fhir_batch_controller import ImmunizationBatchController
 from common.models.errors import (
     CustomValidationError,
     IdentifierDuplicationError,
     ResourceNotFoundError,
     UnhandledResponseError,
 )
+from controller.fhir_batch_controller import ImmunizationBatchController
 from repository.fhir_batch_repository import ImmunizationBatchRepository
 from service.fhir_batch_service import ImmunizationBatchService
 from testing_utils.immunization_utils import create_covid_immunization

lambdas/recordforwarder/tests/repository/test_fhir_batch_repository.py

@@ -1,6 +1,6 @@
 import os
 import unittest
-from unittest.mock import ANY, Mock, MagicMock, patch
+from unittest.mock import ANY, MagicMock, Mock, patch
 from uuid import uuid4
 
 import boto3

lambdas/recordforwarder/tests/test_forwarding_batch_lambda.py

@@ -5,7 +5,7 @@
 import unittest
 from typing import Optional
 from unittest import TestCase
-from unittest.mock import ANY, Mock, MagicMock, patch
+from unittest.mock import ANY, MagicMock, Mock, patch
 
 from boto3 import resource as boto3_resource
 from moto import mock_aws