metadata (domain vs. avro vs. pydantic) fixes

Author: HardMax71

backend/app/api/routes/events.py

@@ -12,7 +12,7 @@
 from app.core.utils import get_client_ip
 from app.domain.enums.common import SortOrder
 from app.domain.events.event_models import EventFilter
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata as EventMetadata
 from app.schemas_pydantic.events import (
     DeleteEventResponse,
     EventAggregationRequest,

backend/app/api/routes/execution.py

@@ -14,7 +14,7 @@
 from app.domain.enums.execution import ExecutionStatus
 from app.domain.enums.user import UserRole
 from app.infrastructure.kafka.events.base import BaseEvent
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata as EventMetadata
 from app.schemas_pydantic.execution import (
     CancelExecutionRequest,
     CancelResponse,

backend/app/api/routes/user_settings.py

@@ -46,7 +46,9 @@ async def update_user_settings(
         timezone=updates.timezone,
         date_format=updates.date_format,
         time_format=updates.time_format,
-        notifications=DomainNotificationSettings(**updates.notifications.model_dump()) if updates.notifications else None,
+        notifications=(
+            DomainNotificationSettings(**updates.notifications.model_dump()) if updates.notifications else None
+        ),
         editor=DomainEditorSettings(**updates.editor.model_dump()) if updates.editor else None,
         custom_settings=updates.custom_settings,
     )

backend/app/db/repositories/admin/admin_events_repository.py

@@ -1,3 +1,4 @@
+from dataclasses import asdict
 from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, List
 
@@ -362,9 +363,7 @@ async def get_events_preview_for_replay(self, query: Dict[str, Any], limit: int
         summaries: List[Dict[str, Any]] = []
         for doc in event_docs:
             summary = self.summary_mapper.from_mongo_document(doc)
-            summary_dict = self.summary_mapper.to_dict(summary)
-            # Convert EventFields enum keys to strings
-            summaries.append({str(k): v for k, v in summary_dict.items()})
+            summaries.append(asdict(summary))
 
         return summaries
 

backend/app/domain/events/__init__.py

@@ -1,3 +1,4 @@
+from app.domain.events.event_metadata import EventMetadata
 from app.domain.events.event_models import (
     ArchivedEvent,
     Event,
@@ -12,7 +13,6 @@
     EventStatistics,
     ExecutionEventsResult,
 )
-from app.infrastructure.kafka.events.metadata import EventMetadata
 
 __all__ = [
     "ArchivedEvent",

backend/app/domain/events/event_metadata.py

@@ -0,0 +1,47 @@
+from dataclasses import asdict, dataclass, field, replace
+from typing import Any
+from uuid import uuid4
+
+from app.domain.enums.common import Environment
+
+
+@dataclass
+class EventMetadata:
+    """Domain event metadata for auditing and tracing."""
+
+    service_name: str
+    service_version: str
+    correlation_id: str = field(default_factory=lambda: str(uuid4()))
+    user_id: str | None = None
+    ip_address: str | None = None
+    user_agent: str | None = None
+    environment: Environment = Environment.PRODUCTION
+
+    def to_dict(self, exclude_none: bool = True) -> dict[str, Any]:
+        result = asdict(self)
+        if isinstance(result.get("environment"), Environment):
+            result["environment"] = result["environment"].value
+        if exclude_none:
+            return {k: v for k, v in result.items() if v is not None}
+        return result
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> "EventMetadata":
+        env = data.get("environment", Environment.PRODUCTION)
+        if isinstance(env, str):
+            env = Environment(env)
+        return cls(
+            service_name=data.get("service_name", "unknown"),
+            service_version=data.get("service_version", "1.0"),
+            correlation_id=data.get("correlation_id", str(uuid4())),
+            user_id=data.get("user_id"),
+            ip_address=data.get("ip_address"),
+            user_agent=data.get("user_agent"),
+            environment=env,
+        )
+
+    def with_correlation(self, correlation_id: str) -> "EventMetadata":
+        return replace(self, correlation_id=correlation_id)
+
+    def with_user(self, user_id: str) -> "EventMetadata":
+        return replace(self, user_id=user_id)

backend/app/domain/events/event_models.py

@@ -4,7 +4,7 @@
 
 from app.core.utils import StringEnum
 from app.domain.enums.events import EventType
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.domain.events.event_metadata import EventMetadata
 
 MongoQueryValue = str | dict[str, str | list[str] | float | datetime]
 MongoQuery = dict[str, MongoQueryValue]

backend/app/infrastructure/kafka/__init__.py

@@ -1,13 +1,13 @@
 """Kafka infrastructure for event-driven architecture."""
 
 from app.infrastructure.kafka.events.base import BaseEvent
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.infrastructure.kafka.mappings import get_event_class_for_type, get_topic_for_event
 from app.infrastructure.kafka.topics import get_all_topics, get_topic_configs
 
 __all__ = [
     "BaseEvent",
-    "EventMetadata",
+    "AvroEventMetadata",
     "get_all_topics",
     "get_topic_configs",
     "get_event_class_for_type",

backend/app/infrastructure/kafka/events/__init__.py

@@ -10,7 +10,7 @@
     ExecutionStartedEvent,
     ExecutionTimeoutEvent,
 )
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.infrastructure.kafka.events.notification import (
     NotificationClickedEvent,
     NotificationCreatedEvent,
@@ -70,7 +70,7 @@
 __all__ = [
     # Base
     "BaseEvent",
-    "EventMetadata",
+    "AvroEventMetadata",
     # Execution
     "ExecutionRequestedEvent",
     "ExecutionAcceptedEvent",

backend/app/infrastructure/kafka/events/base.py

@@ -7,7 +7,7 @@
 
 from app.domain.enums.events import EventType
 from app.domain.enums.kafka import KafkaTopic
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 
 
 class BaseEvent(AvroBase):
@@ -18,7 +18,7 @@ class BaseEvent(AvroBase):
     event_version: str = "1.0"
     timestamp: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     aggregate_id: str | None = None
-    metadata: EventMetadata
+    metadata: AvroEventMetadata
 
     # Each subclass must define its topic
     topic: ClassVar[KafkaTopic]