Merge remote branch into local branch VED-740-meta-versionID

Author: Akol125

ack_backend/src/logging_decorators.py

@@ -58,6 +58,8 @@ def wrapper(message, created_at_formatted_string):
             additional_log_data = {
                 "file_key": file_key,
                 "message_id": message_id,
+                "operation_start_time": message.get("operation_start_time", "unknown"),
+                "operation_end_time": message.get("operation_end_time", "unknown"),
                 "vaccine_type": message.get("vaccine_type", "unknown"),
                 "supplier": message.get("supplier", "unknown"),
                 "local_id": message.get("local_id", "unknown"),

ack_backend/tests/utils/values_for_ack_backend_tests.py

@@ -7,12 +7,17 @@
 class DefaultValues:
     """Class to hold default values for tests"""
 
+    fixed_datetime = datetime(2024, 10, 29, 12, 0, 0)
+    fixed_datetime_str = fixed_datetime.strftime("%Y-%m-%d %H:%M:%S")
+
     message_id = "test_file_id"
     row_id = "test_file_id#1"
     local_id = "test_system_uri^testabc"
     imms_id = "test_imms_id"
     operation_requested = "CREATE"
     created_at_formatted_string = "20211120T12000000"
+    operation_start_time = fixed_datetime_str
+    operation_end_time = fixed_datetime_str
 
 
 class DiagnosticsDictionaries:
@@ -90,6 +95,8 @@ def __init__(
         local_id: str = DefaultValues.local_id,
         imms_id: str = DefaultValues.imms_id,
         created_at_formatted_string: str = DefaultValues.created_at_formatted_string,
+        operation_start_time: str = DefaultValues.operation_start_time,
+        operation_end_time: str = DefaultValues.operation_end_time,
     ):
         self.name = f"{vaccine_type.upper()}/ {supplier.upper()} {operation_requested} message"
         self.file_key = f"{vaccine_type}_Vaccinations_v5_{ods_code}_20210730T12000000.csv"
@@ -108,6 +115,8 @@ def __init__(
         self.local_id = local_id
         self.imms_id = imms_id
         self.created_at_formatted_string = created_at_formatted_string
+        self.operation_start_time = operation_start_time
+        self.operation_end_time = operation_end_time
 
         self.queue_name = f"{supplier}_{vaccine_type}"
 
@@ -116,6 +125,8 @@ def __init__(
             "supplier": self.supplier,
             "vaccine_type": self.vaccine_type,
             "created_at_formatted_string": self.created_at_formatted_string,
+            "operation_start_time": self.operation_start_time,
+            "operation_end_time": self.operation_end_time,
             "row_id": self.row_id,
             "local_id": self.local_id,
             "operation_requested": self.operation_requested,
@@ -151,6 +162,8 @@ class ValidValues:
     mock_message_expected_log_value = {
         "function_name": "ack_processor_convert_message_to_ack_row",
         "date_time": fixed_datetime.strftime("%Y-%m-%d %H:%M:%S"),
+        "operation_start_time": MOCK_MESSAGE_DETAILS.operation_start_time,
+        "operation_end_time": MOCK_MESSAGE_DETAILS.operation_end_time,
         "status": "success",
         "supplier": MOCK_MESSAGE_DETAILS.supplier,
         "file_key": MOCK_MESSAGE_DETAILS.file_key,
@@ -242,6 +255,8 @@ class InvalidValues:
     Logging_with_no_values = {
         "function_name": "ack_processor_convert_message_to_ack_row",
         "date_time": fixed_datetime.strftime("%Y-%m-%d %H:%M:%S"),
+        "operation_start_time": "unknown",
+        "operation_end_time": "unknown",
         "status": "fail",
         "supplier": "unknown",
         "file_key": "file_key_missing",

backend/src/forwarding_batch_lambda.py

@@ -5,6 +5,7 @@
 import base64
 import time
 import logging
+from datetime import datetime
 
 from batch.batch_filename_to_events_mapper import BatchFilenameToEventsMapper
 from fhir_batch_repository import create_table
@@ -67,6 +68,7 @@ def forward_lambda_handler(event, _):
 
     for record in event["Records"]:
         try:
+            operation_start_time = str(datetime.now())
             kinesis_payload = record["kinesis"]["data"]
             decoded_payload = base64.b64decode(kinesis_payload).decode("utf-8")
             incoming_message_body = json.loads(decoded_payload, use_decimal=True)
@@ -103,11 +105,19 @@ def forward_lambda_handler(event, _):
                 array_of_identifiers.append(identifier)
 
             imms_id = forward_request_to_dynamo(incoming_message_body, table, identifier_already_present, controller)
-            filename_to_events_mapper.add_event({**base_outgoing_message_body, "imms_id": imms_id})
+            filename_to_events_mapper.add_event(
+                { **base_outgoing_message_body,
+                 "operation_start_time": operation_start_time,
+                 "operation_end_time": str(datetime.now()),
+                 "imms_id": imms_id }
+            )
 
         except Exception as error:  # pylint: disable = broad-exception-caught
             filename_to_events_mapper.add_event(
-                {**base_outgoing_message_body, "diagnostics": create_diagnostics_dictionary(error)}
+                { **base_outgoing_message_body,
+                 "operation_start_time": operation_start_time,
+                 "operation_end_time": str(datetime.now()),
+                 "diagnostics": create_diagnostics_dictionary(error) }
             )
             logger.error("Error processing message: %s", error)
 

backend/tests/test_forwarding_batch_lambda.py

@@ -455,6 +455,8 @@ def test_forward_lambda_handler_groups_and_sends_events_by_filename(self, mock_s
         self.assertDictEqual(json.loads(first_call_kwargs["MessageBody"])[0], {
             "created_at_formatted_string": "2025-01-24T12:00:00Z",
             "file_key": "supplier_1_rsv_test_file",
+            "operation_start_time": ANY,
+            "operation_end_time": ANY,
             "imms_id": ANY,
             "local_id": "local-1",
             "operation_requested": "CREATE",
@@ -465,6 +467,8 @@ def test_forward_lambda_handler_groups_and_sends_events_by_filename(self, mock_s
         self.assertDictEqual(json.loads(second_call_kwargs["MessageBody"])[0], {
             "created_at_formatted_string": "2025-01-24T12:00:00Z",
             "file_key": "supplier_2_rsv_test_file",
+            "operation_start_time": ANY,
+            "operation_end_time": ANY,
             "imms_id": ANY,
             "local_id": "local-2",
             "operation_requested": "CREATE",