update from_saved_search method to avoid possible srt-key/srt-dir conflicts

Author: ceciliastevens

src/_incydr_sdk/queries/file_events.py

@@ -396,23 +396,6 @@ def subquery(self, subgroup_query: EventQuery):
         )
         return self
 
-    @classmethod
-    def from_saved_search(cls, saved_search: SavedSearch):
-        """
-        Create an `EventQuery` object from a `SavedSearch` response.
-        """
-        query = cls()
-        if saved_search.group_clause:
-            query.group_clause = saved_search.group_clause
-        if saved_search.groups:
-            for i in saved_search.groups:
-                query.groups.append(_handle_filter_group_type(i))
-        if saved_search.srt_dir:
-            query.sort_dir = saved_search.srt_dir
-        if saved_search.srt_key:
-            query.sort_key = saved_search.srt_key
-        return query
-
 
 class EventQuery(BaseEventQuery):
     """
@@ -430,6 +413,23 @@ class EventQuery(BaseEventQuery):
     sort_dir: str = Field("asc", alias="srtDir")
     sort_key: EventSearchTerm = Field("event.id", alias="srtKey")
 
+    @classmethod
+    def from_saved_search(cls, saved_search: SavedSearch):
+        """
+        Create an `EventQuery` object from a `SavedSearch` response.
+        """
+        query = cls()
+        if saved_search.group_clause:
+            query.group_clause = saved_search.group_clause
+        if saved_search.groups:
+            for i in saved_search.groups:
+                query.groups.append(_handle_filter_group_type(i))
+        if saved_search.srt_dir:
+            query.sort_dir = saved_search.srt_dir
+        if saved_search.srt_key:
+            query.sort_key = saved_search.srt_key
+        return query
+
 
 class GroupingEventQuery(BaseEventQuery):
     """
@@ -459,6 +459,19 @@ def maximum_size(self, size: int):
         self.size = size
         return self
 
+    @classmethod
+    def from_saved_search(cls, saved_search: SavedSearch):
+        """
+        Create an `EventQuery` object from a `SavedSearch` response.
+        """
+        query = cls()
+        if saved_search.group_clause:
+            query.group_clause = saved_search.group_clause
+        if saved_search.groups:
+            for i in saved_search.groups:
+                query.groups.append(_handle_filter_group_type(i))
+        return query
+
 
 def _create_date_range_filter_group(start_date, end_date, term=None):
     def _validate_duration_str(iso_duration_str):