further fixes

Author: HardMax71

backend/app/db/repositories/event_repository.py

@@ -159,8 +159,17 @@ async def get_events_by_user(
         docs = await cursor.to_list(length=limit)
         return [self.mapper.from_mongo_document(doc) for doc in docs]
 
-    async def get_execution_events(self, execution_id: str, limit: int = 100, skip: int = 0) -> EventListResult:
-        query = {"$or": [{EventFields.PAYLOAD_EXECUTION_ID: execution_id}, {EventFields.AGGREGATE_ID: execution_id}]}
+    async def get_execution_events(
+        self, execution_id: str, limit: int = 100, skip: int = 0, exclude_system_events: bool = False
+    ) -> EventListResult:
+        query: dict[str, Any] = {
+            "$or": [{EventFields.PAYLOAD_EXECUTION_ID: execution_id}, {EventFields.AGGREGATE_ID: execution_id}]
+        }
+
+        # Filter out system events at DB level for accurate pagination
+        if exclude_system_events:
+            query[EventFields.METADATA_SERVICE_NAME] = {"$not": {"$regex": "^system-"}}
+
         total_count = await self._collection.count_documents(query)
 
         cursor = self._collection.find(query).sort(EventFields.TIMESTAMP, ASCENDING).skip(skip).limit(limit)

backend/app/services/event_service.py

@@ -37,7 +37,13 @@ async def get_execution_events(
         limit: int = 1000,
         skip: int = 0,
     ) -> EventListResult | None:
-        result = await self.repository.get_execution_events(execution_id=execution_id, limit=limit, skip=skip)
+        # Filter system events at DB level for accurate pagination
+        result = await self.repository.get_execution_events(
+            execution_id=execution_id,
+            limit=limit,
+            skip=skip,
+            exclude_system_events=not include_system_events,
+        )
         if not result.events:
             return EventListResult(events=[], total=0, skip=skip, limit=limit, has_more=False)
 
@@ -50,17 +56,6 @@ async def get_execution_events(
         if owner and owner != user_id and user_role != UserRole.ADMIN:
             return None
 
-        if not include_system_events:
-            filtered = [e for e in result.events if not (e.metadata and e.metadata.service_name.startswith("system-"))]
-            # Recalculate has_more based on filtered count
-            return EventListResult(
-                events=filtered,
-                total=result.total,
-                skip=skip,
-                limit=limit,
-                has_more=result.has_more,
-            )
-
         return result
 
     async def get_user_events_paginated(

docs/testing/kafka-test-stability.md

@@ -4,7 +4,7 @@
 
 When running tests in parallel (e.g., with `pytest-xdist`), you might encounter sporadic crashes with messages like:
 
-```
+```text
 Fatal Python error: Aborted
 ```