Move delta converter to shared code

edhall-nhs · edhall-nhs · commit 10e052d92c75 · 2025-12-11T15:29:49.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 converter import Converter
-from 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
@@ -8,7 +8,8 @@
 from boto3 import resource as boto3_resource
 from moto import mock_aws
 
-from mappings import ActionFlag, EventName, Operation
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ActionFlag, EventName, Operation
 from utils_for_converter_tests import ErrorValuesForTests, ValuesForTests
 
 MOCK_ENV_VARS = {
@@ -19,7 +20,7 @@
 }
 request_json_data = ValuesForTests.json_data
 with patch.dict("os.environ", MOCK_ENV_VARS):
-    from delta import Converter, handler
+    from delta import handler
 
 
 @patch.dict("os.environ", MOCK_ENV_VARS, clear=True)
diff --git a/lambdas/delta_backend/tests/test_convert_dates.py b/lambdas/delta_backend/tests/test_convert_dates.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_dose_amount.py b/lambdas/delta_backend/tests/test_convert_dose_amount.py
@@ -3,8 +3,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_dose_sequence.py b/lambdas/delta_backend/tests/test_convert_dose_sequence.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_location_code.py b/lambdas/delta_backend/tests/test_convert_location_code.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_location_code_type_uri.py b/lambdas/delta_backend/tests/test_convert_location_code_type_uri.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_lot_number.py b/lambdas/delta_backend/tests/test_convert_lot_number.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_manufacturer.py b/lambdas/delta_backend/tests/test_convert_manufacturer.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_nhs_number.py b/lambdas/delta_backend/tests/test_convert_nhs_number.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_person_forename.py b/lambdas/delta_backend/tests/test_convert_person_forename.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_person_gender.py b/lambdas/delta_backend/tests/test_convert_person_gender.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_person_surname.py b/lambdas/delta_backend/tests/test_convert_person_surname.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_post_code.py b/lambdas/delta_backend/tests/test_convert_post_code.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_practitioner_forename.py b/lambdas/delta_backend/tests/test_convert_practitioner_forename.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_practitioner_surname.py b/lambdas/delta_backend/tests/test_convert_practitioner_surname.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_primary_source.py b/lambdas/delta_backend/tests/test_convert_primary_source.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_site_code.py b/lambdas/delta_backend/tests/test_convert_site_code.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_site_uri.py b/lambdas/delta_backend/tests/test_convert_site_uri.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_snomed_codes.py b/lambdas/delta_backend/tests/test_convert_snomed_codes.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_snomed_terms.py b/lambdas/delta_backend/tests/test_convert_snomed_terms.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_unique_id.py b/lambdas/delta_backend/tests/test_convert_unique_id.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_convert_unique_id_uri.py b/lambdas/delta_backend/tests/test_convert_unique_id_uri.py
@@ -2,8 +2,8 @@
 import json
 import unittest
 
-from converter import Converter
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.converter import Converter
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 from utils_for_converter_tests import ValuesForTests
 
 
diff --git a/lambdas/delta_backend/tests/test_current_period.py b/lambdas/delta_backend/tests/test_current_period.py
@@ -1,7 +1,7 @@
 import unittest
 from datetime import datetime, timezone
 
-from extractor import Extractor
+from common.fhir_to_flat_json.extractor import Extractor
 
 
 class TestIsCurrentPeriod(unittest.TestCase):
diff --git a/lambdas/delta_backend/tests/test_delta.py b/lambdas/delta_backend/tests/test_delta.py
@@ -7,12 +7,12 @@
 from botocore.exceptions import ClientError
 
 import delta
+from common.fhir_to_flat_json.mappings import ActionFlag, EventName, Operation
 from delta import (
     handler,
     process_record,
     send_message,
 )
-from mappings import ActionFlag, EventName, Operation
 from utils_for_converter_tests import RecordConfig, ValuesForTests
 
 TEST_QUEUE_URL = "https://sqs.eu-west-2.amazonaws.com/123456789012/test-queue"
diff --git a/lambdas/delta_backend/tests/utils_for_converter_tests.py b/lambdas/delta_backend/tests/utils_for_converter_tests.py
@@ -3,7 +3,7 @@
 from decimal import Decimal
 from typing import List
 
-from mappings import EventName, Operation
+from common.fhir_to_flat_json.mappings import EventName, Operation
 
 
 class RecordConfig:
diff --git a/lambdas/shared/src/common/fhir_to_flat_json/__init__.py b/lambdas/shared/src/common/fhir_to_flat_json/__init__.py
diff --git a/lambdas/shared/src/common/fhir_to_flat_json/conversion_layout.py b/lambdas/shared/src/common/fhir_to_flat_json/conversion_layout.py
@@ -1,5 +1,5 @@
-from extractor import Extractor
-from mappings import ConversionFieldName
+from common.fhir_to_flat_json.extractor import Extractor
+from common.fhir_to_flat_json.mappings import ConversionFieldName
 
 
 class ConversionField:
diff --git a/lambdas/shared/src/common/fhir_to_flat_json/converter.py b/lambdas/shared/src/common/fhir_to_flat_json/converter.py
@@ -1,8 +1,8 @@
 # Main validation engine
-import exception_messages
-from conversion_layout import ConversionField, ConversionLayout
-from extractor import Extractor
-from mappings import ActionFlag
+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
 
 
 class Converter:
diff --git a/lambdas/shared/src/common/fhir_to_flat_json/exception_messages.py b/lambdas/shared/src/common/fhir_to_flat_json/exception_messages.py
diff --git a/lambdas/shared/src/common/fhir_to_flat_json/extractor.py b/lambdas/shared/src/common/fhir_to_flat_json/extractor.py
@@ -2,8 +2,8 @@
 import json
 from datetime import datetime, timedelta, timezone
 
-import exception_messages
-from mappings import ConversionFieldName, Gender
+from common.fhir_to_flat_json import exception_messages
+from common.fhir_to_flat_json.mappings import ConversionFieldName, Gender
 
 
 class Extractor:
diff --git a/lambdas/shared/src/common/fhir_to_flat_json/mappings.py b/lambdas/shared/src/common/fhir_to_flat_json/mappings.py
