Refactor tests

Author: alukach

src/stac_auth_proxy/handlers/reverse_proxy.py

@@ -82,17 +82,16 @@ async def proxy_request(self, request: Request, *, stream=False) -> httpx.Respon
                 func=filter_builder,
                 request=request,
             )
+            cql_filter.validate()
+
             if request.method == "GET":
                 query = filters.insert_filter(qs=query, filter=cql_filter)
             elif request.method in ["POST", "PUT"]:
                 body_dict = json.loads(body)
                 body_filter = body_dict.get("filter")
-                combined_filter = (
-                    filters.combine_filters([Expr(body_filter), cql_filter])
-                    if body_filter
-                    else cql_filter
-                )
-                body_dict["filter"] = combined_filter.to_json()
+                if body_filter:
+                    cql_filter = cql_filter + Expr(body_filter)
+                body_dict["filter"] = cql_filter.to_json()
                 body = json.dumps(body_dict)
 
         # https://github.com/fastapi/fastapi/discussions/7382#discussioncomment-5136466

src/stac_auth_proxy/utils/filters.py

@@ -6,21 +6,15 @@
 from cql2 import Expr
 
 
-def combine_filters(filters: list[Expr]) -> Expr:
-    """Combine multiple filters into a single filter."""
-    combined_filter = Expr(" AND ".join(e.to_text() for e in filters))
-    combined_filter.validate()
-    return combined_filter
-
-
 def insert_filter(qs: str, filter: Expr) -> str:
     """Insert a filter expression into a query string. If a filter already exists, combine them."""
     qs_dict = parse_qs(qs)
 
-    filters = [Expr(f) for f in qs_dict.get("filter", [])]
-    filters.append(filter)
+    for qs_filter in qs_dict.get("filter", []):
+        filter += Expr(qs_filter)
 
-    qs_dict["filter"] = [combine_filters(filters).to_text()]
+    qs_dict["filter"] = filter.to_text()
+    qs_dict["filter-lang"] = "cql2-text"
 
     return urlencode(qs_dict, doseq=True)