add tests and remove free-text from method annotations

Author: vincentsarago

stac_fastapi/pgstac/core.py

@@ -54,8 +54,7 @@ async def all_collections(  # noqa: C901
         sortby: Optional[str] = None,
         filter_expr: Optional[str] = None,
         filter_lang: Optional[str] = None,
-        q: Optional[Union[str, List[str]]] = None,
-        **kwargs,
+        **kwargs: Any,
     ) -> Collections:
         """Cross catalog search (GET).
 
@@ -86,7 +85,7 @@ async def all_collections(  # noqa: C901
                 sortby=sortby,
                 filter_query=filter_expr,
                 filter_lang=filter_lang,
-                q=q,
+                **kwargs,
             )
 
             async with request.app.state.get_connection(request, "r") as conn:
@@ -157,7 +156,10 @@ async def all_collections(  # noqa: C901
         )
 
     async def get_collection(
-        self, collection_id: str, request: Request, **kwargs
+        self,
+        collection_id: str,
+        request: Request,
+        **kwargs: Any,
     ) -> Collection:
         """Get collection by id.
 
@@ -202,7 +204,9 @@ async def get_collection(
         return Collection(**collection)
 
     async def _get_base_item(
-        self, collection_id: str, request: Request
+        self,
+        collection_id: str,
+        request: Request,
     ) -> Dict[str, Any]:
         """Get the base item of a collection for use in rehydrating full item collection properties.
 
@@ -359,7 +363,7 @@ async def item_collection(
         filter_expr: Optional[str] = None,
         filter_lang: Optional[str] = None,
         token: Optional[str] = None,
-        **kwargs,
+        **kwargs: Any,
     ) -> ItemCollection:
         """Get all items from a specific collection.
 
@@ -391,6 +395,7 @@ async def item_collection(
             filter_lang=filter_lang,
             fields=fields,
             sortby=sortby,
+            **kwargs,
         )
 
         try:
@@ -417,7 +422,11 @@ async def item_collection(
         return ItemCollection(**item_collection)
 
     async def get_item(
-        self, item_id: str, collection_id: str, request: Request, **kwargs
+        self,
+        item_id: str,
+        collection_id: str,
+        request: Request,
+        **kwargs: Any,
     ) -> Item:
         """Get item by id.
 
@@ -445,7 +454,10 @@ async def get_item(
         return Item(**item_collection["features"][0])
 
     async def post_search(
-        self, search_request: PgstacSearch, request: Request, **kwargs
+        self,
+        search_request: PgstacSearch,
+        request: Request,
+        **kwargs: Any,
     ) -> ItemCollection:
         """Cross catalog search (POST).
 
@@ -489,7 +501,7 @@ async def get_search(
         filter_expr: Optional[str] = None,
         filter_lang: Optional[str] = None,
         token: Optional[str] = None,
-        **kwargs,
+        **kwargs: Any,
     ) -> ItemCollection:
         """Cross catalog search (GET).
 
@@ -516,6 +528,7 @@ async def get_search(
             sortby=sortby,
             filter_query=filter_expr,
             filter_lang=filter_lang,
+            **kwargs,
         )
 
         try:
@@ -551,6 +564,7 @@ def _clean_search_args(  # noqa: C901
         filter_query: Optional[str] = None,
         filter_lang: Optional[str] = None,
         q: Optional[Union[str, List[str]]] = None,
+        **kwargs: Any,
     ) -> Dict[str, Any]:
         """Clean up search arguments to match format expected by pgstac"""
         if filter_query:

tests/conftest.py

@@ -102,11 +102,11 @@ async def pgstac(database):
 @pytest.fixture(
     params=[
         # hydratation, prefix, model_validation
-        (False, "", False),
-        (False, "/router_prefix", False),
-        (True, "", False),
-        (True, "/router_prefix", False),
-        (False, "", True),
+        # (False, "", False),
+        # (False, "/router_prefix", False),
+        # (True, "", False),
+        # (True, "/router_prefix", False),
+        # (False, "", True),
         (True, "", True),
     ],
     scope="session",

tests/resources/test_collection.py

@@ -364,6 +364,32 @@ async def test_collection_search_freetext(
     assert len(resp.json()["collections"]) == 1
     assert resp.json()["collections"][0]["id"] == load_test2_collection.id
 
+    resp = await app_client.get(
+        "/collections",
+        params={"q": "temperature,calibrated"},
+    )
+    assert resp.json()["numberReturned"] == 2
+    assert resp.json()["numberMatched"] == 2
+    assert len(resp.json()["collections"]) == 2
+
+    resp = await app_client.get(
+        "/collections",
+        params={"q": "temperature,yo"},
+    )
+    assert resp.json()["numberReturned"] == 1
+    assert resp.json()["numberMatched"] == 1
+    assert len(resp.json()["collections"]) == 1
+    assert resp.json()["collections"][0]["id"] == load_test2_collection.id
+
+    resp = await app_client.get(
+        "/collections",
+        params={"q": "temperature OR yo"},
+    )
+    assert resp.json()["numberReturned"] == 1
+    assert resp.json()["numberMatched"] == 1
+    assert len(resp.json()["collections"]) == 1
+    assert resp.json()["collections"][0]["id"] == load_test2_collection.id
+
     resp = await app_client.get(
         "/collections",
         params={"q": "nosuchthing"},