fix(be): filter list of events by instance set id

After c16369d0, list filters only work when done against a direct field
of the model being listed. This commit changes the event service to
filter events by instance set id wheenever an instance id or journey id
filter is passed.

Author: luis-dk

common/entity_services/event_service.py

@@ -37,11 +37,12 @@ def get_events_with_rules(*, rules: ListRules, filters: ProjectEventFilters) ->
         filter_list: list[object] = [EventEntity.project << filters.project_ids]
 
         if filters.instance_ids or filters.journey_ids:
-            query = query.join(InstanceSet).join(InstancesInstanceSets).join(Instance).switch(EventEntity)
+            instance_set_subquery = InstanceSet.select(InstanceSet.id).join(InstancesInstanceSets).join(Instance)
             if filters.journey_ids:
-                filter_list.append(Instance.journey << filters.journey_ids)
+                instance_set_subquery = instance_set_subquery.where(Instance.journey << filters.journey_ids)
             if filters.instance_ids:
-                filter_list.append(Instance.id << filters.instance_ids)
+                instance_set_subquery = instance_set_subquery.where(Instance.id << filters.instance_ids)
+            query = query.where(EventEntity.instance_set.in_(instance_set_subquery))
         if filters.event_types:
             filter_list.append(EventEntity.type << filters.event_types)
         if filters.component_ids:
@@ -53,9 +54,9 @@ def get_events_with_rules(*, rules: ListRules, filters: ProjectEventFilters) ->
         if filters.task_ids:
             filter_list.append(EventEntity.task << filters.task_ids)
         if filters.date_range_start:
-            filter_list.append(EventEntity.timestamp >= EventEntity.timestamp.db_value(filters.date_range_start))
+            filter_list.append(EventEntity.timestamp >= filters.date_range_start)
         if filters.date_range_end:
-            filter_list.append(EventEntity.timestamp < EventEntity.timestamp.db_value(filters.date_range_end))
+            filter_list.append(EventEntity.timestamp < filters.date_range_end)
 
         query = query.where(*filter_list)
         page = Page[EventEntity].get_paginated_results(query, EventEntity.timestamp, rules)

testlib/fixtures/entities.py

@@ -621,6 +621,7 @@ def event_entity_2(test_db, dataset):
         version=EventVersion.V2,
         type=ApiEventType.DATASET_OPERATION,
         created_timestamp=datetime(2024, 1, 20, 9, 55, 0, tzinfo=timezone.utc),
+        timestamp=datetime(2024, 1, 20, 9, 55, 0, tzinfo=timezone.utc),
         project=dataset.project_id,
         component=dataset,
         v2_payload={},