fixes

Author: HardMax71

backend/app/api/routes/admin/events.py

@@ -10,8 +10,8 @@
 
 from app.api.dependencies import admin_user
 from app.core.correlation import CorrelationContext
-from app.domain.admin import ReplayQuery
 from app.domain.enums.events import EventType
+from app.domain.replay import ReplayFilter
 from app.domain.events.event_models import EventFilter
 from app.schemas_pydantic.admin_events import (
     EventBrowseRequest,
@@ -153,7 +153,7 @@ async def replay_events(
 ) -> EventReplayResponse:
     try:
         replay_correlation_id = f"replay_{CorrelationContext.get_correlation_id()}"
-        rq = ReplayQuery(
+        replay_filter = ReplayFilter(
             event_ids=request.event_ids,
             correlation_id=request.correlation_id,
             aggregate_id=request.aggregate_id,
@@ -162,7 +162,7 @@ async def replay_events(
         )
         try:
             result = await service.prepare_or_schedule_replay(
-                replay_query=rq,
+                replay_filter=replay_filter,
                 dry_run=request.dry_run,
                 replay_correlation_id=replay_correlation_id,
                 target_service=request.target_service,

backend/app/db/docs/__init__.py

@@ -9,7 +9,6 @@
 from app.db.docs.event import (
     EventArchiveDocument,
     EventDocument,
-    EventStoreDocument,
 )
 from app.db.docs.execution import ExecutionDocument, ResourceUsage
 from app.db.docs.notification import (
@@ -44,7 +43,6 @@
     SagaDocument,
     DLQMessageDocument,
     EventDocument,
-    EventStoreDocument,
     EventArchiveDocument,
     ReplaySessionDocument,
     ResourceAllocationDocument,
@@ -74,7 +72,6 @@
     "DLQMessageDocument",
     # Event
     "EventDocument",
-    "EventStoreDocument",
     "EventArchiveDocument",
     # Replay
     "ReplaySessionDocument",

backend/app/db/docs/event.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta, timezone
-from typing import Any, Dict
+from typing import Any
 from uuid import uuid4
 
 import pymongo
@@ -28,10 +28,10 @@ class EventMetadata(BaseModel):
 
 
 class EventDocument(Document):
-    """Event document as stored in database.
+    """Event document for event browsing/admin system.
 
-    Copied from EventInDB schema. Uses extra="allow" to store
-    additional fields from polymorphic BaseEvent subclasses.
+    Uses payload dict for flexible event data storage.
+    This is separate from EventStoreDocument which uses flat structure for Kafka events.
     """
 
     event_id: Indexed(str, unique=True) = Field(default_factory=lambda: str(uuid4()))  # type: ignore[valid-type]
@@ -40,7 +40,7 @@ class EventDocument(Document):
     timestamp: Indexed(datetime) = Field(default_factory=lambda: datetime.now(timezone.utc))  # type: ignore[valid-type]
     aggregate_id: Indexed(str) | None = None  # type: ignore[valid-type]
     metadata: EventMetadata
-    payload: Dict[str, Any] = Field(default_factory=dict)
+    payload: dict[str, Any] = Field(default_factory=dict)
     stored_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     ttl_expires_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc) + timedelta(days=30))
 
@@ -86,68 +86,10 @@ class Settings:
         ]
 
 
-class EventStoreDocument(Document):
-    """Event store document for permanent event storage.
-
-    Same structure as EventDocument but in event_store collection.
-    Uses extra="allow" to store additional fields from polymorphic events.
-    No TTL index since this is permanent storage.
-    """
-
-    event_id: Indexed(str, unique=True) = Field(default_factory=lambda: str(uuid4()))  # type: ignore[valid-type]
-    event_type: EventType  # Indexed via Settings.indexes
-    event_version: str = "1.0"
-    timestamp: Indexed(datetime) = Field(default_factory=lambda: datetime.now(timezone.utc))  # type: ignore[valid-type]
-    aggregate_id: Indexed(str) | None = None  # type: ignore[valid-type]
-    metadata: EventMetadata
-    payload: Dict[str, Any] = Field(default_factory=dict)
-    stored_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    ttl_expires_at: datetime | None = None
-
-    model_config = ConfigDict(from_attributes=True, extra="allow")
-
-    class Settings:
-        name = "event_store"
-        use_state_management = True
-        indexes = [
-            # Compound indexes for common query patterns
-            IndexModel([("event_type", ASCENDING), ("timestamp", DESCENDING)], name="idx_event_type_ts"),
-            IndexModel([("aggregate_id", ASCENDING), ("timestamp", DESCENDING)], name="idx_aggregate_ts"),
-            IndexModel([("metadata.correlation_id", ASCENDING)], name="idx_meta_correlation"),
-            IndexModel([("metadata.user_id", ASCENDING), ("timestamp", DESCENDING)], name="idx_meta_user_ts"),
-            IndexModel([("metadata.service_name", ASCENDING), ("timestamp", DESCENDING)], name="idx_meta_service_ts"),
-            # Payload sparse indexes
-            IndexModel([("payload.execution_id", ASCENDING)], name="idx_payload_execution", sparse=True),
-            IndexModel([("payload.pod_name", ASCENDING)], name="idx_payload_pod", sparse=True),
-            # Additional compound indexes for query optimization
-            IndexModel([("event_type", ASCENDING), ("aggregate_id", ASCENDING)], name="idx_events_type_agg"),
-            IndexModel([("aggregate_id", ASCENDING), ("timestamp", ASCENDING)], name="idx_events_agg_ts"),
-            IndexModel([("event_type", ASCENDING), ("timestamp", ASCENDING)], name="idx_events_type_ts_asc"),
-            IndexModel([("metadata.user_id", ASCENDING), ("timestamp", ASCENDING)], name="idx_events_user_ts"),
-            IndexModel([("metadata.user_id", ASCENDING), ("event_type", ASCENDING)], name="idx_events_user_type"),
-            IndexModel(
-                [("event_type", ASCENDING), ("metadata.user_id", ASCENDING), ("timestamp", DESCENDING)],
-                name="idx_events_type_user_ts",
-            ),
-            # Text search index
-            IndexModel(
-                [
-                    ("event_type", pymongo.TEXT),
-                    ("metadata.service_name", pymongo.TEXT),
-                    ("metadata.user_id", pymongo.TEXT),
-                    ("payload", pymongo.TEXT),
-                ],
-                name="idx_text_search",
-                language_override="none",
-                default_language="english",
-            ),
-        ]
-
-
 class EventArchiveDocument(Document):
     """Archived event with deletion metadata.
 
-    Uses extra="allow" to preserve all fields from polymorphic events.
+    Mirrors EventDocument structure with additional archive metadata.
     """
 
     event_id: Indexed(str, unique=True)  # type: ignore[valid-type]
@@ -156,13 +98,14 @@ class EventArchiveDocument(Document):
     timestamp: Indexed(datetime)  # type: ignore[valid-type]
     aggregate_id: str | None = None
     metadata: EventMetadata
-    payload: Dict[str, Any] = Field(default_factory=dict)
+    payload: dict[str, Any] = Field(default_factory=dict)
     stored_at: datetime | None = None
     ttl_expires_at: datetime | None = None
 
     # Archive metadata
     deleted_at: Indexed(datetime) = Field(default_factory=lambda: datetime.now(timezone.utc))  # type: ignore[valid-type]
     deleted_by: str | None = None
+    deletion_reason: str | None = None
 
     model_config = ConfigDict(from_attributes=True, extra="allow")