Merge pull request #96 from jackharrhy/fix-functions-without-params

fix function based collections without params

Author: vincentsarago

CHANGES.md

@@ -13,6 +13,7 @@ Note: Minor version `0.X.0` update might break the API, It's recommended to pin
 - added `python-dotenv` dependency via `pydantic[dotenv]`
 - `type` query parameter to filter collections based on their type (`Function` or `Table`)
 - fixed a small bug in the `tipg_properties` SQL function where the bounds property was not properly transformed to 4326 (author @RemcoMeeuwissen, https://github.com/developmentseed/tipg/pull/87)
+- handling functions that are interpreted as collections but lack parameters (author @jackharrhy, https://github.com/developmentseed/tipg/pull/96)
 
 ### Added
 

tests/conftest.py

@@ -78,6 +78,14 @@ def database_url(test_db):
     ).scalar()
     assert count_landsat == count_landsat_schema
 
+    # add a `userschema` schema
+    test_db.create_schema("userschema")
+    assert test_db.has_schema("userschema")
+
+    test_db.connection.execute(
+        "CREATE OR REPLACE FUNCTION userschema.test_no_params() RETURNS TABLE(foo integer, location geometry) AS 'SELECT 1, ST_MakePoint(0,0);' LANGUAGE SQL;"
+    )
+
     return str(test_db.connection.engine.url)
 
 
@@ -334,6 +342,27 @@ def app_myschema_public_order(database_url, monkeypatch):
         yield client
 
 
+@pytest.fixture
+def app_user_schema(database_url):
+    """Create APP with only tables from `userschema` schemas."""
+    postgres_settings = PostgresSettings(database_url=database_url)
+    db_settings = DatabaseSettings(
+        schemas=["userschema"],
+        exclude_table_schemas=["public"],
+        only_spatial_tables=False,
+    )
+    sql_settings = CustomSQLSettings(custom_sql_directory=None)
+
+    app = create_tipg_app(
+        postgres_settings=postgres_settings,
+        db_settings=db_settings,
+        sql_settings=sql_settings,
+    )
+
+    with TestClient(app) as client:
+        yield client
+
+
 @pytest.fixture
 def app_middleware_refresh(database_url, monkeypatch):
     """Create APP with CatalogUpdateMiddleware middleware."""

tests/test_schemas.py

@@ -147,3 +147,24 @@ def test_myschema_and_public_order(app_myschema_public_order):
     assert "public.st_hexagongrid" not in ids
 
     assert body["numberMatched"] == collection_number
+
+
+def test_user_schema(app_user_schema):
+    """Test Function without parameters."""
+    collection_number = 1
+
+    response = app_user_schema.get("/collections")
+    assert response.status_code == 200
+    body = response.json()
+    ids = [x["id"] for x in body["collections"]]
+
+    assert len(ids) == collection_number
+    assert "userschema.test_no_params" in ids
+
+    response = app_user_schema.get("/collections/userschema.test_no_params/queryables")
+    assert response.status_code == 200
+
+    response = app_user_schema.get("/collections/userschema.test_no_params/items")
+    assert response.status_code == 200
+    body = response.json()
+    assert body["numberMatched"] == 1

tipg/collections.py

@@ -980,7 +980,7 @@ async def get_collection_index(  # noqa: C901
                 properties=properties,
                 datetime_column=datetime_column,
                 geometry_column=geometry_column,
-                parameters=table.get("parameters", []),
+                parameters=table.get("parameters") or [],
             )
 
         return Catalog(collections=catalog, last_updated=datetime.datetime.now())