unification of api (result -> skip/has more,..)

Author: HardMax71

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

@@ -1,4 +1,3 @@
-from dataclasses import asdict
 from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, List
 
@@ -354,18 +353,11 @@ async def count_events_for_replay(self, query: Dict[str, Any]) -> int:
         """Count events matching replay query."""
         return await self.events_collection.count_documents(query)
 
-    async def get_events_preview_for_replay(self, query: Dict[str, Any], limit: int = 100) -> List[Dict[str, Any]]:
+    async def get_events_preview_for_replay(self, query: Dict[str, Any], limit: int = 100) -> List[EventSummary]:
         """Get preview of events for replay."""
         cursor = self.events_collection.find(query).limit(limit)
         event_docs = await cursor.to_list(length=limit)
-
-        # Convert to event summaries
-        summaries: List[Dict[str, Any]] = []
-        for doc in event_docs:
-            summary = self.summary_mapper.from_mongo_document(doc)
-            summaries.append(asdict(summary))
-
-        return summaries
+        return [self.summary_mapper.from_mongo_document(doc) for doc in event_docs]
 
     def build_replay_query(self, replay_query: ReplayQuery) -> Dict[str, Any]:
         """Build MongoDB query from replay query model."""
@@ -384,8 +376,7 @@ async def prepare_replay_session(
         # Get events preview for dry run
         events_preview: List[EventSummary] = []
         if dry_run:
-            preview_docs = await self.get_events_preview_for_replay(query, limit=100)
-            events_preview = [self.summary_mapper.from_mongo_document(e) for e in preview_docs]
+            events_preview = await self.get_events_preview_for_replay(query, limit=100)
 
         # Return unified session data
         session_data = ReplaySessionData(

backend/app/db/repositories/event_repository.py

@@ -128,7 +128,7 @@ async def get_events_by_aggregate(
     async def get_events_by_correlation(
         self, correlation_id: str, limit: int = 100, skip: int = 0
     ) -> EventListResult:
-        query = {EventFields.METADATA_CORRELATION_ID: correlation_id}
+        query: dict[str, Any] = {EventFields.METADATA_CORRELATION_ID: correlation_id}
         total_count = await self._collection.count_documents(query)
 
         cursor = (

backend/app/db/repositories/user_settings_repository.py

@@ -59,7 +59,10 @@ async def get_settings_events(
         until: datetime | None = None,
         limit: int | None = None,
     ) -> List[DomainSettingsEvent]:
-        query = {"aggregate_id": f"user_settings_{user_id}", "event_type": {"$in": [str(et) for et in event_types]}}
+        query: Dict[str, Any] = {
+            "aggregate_id": f"user_settings_{user_id}",
+            "event_type": {"$in": [str(et) for et in event_types]},
+        }
 
         if since or until:
             timestamp_query: Dict[str, Any] = {}

backend/app/services/saga/saga_orchestrator.py

@@ -390,8 +390,8 @@ async def get_saga_status(self, saga_id: str) -> Saga | None:
 
     async def get_execution_sagas(self, execution_id: str) -> list[Saga]:
         """Get all sagas for an execution, sorted by created_at descending (newest first)"""
-        sagas = await self._repo.get_sagas_by_execution(execution_id)
-        return sagas
+        result = await self._repo.get_sagas_by_execution(execution_id)
+        return result.sagas
 
     async def cancel_saga(self, saga_id: str) -> bool:
         """Cancel a running saga and trigger compensation.

backend/tests/integration/services/events/test_event_service_integration.py

@@ -29,21 +29,21 @@ async def test_event_service_access_and_queries(scope) -> None:  # type: ignore[
     await repo.store_event(e1)
     await repo.store_event(e2)
 
-    # get_execution_events returns [] when non-admin for different user; then admin sees
+    # get_execution_events returns None when non-admin for different user; then admin sees
     events_user = await svc.get_execution_events("agg1", "u2", UserRole.USER)
     assert events_user is None
     events_admin = await svc.get_execution_events("agg1", "admin", UserRole.ADMIN)
-    assert any(ev.aggregate_id == "agg1" for ev in events_admin)
+    assert any(ev.aggregate_id == "agg1" for ev in events_admin.events)
 
     # query_events_advanced: basic run (empty filters) should return a result structure
     res = await svc.query_events_advanced("u1", UserRole.USER, filters=EventFilter(), sort_by="correlation_id", sort_order=SortOrder.ASC)
     assert res is not None
 
     # get_events_by_correlation filters non-admin to their own user_id
     by_corr_user = await svc.get_events_by_correlation("c1", user_id="u1", user_role=UserRole.USER, include_all_users=False)
-    assert all(ev.metadata.user_id == "u1" for ev in by_corr_user)
+    assert all(ev.metadata.user_id == "u1" for ev in by_corr_user.events)
     by_corr_admin = await svc.get_events_by_correlation("c1", user_id="admin", user_role=UserRole.ADMIN, include_all_users=True)
-    assert len(by_corr_admin) >= 2
+    assert len(by_corr_admin.events) >= 2
 
     # get_event_statistics (time window)
     _ = await svc.get_event_statistics("u1", UserRole.USER, start_time=now - timedelta(days=1), end_time=now + timedelta(days=1))

backend/tests/unit/db/repositories/test_event_repository.py

@@ -41,11 +41,11 @@ async def test_store_get_and_queries(repo: EventRepository, db) -> None:  # type
     by_agg = await repo.get_events_by_aggregate("x2")
     assert any(ev.event_id == "e2" for ev in by_agg)
     by_corr = await repo.get_events_by_correlation("c1")
-    assert len(by_corr) >= 2
+    assert len(by_corr.events) >= 2
     by_user = await repo.get_events_by_user("u1", limit=10)
     assert len(by_user) >= 2
     exec_events = await repo.get_execution_events("x1")
-    assert any(ev.event_id == "e1" for ev in exec_events)
+    assert any(ev.event_id == "e1" for ev in exec_events.events)
 
 
 @pytest.mark.asyncio