search_text field unification in events

Author: HardMax71

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

@@ -22,18 +22,9 @@
     EventReplayStatusResponse,
     EventStatsResponse,
 )
-from app.schemas_pydantic.admin_events import EventFilter as AdminEventFilter
 from app.schemas_pydantic.user import UserResponse
 from app.services.admin import AdminEventsService
 
-
-def _to_event_filter(pydantic_filter: AdminEventFilter) -> EventFilter:
-    """Convert Pydantic EventFilter to domain EventFilter."""
-    data = pydantic_filter.model_dump(mode="json")  # auto-converts enums to strings
-    data["text_search"] = data.pop("search_text", None)
-    return EventFilter(**data)
-
-
 router = APIRouter(
     prefix="/admin/events", tags=["admin-events"], route_class=DishkaRoute, dependencies=[Depends(admin_user)]
 )
@@ -42,7 +33,7 @@ def _to_event_filter(pydantic_filter: AdminEventFilter) -> EventFilter:
 @router.post("/browse")
 async def browse_events(request: EventBrowseRequest, service: FromDishka[AdminEventsService]) -> EventBrowseResponse:
     try:
-        event_filter = _to_event_filter(request.filters)
+        event_filter = EventFilter(**request.filters.model_dump(mode="json"))
 
         result = await service.browse_events(
             event_filter=event_filter,
@@ -85,12 +76,10 @@ async def export_events_csv(
     limit: int = Query(default=10000, le=50000),
 ) -> StreamingResponse:
     try:
-        export_filter = _to_event_filter(
-            AdminEventFilter(
-                event_types=event_types,
-                start_time=start_time,
-                end_time=end_time,
-            )
+        export_filter = EventFilter(
+            event_types=[str(et) for et in event_types] if event_types else None,
+            start_time=start_time,
+            end_time=end_time,
         )
         result = await service.export_events_csv_content(event_filter=export_filter, limit=limit)
         return StreamingResponse(
@@ -117,16 +106,14 @@ async def export_events_json(
 ) -> StreamingResponse:
     """Export events as JSON with comprehensive filtering."""
     try:
-        export_filter = _to_event_filter(
-            AdminEventFilter(
-                event_types=event_types,
-                aggregate_id=aggregate_id,
-                correlation_id=correlation_id,
-                user_id=user_id,
-                service_name=service_name,
-                start_time=start_time,
-                end_time=end_time,
-            )
+        export_filter = EventFilter(
+            event_types=[str(et) for et in event_types] if event_types else None,
+            aggregate_id=aggregate_id,
+            correlation_id=correlation_id,
+            user_id=user_id,
+            service_name=service_name,
+            start_time=start_time,
+            end_time=end_time,
         )
         result = await service.export_events_json_content(event_filter=export_filter, limit=limit)
         return StreamingResponse(

backend/app/api/routes/events.py

@@ -107,7 +107,7 @@ async def query_events(
         service_name=filter_request.service_name,
         start_time=filter_request.start_time,
         end_time=filter_request.end_time,
-        text_search=filter_request.text_search,
+        search_text=filter_request.search_text,
     )
 
     result = await event_service.query_events_advanced(

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

@@ -41,7 +41,6 @@ class ReplaySessionStatusDetail:
 class AdminEventsRepository:
     def _event_filter_conditions(self, f: EventFilter) -> list[Any]:
         """Build Beanie query conditions from EventFilter."""
-        text_search = f.text_search or f.search_text
         conditions = [
             In(EventDocument.event_type, f.event_types) if f.event_types else None,
             EventDocument.aggregate_id == f.aggregate_id if f.aggregate_id else None,
@@ -50,7 +49,7 @@ def _event_filter_conditions(self, f: EventFilter) -> list[Any]:
             EventDocument.metadata.service_name == f.service_name if f.service_name else None,
             GTE(EventDocument.timestamp, f.start_time) if f.start_time else None,
             LTE(EventDocument.timestamp, f.end_time) if f.end_time else None,
-            Text(text_search) if text_search else None,
+            Text(f.search_text) if f.search_text else None,
         ]
         return [c for c in conditions if c is not None]
 

backend/app/domain/events/event_models.py

@@ -81,7 +81,6 @@ class EventFilter:
     start_time: datetime | None = None
     end_time: datetime | None = None
     search_text: str | None = None
-    text_search: str | None = None
     status: str | None = None
 
 

backend/app/schemas_pydantic/events.py

@@ -72,7 +72,7 @@ class EventFilterRequest(BaseModel):
     service_name: str | None = Field(None, description="Filter by service name")
     start_time: datetime | None = Field(None, description="Filter events after this time")
     end_time: datetime | None = Field(None, description="Filter events before this time")
-    text_search: str | None = Field(None, description="Full-text search in event data")
+    search_text: str | None = Field(None, description="Full-text search in event data")
     sort_by: str = Field("timestamp", description="Field to sort by")
     sort_order: SortOrder = Field(SortOrder.DESC, description="Sort order")
     limit: int = Field(100, ge=1, le=1000, description="Maximum events to return")
@@ -190,7 +190,7 @@ class EventQuery(BaseModel):
     service_name: str | None = None
     start_time: datetime | None = None
     end_time: datetime | None = None
-    text_search: str | None = None
+    search_text: str | None = None
     limit: int = Field(default=100, ge=1, le=1000)
     skip: int = Field(default=0, ge=0)
 

backend/app/services/event_service.py

@@ -42,9 +42,8 @@ def _filter_to_mongo_query(flt: EventFilter) -> dict[str, Any]:
             time_query["$lte"] = flt.end_time
         query["timestamp"] = time_query
 
-    search = getattr(flt, "text_search", None) or getattr(flt, "search_text", None)
-    if search:
-        query["$text"] = {"$search": search}
+    if flt.search_text:
+        query["$text"] = {"$search": flt.search_text}
 
     return query