relocate create_row

Author: nhsdevws

e2e_batch/constants.py

@@ -1,5 +1,4 @@
 import os
-from datetime import datetime, timezone
 
 environment = os.environ.get("ENVIRONMENT", "internal-dev")
 REGION = "eu-west-2"
@@ -96,45 +95,3 @@ class TestSet():
     REINSTATE_OK = ActionSequence("Reinstate. OK", [ActionFlag.CREATE, ActionFlag.DELETE_LOGICAL, ActionFlag.UPDATE])
     DELETE_FAIL = ActionSequence("Delete without Create. Fail", [ActionFlag.DELETE_LOGICAL])
     UPDATE_FAIL = ActionSequence("Update without Create. Fail", [ActionFlag.UPDATE], outcome=ActionFlag.NONE)
-
-
-def create_row(unique_id, dose_amount, action_flag: str, header, inject_cp1252=None):
-    """Helper function to create a single row with the specified UNIQUE_ID and ACTION_FLAG."""
-
-    name = "James" if not inject_cp1252 else b'Jam\xe9s'
-    return {
-        header: "9732928395",
-        "PERSON_FORENAME": "PHYLIS",
-        "PERSON_SURNAME": name,
-        "PERSON_DOB": "20080217",
-        "PERSON_GENDER_CODE": "0",
-        "PERSON_POSTCODE": "WD25 0DZ",
-        "DATE_AND_TIME": datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S"),
-        "SITE_CODE": "RVVKC",
-        "SITE_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
-        "UNIQUE_ID": unique_id,
-        "UNIQUE_ID_URI": RAVS_URI,
-        "ACTION_FLAG": action_flag,
-        "PERFORMING_PROFESSIONAL_FORENAME": "PHYLIS",
-        "PERFORMING_PROFESSIONAL_SURNAME": name,
-        "RECORDED_DATE": datetime.now(timezone.utc).strftime("%Y%m%d"),
-        "PRIMARY_SOURCE": "TRUE",
-        "VACCINATION_PROCEDURE_CODE": "956951000000104",
-        "VACCINATION_PROCEDURE_TERM": "RSV vaccination in pregnancy (procedure)",
-        "DOSE_SEQUENCE": "1",
-        "VACCINE_PRODUCT_CODE": "42223111000001107",
-        "VACCINE_PRODUCT_TERM": "Quadrivalent influenza vaccine (Sanofi Pasteur)",
-        "VACCINE_MANUFACTURER": "Sanofi Pasteur",
-        "BATCH_NUMBER": "BN92478105653",
-        "EXPIRY_DATE": "20240915",
-        "SITE_OF_VACCINATION_CODE": "368209003",
-        "SITE_OF_VACCINATION_TERM": "Right arm",
-        "ROUTE_OF_VACCINATION_CODE": "1210999013",
-        "ROUTE_OF_VACCINATION_TERM": "Intradermal use",
-        "DOSE_AMOUNT": dose_amount,
-        "DOSE_UNIT_CODE": "2622896019",
-        "DOSE_UNIT_TERM": "Inhalation - unit of product usage",
-        "INDICATION_CODE": "1037351000000105",
-        "LOCATION_CODE": "RJC02",
-        "LOCATION_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
-    }

e2e_batch/scenarios.py

@@ -3,7 +3,6 @@
 from vax_suppliers import TestPair, OdsVax
 from constants import (
     ActionFlag, BusRowResult, DestinationType, Operation,
-    create_row,
     ACK_BUCKET,
     RAVS_URI,
     OperationOutcome
@@ -12,7 +11,8 @@
     poll_s3_file_pattern, fetch_pk_and_operation_from_dynamodb,
     validate_fatal_error,
     get_file_content_from_s3,
-    aws_cleanup
+    aws_cleanup,
+    create_row,
 )
 from clients import logger
 from errors import DynamoDBMismatchError

e2e_batch/utils.py

@@ -20,7 +20,6 @@
     FORWARDEDFILE_PREFIX,
     SOURCE_BUCKET,
     DUPLICATE,
-    create_row,
     ACK_PREFIX,
     FILE_NAME_VAL_ERROR,
     HEADER_RESPONSE_CODE_COLUMN,
@@ -474,3 +473,45 @@ def purge_sqs_queues() -> bool:
     except Exception as e:
         logger.error(f"SQS Purge error: {e}")
     return False
+
+
+def create_row(unique_id, dose_amount, action_flag: str, header, inject_cp1252=None):
+    """Helper function to create a single row with the specified UNIQUE_ID and ACTION_FLAG."""
+
+    name = "James" if not inject_cp1252 else b'Jam\xe9s'
+    return {
+        header: "9732928395",
+        "PERSON_FORENAME": "PHYLIS",
+        "PERSON_SURNAME": name,
+        "PERSON_DOB": "20080217",
+        "PERSON_GENDER_CODE": "0",
+        "PERSON_POSTCODE": "WD25 0DZ",
+        "DATE_AND_TIME": datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S"),
+        "SITE_CODE": "RVVKC",
+        "SITE_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
+        "UNIQUE_ID": unique_id,
+        "UNIQUE_ID_URI": RAVS_URI,
+        "ACTION_FLAG": action_flag,
+        "PERFORMING_PROFESSIONAL_FORENAME": "PHYLIS",
+        "PERFORMING_PROFESSIONAL_SURNAME": name,
+        "RECORDED_DATE": datetime.now(timezone.utc).strftime("%Y%m%d"),
+        "PRIMARY_SOURCE": "TRUE",
+        "VACCINATION_PROCEDURE_CODE": "956951000000104",
+        "VACCINATION_PROCEDURE_TERM": "RSV vaccination in pregnancy (procedure)",
+        "DOSE_SEQUENCE": "1",
+        "VACCINE_PRODUCT_CODE": "42223111000001107",
+        "VACCINE_PRODUCT_TERM": "Quadrivalent influenza vaccine (Sanofi Pasteur)",
+        "VACCINE_MANUFACTURER": "Sanofi Pasteur",
+        "BATCH_NUMBER": "BN92478105653",
+        "EXPIRY_DATE": "20240915",
+        "SITE_OF_VACCINATION_CODE": "368209003",
+        "SITE_OF_VACCINATION_TERM": "Right arm",
+        "ROUTE_OF_VACCINATION_CODE": "1210999013",
+        "ROUTE_OF_VACCINATION_TERM": "Intradermal use",
+        "DOSE_AMOUNT": dose_amount,
+        "DOSE_UNIT_CODE": "2622896019",
+        "DOSE_UNIT_TERM": "Inhalation - unit of product usage",
+        "INDICATION_CODE": "1037351000000105",
+        "LOCATION_CODE": "RJC02",
+        "LOCATION_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
+    }