Tidy folder structure

Author: dlzhry2nhs

backend/src/controller/fhir_batch_controller.py

@@ -1,7 +1,7 @@
 """Function to send the request directly to lambda (or return appropriate diagnostics if this is not possible)"""
 
-from fhir_batch_service import ImmunizationBatchService
-from fhir_batch_repository import ImmunizationBatchRepository
+from service.fhir_batch_service import ImmunizationBatchService
+from repository.fhir_batch_repository import ImmunizationBatchRepository
 
 
 def make_batch_controller():

backend/src/controller/fhir_controller.py

@@ -12,8 +12,8 @@
 from controller.aws_apig_response_utils import create_response
 from controller.constants import E_TAG_HEADER_NAME
 from controller.fhir_api_exception_handler import fhir_api_exception_handler
-from fhir_repository import ImmunizationRepository, create_table
-from fhir_service import FhirService, UpdateOutcome, get_service_url
+from repository.fhir_repository import ImmunizationRepository, create_table
+from service.fhir_service import FhirService, UpdateOutcome, get_service_url
 from models.errors import (
     Severity,
     Code,
@@ -90,7 +90,7 @@ def get_immunization_by_identifier(self, aws_event) -> dict:
             return create_response(403, unauthorized.to_operation_outcome())
 
     @fhir_api_exception_handler
-    def get_immunization_by_id(self, aws_event) -> dict:
+    def get_immunization_by_id(self, aws_event: APIGatewayProxyEventV1) -> dict:
         imms_id = get_path_parameter(aws_event, "id")
 
         if id_error := self._validate_id(imms_id):

backend/src/forwarding_batch_lambda.py

@@ -8,7 +8,7 @@
 from datetime import datetime
 
 from batch.batch_filename_to_events_mapper import BatchFilenameToEventsMapper
-from fhir_batch_repository import create_table
+from repository.fhir_batch_repository import create_table
 from controller.fhir_batch_controller import ImmunizationBatchController, make_batch_controller
 from clients import sqs_client
 from models.errors import (

backend/src/repository/__init__.py

@@ -1,5 +1,5 @@
 from pydantic import ValidationError
-from fhir_batch_repository import ImmunizationBatchRepository
+from repository.fhir_batch_repository import ImmunizationBatchRepository
 from models.errors import CustomValidationError
 from models.fhir_immunization import ImmunizationValidator
 from models.errors import MandatoryError

backend/src/fhir_batch_repository.py …/src/repository/fhir_batch_repository.pybackend/src/fhir_batch_repository.py renamed to backend/src/repository/fhir_batch_repository.py backend/src/fhir_batch_repository.py renamed to backend/src/repository/fhir_batch_repository.py

@@ -17,7 +17,7 @@
 import parameter_parser
 from authorisation.api_operation_code import ApiOperationCode
 from authorisation.authoriser import Authoriser
-from fhir_repository import ImmunizationRepository
+from repository.fhir_repository import ImmunizationRepository
 from models.errors import InvalidPatientId, CustomValidationError, UnauthorizedVaxError, ResourceNotFoundError
 from models.fhir_immunization import ImmunizationValidator
 from models.utils.generic_utils import nhs_number_mod11_check, get_occurrence_datetime, create_diagnostics, form_json, get_contained_patient

backend/src/fhir_repository.py backend/src/repository/fhir_repository.pybackend/src/fhir_repository.py renamed to backend/src/repository/fhir_repository.py

@@ -2,8 +2,8 @@
 import uuid
 from unittest.mock import Mock, create_autospec
 from testing_utils.immunization_utils import create_covid_19_immunization
-from fhir_batch_service import ImmunizationBatchService
-from fhir_batch_repository import ImmunizationBatchRepository
+from service.fhir_batch_service import ImmunizationBatchService
+from repository.fhir_batch_repository import ImmunizationBatchRepository
 from models.errors import (
     ResourceNotFoundError,
     UnhandledResponseError,