VED-1147: Convert Upstream Time Format to ISO (#1327)

* convert time to rfc33399 format

Author: Akol125

lambdas/mns_publisher/src/create_notification.py

@@ -9,6 +9,7 @@
 from common.api_clients.constants import MnsNotificationPayload
 from common.api_clients.get_pds_details import pds_get_patient_details
 from common.clients import logger
+from common.converter_utils import timestamp_to_rfc3339
 from common.get_service_url import get_service_url
 from constants import IMMUNISATION_EVENT_SOURCE, IMMUNISATION_EVENT_TYPE, SPEC_VERSION
 
@@ -41,13 +42,14 @@ def create_mns_notification(sqs_event: SQSMessage) -> MnsNotificationPayload:
 
     patient_age = calculate_age_at_vaccination(person_dob, date_and_time)
     gp_ods_code = get_practitioner_details_from_pds(nhs_number)
+    mns_timestamp = timestamp_to_rfc3339(date_and_time)
 
     return {
         "specversion": SPEC_VERSION,
         "id": str(uuid.uuid4()),
         "source": IMMUNISATION_EVENT_SOURCE,
         "type": IMMUNISATION_EVENT_TYPE,
-        "time": date_and_time,
+        "time": mns_timestamp,
         "subject": nhs_number,
         "dataref": f"{immunisation_url}/Immunization/{imms_id}",
         "filtering": {

lambdas/mns_publisher/tests/test_lambda_handler.py

@@ -282,7 +282,6 @@ def test_successful_notification_creation_with_gp(self, mock_logger, mock_get_to
 
         sqs_event = {"Records": [self.sample_sqs_record]}
         result = lambda_handler(sqs_event, Mock())
-
         self.assertEqual(result, {"batchItemFailures": []})
 
         self.assertEqual(mns_response.call_count, 1)

lambdas/mns_publisher/tests/test_sqs_dynamo_utils.py

@@ -1,2 +1,3 @@
 DEFAULT_BASE_PATH = "immunisation-fhir-api/FHIR/R4"
 PR_ENV_PREFIX = "pr-"
+ALLOWED_OFFSET_SUFFIXES: frozenset[str] = frozenset({"00", "01"})

lambdas/shared/src/common/constants.py

@@ -0,0 +1,23 @@
+from datetime import datetime, timedelta, timezone
+
+from common.constants import ALLOWED_OFFSET_SUFFIXES
+
+
+def timestamp_to_rfc3339(value: str, field_name: str = "DATE_AND_TIME") -> str:
+    if not isinstance(value, str):
+        raise TypeError(f"{field_name} must be a string")
+
+    if not value:
+        raise ValueError(f"{field_name} is required")
+
+    offset_suffix = value[-2:]
+    if offset_suffix not in ALLOWED_OFFSET_SUFFIXES:
+        raise ValueError(f"{field_name} timezone suffix must be 00 or 01")
+
+    try:
+        parsed_date = datetime.strptime(value[:-2], "%Y%m%dT%H%M%S")
+    except ValueError as e:
+        raise ValueError(f"{field_name} must contain a valid compact timestamp") from e
+
+    tz = timezone(timedelta(hours=int(offset_suffix)))
+    return parsed_date.replace(tzinfo=tz).isoformat(timespec="seconds").replace("+00:00", "Z")

lambdas/shared/src/common/converter_utils.py

@@ -0,0 +1,32 @@
+import re
+import unittest
+
+from common.converter_utils import timestamp_to_rfc3339
+
+
+class TestTimestampToRfc3339(unittest.TestCase):
+    def test_utc_conversion(self):
+        self.assertEqual(timestamp_to_rfc3339("20260212T17443700"), "2026-02-12T17:44:37Z")
+
+    def test_bst_conversion(self):
+        self.assertEqual(timestamp_to_rfc3339("20260212T17443701"), "2026-02-12T17:44:37+01:00")
+
+    def test_too_short_raises(self):
+        with self.assertRaises(ValueError):
+            timestamp_to_rfc3339("20260212T1744")
+
+    def test_output_is_rfc3339(self):
+        rfc3339 = re.compile(r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|[+-]\d{2}:\d{2})$")
+        self.assertRegex(timestamp_to_rfc3339("20260212T17443700"), rfc3339)
+
+    def test_non_string_raises_type_error(self):
+        with self.assertRaises(TypeError):
+            timestamp_to_rfc3339(20260212)
+
+    def test_empty_string_raises(self):
+        with self.assertRaises(ValueError):
+            timestamp_to_rfc3339("")
+
+    def test_unsupported_offset_raises(self):
+        with self.assertRaises(ValueError):
+            timestamp_to_rfc3339("20260212T17443705")

lambdas/shared/tests/test_common/test_converter_utils.py

@@ -36,7 +36,7 @@
     get_delete_url_header,
     get_update_url_header,
 )
-from utilities.date_helper import is_valid_date, iso_to_compact
+from utilities.date_helper import is_valid_date, normalize_utc_suffix
 from utilities.enums import Operation
 from utilities.http_requests_session import http_requests_session
 from utilities.sqs_message_halder import read_message
@@ -444,9 +444,10 @@ def validate_sqs_message(context, message_body, action):
 
     check.is_true(is_valid_uuid(message_body.id), f"Invalid UUID: {message_body.id}")
 
+    imms_date_time = normalize_utc_suffix(context.immunization_object.occurrenceDateTime)
     check.is_true(
-        message_body.time == iso_to_compact(context.immunization_object.occurrenceDateTime),
-        f"msn event for {action} Time missing or empty: {message_body.time}",
+        message_body.time == imms_date_time,
+        f"msn event for {action} Time missing or mismatch: message_body.time = {message_body.time}, imms_date_time = {imms_date_time}",
     )
     expected_nhs_number = context.patient.identifier[0].value
     if expected_nhs_number is None:

tests/e2e_automation/features/APITests/steps/common_steps.py

@@ -24,6 +24,11 @@ def iso_to_compact(dt_str):
     return dt.strftime("%Y%m%dT%H%M%S00")
 
 
+def normalize_utc_suffix(timestamp: str) -> str:
+    dt = datetime.fromisoformat(timestamp.replace("Z", "+00:00"))
+    return dt.replace(microsecond=0).isoformat(timespec="seconds").replace("+00:00", "Z")
+
+
 def is_valid_date(date_str: str) -> bool:
     try:
         datetime.strptime(date_str, "%Y-%m-%d")