airflow upgrade and log fix for new version of pymongo

Author: Dragos0000

infra/airflow-cluster/Dockerfile

@@ -5,23 +5,24 @@ USER root
 
 RUN apt-get update && apt-get install -y \
     build-essential=12.9 \
-    default-jre=2:1.11-72 \
-    git=1:2.30.2-1+deb11u2 \
+    default-jre=2:1.17-74 \
+    git=1:2.39.5-0+deb12u2 \
     make=4.3-4.1 \
-    wget=1.21-1+deb11u1 \
-    unzip=6.0-26+deb11u1 \
+    wget=1.21.3-1+deb12u1 \
+    unzip=6.0-28 \
+    gosu=1.14-1+b10 \
     && rm -rf /var/lib/apt/lists/*
 
 # back to normal user
 USER airflow
 
 COPY libraries /home/airflow
-
 # requirements.txt shall be made availble from the **ted-sws** GitHub repository
 COPY requirements.txt /opt/airflow
 
 # working in the /opt/airflow
 WORKDIR /opt/airflow
+
 RUN mkdir -p ./dags ./ted_sws
 
 

infra/airflow/Dockerfile

@@ -5,11 +5,12 @@ USER root
 
 RUN apt-get update && apt-get install -y \
     build-essential=12.9 \
-    default-jre=2:1.11-72 \
-    git=1:2.30.2-1+deb11u2 \
+    default-jre=2:1.17-74 \
+    git=1:2.39.5-0+deb12u2 \
     make=4.3-4.1 \
-    wget=1.21-1+deb11u1 \
-    unzip=6.0-26+deb11u1 \
+    wget=1.21.3-1+deb12u1 \
+    unzip=6.0-28 \
+    gosu=1.14-1+b10 \
     && rm -rf /var/lib/apt/lists/*
 
 # back to normal user

ted_sws/event_manager/adapters/event_logging_repository.py

@@ -5,6 +5,7 @@
 from ted_sws import config
 from ted_sws.data_manager.adapters import inject_date_string_fields
 from ted_sws.event_manager.model.event_message import EventMessage
+from enum import Enum
 
 """
 This module contains the event logging repository adapters.
@@ -114,7 +115,18 @@ def add(self, event_message: EventMessage) -> str:
         :param event_message: The event message to be added
         :return:
         """
-        record = self.prepare_record(event_message)
+        record = event_message.model_dump(mode="python")
+
+        # Convert all Enum fields recursively
+        record = convert_enums_to_values(record)
+
+        for event_date_field_name in LOGGING_DATE_FIELD_NAMES:
+            inject_date_string_fields(
+                data=record,
+                date_field_name=event_date_field_name,
+                date_string_fields_suffix_map=LOGGING_DATE_STRING_FIELDS_SUFFIX_MAP,
+            )
+
         result = self.collection.insert_one(record)
         return result.inserted_id
 
@@ -171,3 +183,41 @@ def __init__(self, mongodb_client: MongoClient, database_name: str = None,
         :param collection_name: The collection name
         """
         super().__init__(mongodb_client, database_name, collection_name)
+
+
+
+
+
+
+def convert_enums_to_values(obj):
+    """
+    Recursively convert all Enum instances within a data structure to their corresponding values.
+
+    This function walks through nested dictionaries and lists, replacing any instances of
+    Python `Enum` objects with their `.value`. This is useful for preparing data to be
+    serialised into formats like JSON or inserted into databases such as MongoDB, which do not
+    support serialising Enum instances directly.
+
+    Args:
+        obj (Any): The object to convert. Can be a dict, list, Enum, or any other type.
+
+    Returns:
+        Any: A copy of the object with all Enums replaced by their raw values.
+              The structure and other data types remain unchanged.
+
+    Example:
+      class Color(Enum):
+        ...     RED = "red"
+        ...     BLUE = "blue"
+         data = {"favourite": Color.RED, "others": [Color.BLUE, "green"]}
+         convert_enums_to_values(data)
+        {'favourite': 'red', 'others': ['blue', 'green']}
+    """
+    if isinstance(obj, dict):
+        return {k: convert_enums_to_values(v) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        return [convert_enums_to_values(item) for item in obj]
+    elif isinstance(obj, Enum):
+        return obj.value
+    else:
+        return obj