shared/src/common/models

Author: JamesW1-NHS

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

@@ -1,7 +1,7 @@
 from pydantic import ValidationError
 
 from common.models.errors import CustomValidationError, MandatoryError
-from models.fhir_immunization import ImmunizationValidator
+from common.models.fhir_immunization import ImmunizationValidator
 from repository.fhir_batch_repository import ImmunizationBatchRepository
 
 IMMUNIZATION_VALIDATOR = ImmunizationValidator()

lambdas/recordforwarder/src/service/fhir_batch_service.py

@@ -37,7 +37,7 @@ def setUp(self):
         self.immunization = create_covid_immunization_dict(imms_id)
         self.table.update_item = MagicMock(return_value={"ResponseMetadata": {"HTTPStatusCode": 200}})
         self.mock_redis = Mock()
-        self.redis_getter_patcher = patch("models.utils.validation_utils.get_redis_client")
+        self.redis_getter_patcher = patch("common.models.utils.validation_utils.get_redis_client")
         self.mock_redis_getter = self.redis_getter_patcher.start()
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()

lambdas/recordforwarder/tests/repository/test_fhir_batch_repository.py

@@ -4,7 +4,7 @@
 from unittest.mock import Mock, create_autospec, patch
 
 from common.models.errors import CustomValidationError
-from models.fhir_immunization import ImmunizationValidator
+from common.models.fhir_immunization import ImmunizationValidator
 from repository.fhir_batch_repository import ImmunizationBatchRepository
 from service.fhir_batch_service import ImmunizationBatchService
 from testing_utils.immunization_utils import create_covid_immunization_dict_no_id
@@ -16,7 +16,7 @@ class TestFhirBatchServiceBase(unittest.TestCase):
     def setUp(self):
         super().setUp()
         self.mock_redis = Mock()
-        self.redis_getter_patcher = patch("models.utils.validation_utils.get_redis_client")
+        self.redis_getter_patcher = patch("common.models.utils.validation_utils.get_redis_client")
         self.mock_redis_getter = self.redis_getter_patcher.start()
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()

lambdas/recordforwarder/tests/service/test_fhir_batch_service.py

@@ -74,7 +74,7 @@ def setUp(self):
         self.mock_logger_error = self.logger_error_patcher.start()
 
         self.mock_redis = Mock()
-        self.redis_getter_patcher = patch("models.utils.validation_utils.get_redis_client")
+        self.redis_getter_patcher = patch("common.models.utils.validation_utils.get_redis_client")
         self.mock_redis_getter = self.redis_getter_patcher.start()
 
     def tearDown(self):

lambdas/recordforwarder/tests/test_forwarding_batch_lambda.py

@@ -2,9 +2,9 @@
 
 from fhir.resources.R4B.immunization import Immunization
 
-from models.fhir_immunization_post_validators import PostValidators
-from models.fhir_immunization_pre_validators import PreValidators
-from models.utils.validation_utils import get_vaccine_type
+from common.models.fhir_immunization_post_validators import PostValidators
+from common.models.fhir_immunization_pre_validators import PreValidators
+from common.models.utils.validation_utils import get_vaccine_type
 
 
 class ImmunizationValidator:

…/recordforwarder/src/models/constants.py …as/shared/src/common/models/constants.pylambdas/recordforwarder/src/models/constants.py renamed to lambdas/shared/src/common/models/constants.py lambdas/recordforwarder/src/models/constants.py renamed to lambdas/shared/src/common/models/constants.py

@@ -1,11 +1,11 @@
 "FHIR Immunization Post Validators"
 
 from common.models.errors import MandatoryError
-from models.field_locations import FieldLocations
-from models.field_names import FieldNames
-from models.mandation_functions import MandationFunctions
-from models.utils.base_utils import obtain_field_location, obtain_field_value
-from models.validation_sets import ValidationSets
+from common.models.field_locations import FieldLocations
+from common.models.field_names import FieldNames
+from common.models.mandation_functions import MandationFunctions
+from common.models.utils.base_utils import obtain_field_location, obtain_field_value
+from common.models.validation_sets import ValidationSets
 
 
 class PostValidators:

…orwarder/src/models/fhir_immunization.py …d/src/common/models/fhir_immunization.pylambdas/recordforwarder/src/models/fhir_immunization.py renamed to lambdas/shared/src/common/models/fhir_immunization.py lambdas/recordforwarder/src/models/fhir_immunization.py renamed to lambdas/shared/src/common/models/fhir_immunization.py

@@ -2,8 +2,8 @@
 
 from common.models.errors import MandatoryError
 from constants import Urls
-from models.constants import Constants
-from models.utils.generic_utils import (
+from common.models.constants import Constants
+from common.models.utils.generic_utils import (
     check_for_unknown_elements,
     generate_field_location_for_extension,
     get_generic_extension_value,
@@ -13,7 +13,7 @@
     practitioner_name_family_field_location,
     practitioner_name_given_field_location,
 )
-from models.utils.pre_validator_utils import PreValidation
+from common.models.utils.pre_validator_utils import PreValidation
 
 
 class PreValidators:

…els/fhir_immunization_post_validators.py …els/fhir_immunization_post_validators.pylambdas/recordforwarder/src/models/fhir_immunization_post_validators.py renamed to lambdas/shared/src/common/models/fhir_immunization_post_validators.py lambdas/recordforwarder/src/models/fhir_immunization_post_validators.py renamed to lambdas/shared/src/common/models/fhir_immunization_post_validators.py

@@ -6,7 +6,7 @@
 from dataclasses import dataclass, field
 
 from constants import Urls
-from models.utils.generic_utils import (
+from common.models.utils.generic_utils import (
     generate_field_location_for_extension,
     patient_name_family_field_location,
     patient_name_given_field_location,