fix(open_search): change the way range is added to filters (#400)

* fix: change the way range is added to filters * fix: add a way to manage multiple range filter * typo * typo
google · Feb 15, 2024 · c221464 · c221464
1 parent 84d44eb
commit c221464
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 17 deletions.
diff --git a/slo_generator/backends/open_search.py b/slo_generator/backends/open_search.py
@@ -134,10 +134,22 @@ def build_query(query, window, date_field):
         }
 
         if "filter" in body["query"]["bool"]:
-            body["query"]["bool"]["filter"]["range"] = range_query
+            if isinstance(body["query"]["bool"]["filter"], dict):
+                body["query"]["bool"]["filter"] = [body["query"]["bool"]["filter"]]
+
+            indexes = [
+                i
+                for i, x in enumerate(body["query"]["bool"]["filter"])
+                if "range" in x and date_field in x["range"]
+            ]
+            body["query"]["bool"]["filter"] = [
+                i
+                for j, i in enumerate(body["query"]["bool"]["filter"])
+                if j not in indexes
+            ]
+            body["query"]["bool"]["filter"].append({"range": range_query})
         else:
             body["query"]["bool"]["filter"] = {"range": range_query}
-
         return body
 
 

diff --git a/tests/unit/backends/test_opensearch.py b/tests/unit/backends/test_opensearch.py
@@ -63,25 +63,29 @@ def test_build_query_with_simple_query_and_simple_filter(self):
                             "status": "200",
                         },
                     },
-                    "filter": {
-                        "term": {
-                            "type": "get",
+                    "filter": [
+                        {
+                            "term": {
+                                "type": "get",
+                            }
                         },
-                        "range": {
-                            "date": {
-                                "gte": "now-3600s/s",
-                                "lt": "now/s",
-                            },
+                        {
+                            "range": {
+                                "date": {
+                                    "gte": "now-3600s/s",
+                                    "lt": "now/s",
+                                },
+                            }
                         },
-                    },
+                    ],
                 },
             },
             "track_total_hits": True,
         }
 
         assert OpenSearchBackend.build_query(query, 3600, "date") == enriched_query
 
-    def test_build_query_with_simple_query_and_existing_filter_with_range(self):
+    def test_build_query_with_simple_query_and_existing_filter_on_range_date(self):
         query: dict = {
             "must": {
                 "term": {
@@ -106,14 +110,64 @@ def test_build_query_with_simple_query_and_existing_filter_with_range(self):
                             "status": "200",
                         },
                     },
-                    "filter": {
-                        "range": {
-                            "date": {
-                                "gte": "now-3600s/s",
-                                "lt": "now/s",
+                    "filter": [
+                        {
+                            "range": {
+                                "date": {
+                                    "gte": "now-3600s/s",
+                                    "lt": "now/s",
+                                },
                             },
+                        }
+                    ],
+                },
+            },
+            "track_total_hits": True,
+        }
+
+        assert OpenSearchBackend.build_query(query, 3600, "date") == enriched_query
+
+    def test_build_query_with_simple_query_and_existing_filter_with_range(self):
+        query: dict = {
+            "must": {
+                "term": {
+                    "status": "200",
+                },
+            },
+            "filter": {
+                "range": {
+                    "status": {
+                        "lt": "299",
+                    },
+                },
+            },
+        }
+
+        enriched_query: dict = {
+            "query": {
+                "bool": {
+                    "must": {
+                        "term": {
+                            "status": "200",
                         },
                     },
+                    "filter": [
+                        {
+                            "range": {
+                                "status": {
+                                    "lt": "299",
+                                }
+                            }
+                        },
+                        {
+                            "range": {
+                                "date": {
+                                    "gte": "now-3600s/s",
+                                    "lt": "now/s",
+                                },
+                            }
+                        },
+                    ],
                 },
             },
             "track_total_hits": True,