Move and rename converter files and tests

edhall-nhs · edhall-nhs · commit e95908673cd5 · 2025-12-17T11:17:39.000Z
diff --git a/lambdas/delta_backend/src/delta.py b/lambdas/delta_backend/src/delta.py
@@ -9,9 +9,9 @@
 
 from common.aws_dynamodb import get_dynamodb_table
 from common.clients import STREAM_NAME, get_sqs_client, logger
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ActionFlag, EventName, Operation
 from common.log_firehose import send_log_to_firehose
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ActionFlag, EventName, Operation
 
 failure_queue_url = os.environ["AWS_SQS_QUEUE_URL"]
 delta_table_name = os.environ["DELTA_TABLE_NAME"]
diff --git a/lambdas/delta_backend/tests/test_convert.py b/lambdas/delta_backend/tests/test_convert.py
@@ -6,7 +6,7 @@
 from boto3 import resource as boto3_resource
 from moto import mock_aws
 
-from common.fhir_to_flat_json.mappings import ActionFlag, EventName, Operation
+from common.models.fhir_converter.mappings import ActionFlag, EventName, Operation
 from utils import ValuesForTests
 
 MOCK_ENV_VARS = {
diff --git a/lambdas/delta_backend/tests/test_delta.py b/lambdas/delta_backend/tests/test_delta.py
@@ -7,7 +7,7 @@
 from botocore.exceptions import ClientError
 
 import delta
-from common.fhir_to_flat_json.mappings import ActionFlag, EventName, Operation
+from common.models.fhir_converter.mappings import ActionFlag, EventName, Operation
 from delta import (
     handler,
     process_record,
diff --git a/lambdas/delta_backend/tests/utils.py b/lambdas/delta_backend/tests/utils.py
@@ -3,7 +3,7 @@
 from decimal import Decimal
 from typing import List
 
-from common.fhir_to_flat_json.mappings import EventName, Operation
+from common.models.fhir_converter.mappings import EventName, Operation
 
 
 class RecordConfig:
diff --git a/lambdas/shared/src/common/models/fhir_converter/__init__.py b/lambdas/shared/src/common/models/fhir_converter/__init__.py
diff --git a/lambdas/shared/src/common/models/fhir_converter/conversion_layout.py b/lambdas/shared/src/common/models/fhir_converter/conversion_layout.py
@@ -1,5 +1,5 @@
-from common.fhir_to_flat_json.extractor import Extractor
-from common.fhir_to_flat_json.mappings import ConversionFieldName
+from common.models.fhir_converter.extractor import Extractor
+from common.models.fhir_converter.mappings import ConversionFieldName
 
 
 class ConversionField:
diff --git a/lambdas/shared/src/common/models/fhir_converter/converter.py b/lambdas/shared/src/common/models/fhir_converter/converter.py
@@ -1,8 +1,8 @@
 # Main validation engine
-from common.fhir_to_flat_json import exception_messages
-from common.fhir_to_flat_json.conversion_layout import ConversionField, ConversionLayout
-from common.fhir_to_flat_json.extractor import Extractor
-from common.fhir_to_flat_json.mappings import ActionFlag
+from common.models.fhir_converter import exception_messages
+from common.models.fhir_converter.conversion_layout import ConversionField, ConversionLayout
+from common.models.fhir_converter.extractor import Extractor
+from common.models.fhir_converter.mappings import ActionFlag
 
 
 class Converter:
diff --git a/lambdas/shared/src/common/models/fhir_converter/exception_messages.py b/lambdas/shared/src/common/models/fhir_converter/exception_messages.py
diff --git a/lambdas/shared/src/common/models/fhir_converter/extractor.py b/lambdas/shared/src/common/models/fhir_converter/extractor.py
@@ -2,8 +2,8 @@
 import json
 from datetime import datetime, timedelta, timezone
 
-from common.fhir_to_flat_json import exception_messages
-from common.fhir_to_flat_json.mappings import ConversionFieldName, Gender
+from common.models.fhir_converter import exception_messages
+from common.models.fhir_converter.mappings import ConversionFieldName, Gender
 
 
 class Extractor:
diff --git a/lambdas/shared/src/common/models/fhir_converter/mappings.py b/lambdas/shared/src/common/models/fhir_converter/mappings.py
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/__init__.py b/lambdas/shared/tests/test_common/models/fhir_converter/__init__.py
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/sample_values.py b/lambdas/shared/tests/test_common/models/fhir_converter/sample_values.py
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_dates.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_dates.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestDateConversions(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_dose_amount.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_dose_amount.py
@@ -3,9 +3,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestDoseAmountTypeUriToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_dose_sequence.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_dose_sequence.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestDoseSequenceToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_location_code.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_location_code.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestLocationCode(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_location_code_type_uri.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_location_code_type_uri.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestLocationCodeTypeUri(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_lot_number.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_lot_number.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestBatchNumber(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_manufacturer.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_manufacturer.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestVaccineManufacturer(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_nhs_number.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_nhs_number.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestNHSNumberToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_person_forename.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_person_forename.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestPersonForenmeToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_person_gender.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_person_gender.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestPersonGenderToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_person_surname.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_person_surname.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestPersonSurnameToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_post_code.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_post_code.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestPersonPostalCodeToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_practitioner_forename.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_practitioner_forename.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestPractitionerForenameToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_practitioner_surname.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_practitioner_surname.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestPractitionerSurnameToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_primary_source.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_primary_source.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestPrimarySourceFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_site_code.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_site_code.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestSiteCodeToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_site_uri.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_site_uri.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestSiteUriToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_snomed_codes.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_snomed_codes.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestSNOMEDToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_snomed_terms.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_snomed_terms.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestSNOMEDTermsToFlatJson(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_unique_id.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_unique_id.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestUniqueId(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_unique_id_uri.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_convert_unique_id_uri.py
@@ -2,9 +2,9 @@
 import json
 import unittest
 
-from common.fhir_to_flat_json.converter import Converter
-from common.fhir_to_flat_json.mappings import ConversionFieldName
-from test_common.fhir_to_flat_json.sample_values import ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from common.models.fhir_converter.mappings import ConversionFieldName
+from test_common.models.fhir_converter.sample_values import ValuesForTests
 
 
 class TestUniqueIdUri(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_converter.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_converter.py
@@ -2,8 +2,8 @@
 import unittest
 from copy import deepcopy
 
-from common.fhir_to_flat_json.converter import Converter
-from test_common.fhir_to_flat_json.sample_values import ErrorValuesForTests, ValuesForTests
+from common.models.fhir_converter.converter import Converter
+from test_common.models.fhir_converter.sample_values import ErrorValuesForTests, ValuesForTests
 
 
 class TestConverter(unittest.TestCase):
diff --git a/lambdas/shared/tests/test_common/models/fhir_converter/test_current_period.py b/lambdas/shared/tests/test_common/models/fhir_converter/test_current_period.py
@@ -1,7 +1,7 @@
 import unittest
 from datetime import datetime, timezone
 
-from common.fhir_to_flat_json.extractor import Extractor
+from common.models.fhir_converter.extractor import Extractor
 
 
 class TestIsCurrentPeriod(unittest.TestCase):
