WIP Delete Remove issues

Author: nhsdevws

delta_backend/src/helpers/mappings.py

@@ -0,0 +1,29 @@
+# This class is copied from the e2e project
+# @TODO: replace with a solution for shared code
+class EndpointOperationNames:
+    """String enums for the name of each endpoint operation"""
+
+    CREATE = "CREATE"
+    READ = "READ"
+    UPDATE = "UPDATE"
+    DELETE = "DELETE"
+    SEARCH = "SEARCH"
+
+
+class VaccineTypes:
+    """Vaccine types"""
+
+    covid_19: str = "COVID19"
+    flu: str = "FLU"
+    hpv: str = "HPV"
+    mmr: str = "MMR"
+    rsv: str = "RSV"
+
+
+vaccine_type_mappings = [
+    (["840539006"], VaccineTypes.covid_19),
+    (["6142004"], VaccineTypes.flu),
+    (["240532009"], VaccineTypes.hpv),
+    (["14189004", "36653000", "36989005"], VaccineTypes.mmr),
+    (["55735004"], VaccineTypes.rsv),
+]

delta_backend/tests/helpers/test_delta_table.py

@@ -17,6 +17,7 @@
 from Converter import Converter
 from ConversionChecker import ConversionChecker, RecordError
 import ExceptionMessages
+from helpers.mappings import EndpointOperationNames
 
 MOCK_ENV_VARS = {
     "AWS_SQS_QUEUE_URL": "https://sqs.eu-west-2.amazonaws.com/123456789012/test-queue",
@@ -181,9 +182,9 @@ def test_fhir_converter_json_error_scenario(self):
     def test_handler_imms_convert_to_flat_json(self):
         """Test that the Imms field contains the correct flat JSON data for CREATE, UPDATE, and DELETE operations."""
         expected_action_flags = [
-            # {"Operation": "CREATE", "EXPECTED_ACTION_FLAG": "NEW"},
-            # {"Operation": "UPDATE", "EXPECTED_ACTION_FLAG": "UPDATE"},
-            {"Operation": "DELETE", "EXPECTED_ACTION_FLAG": "DELETE"},
+            # {"Operation": EndpointOperationNames.CREATE, "EXPECTED_ACTION_FLAG": "NEW"},
+            # {"Operation": EndpointOperationNames.UPDATE, "EXPECTED_ACTION_FLAG": "UPDATE"},
+            {"Operation": EndpointOperationNames.DELETE, "EXPECTED_ACTION_FLAG": "DELETE"},
         ]
 
         for test_case in expected_action_flags:

delta_backend/tests/test_convert_to_flat_json.py

@@ -3,6 +3,7 @@
 from botocore.exceptions import ClientError
 import os
 import json
+from helpers.mappings import EndpointOperationNames
 
 # Set environment variables before importing the module
 ## @TODO: # Note: Environment variables shared across tests, thus aligned
@@ -64,7 +65,7 @@ def get_event(event_name="INSERT", operation="CREATE", supplier="EMIS", n_record
 
     @staticmethod
     def get_event_record(pk, event_name="INSERT", operation="CREATE", supplier="EMIS"):
-        if operation != "DELETE":
+        if operation != EndpointOperationNames.DELETE:
             return{
                 "eventName": event_name,
                 "dynamodb": {
@@ -183,7 +184,7 @@ def test_handler_success_update(self, mock_boto_resource, mock_write_to_db):
     def test_handler_success_remove(self, mock_boto_resource):
         # Arrange
         self.setup_mock_dynamodb(mock_boto_resource)
-        event = self.get_event(event_name="REMOVE", operation="DELETE")
+        event = self.get_event(event_name="REMOVE", operation=EndpointOperationNames.DELETE)
 
         # Act
         result = handler(event, self.context)

delta_backend/tests/test_delta.py

@@ -1,6 +1,6 @@
 from decimal import Decimal
 import json
-
+from helpers.mappings import EndpointOperationNames
 
 class ValuesForTests:
 
@@ -119,7 +119,7 @@ class ValuesForTests:
 
     @staticmethod
     def get_event(event_name="INSERT", operation="CREATE", supplier="EMIS"):
-        if operation != "REMOVE":
+        if operation != EndpointOperationNames.DELETE:
             return {
                 "Records": [
                     {