fix bug with nested subqueries

Author: ceciliastevens

src/_incydr_sdk/queries/file_events.py

@@ -92,7 +92,7 @@ class FilterGroup(BaseModel):
 
 class FilterGroupV2(BaseModel):
     subgroupClause: str = "AND"
-    subgroups: List[Union[FilterGroup, FilterGroupV2]]
+    subgroups: List[Union[FilterGroupV2, FilterGroup]]
 
 
 class Query(Model):
@@ -373,7 +373,7 @@ def subquery(self, subgroup_query: EventQuery):
         self.groups.append(
             FilterGroupV2(
                 subgroupClause=subgroup_query.group_clause,
-                subgroups=[x for x in subgroup_query.groups],
+                subgroups=subgroup_query.groups,
             )
         )
         return self

tests/queries/test_event_query.py

@@ -360,7 +360,7 @@ def test_date_range_filter_creates_correct_filter(start_timestamp):
     assert q.groups.pop() == expected
 
 
-def test_subgroup_creates_expected_filter_subgroup():
+def test_subquery_creates_expected_filter_subgroup():
     subgroup_q = (
         EventQuery()
         .matches_any()
@@ -377,3 +377,14 @@ def test_subgroup_creates_expected_filter_subgroup():
     assert q.group_clause == "AND"
     assert q.groups[0].subgroupClause == "OR"
     assert q.groups[0].subgroups[0] == expected
+
+
+def test_subquery_handles_nested_subquery():
+    q = EventQuery().subquery(
+        EventQuery().subquery(EventQuery().equals("term", "value"))
+    )
+    assert isinstance(q.groups[0], FilterGroupV2)
+    assert isinstance(q.groups[0].subgroups[0], FilterGroupV2)
+    assert isinstance(q.groups[0].subgroups[0].subgroups[0], FilterGroup)
+    assert q.groups[0].subgroups[0].subgroups[0].filters[0].term == "term"
+    assert q.groups[0].subgroups[0].subgroups[0].filters[0].value == "value"