update from master and raise invalidgeomname

Author: vincentsarago

tests/routes/test_item.py

@@ -16,7 +16,6 @@ def test_item(app):
     assert "text/html" in response.headers["content-type"]
     assert "Collection Item: 1" in response.text
 
-    # TODO Fix Table.query response
-    # # not found
-    # response = app.get("/collections/public.landsat_wrs/items/50000")
-    # assert response.status_code == 404
+    # not found
+    response = app.get("/collections/public.landsat_wrs/items/50000")
+    assert response.status_code == 404

tests/routes/test_items.py

@@ -194,9 +194,9 @@ def test_items_properties_filter(app):
 
 def test_items_filter_cql_ids(app):
     """Test /items endpoint with ids options."""
-    filter = {"op": "=", "args": [{"property": "ogc_fid"}, 1]}
+    filter_query = {"op": "=", "args": [{"property": "ogc_fid"}, 1]}
     response = app.get(
-        f"/collections/public.landsat_wrs/items?filter-lang=cql2-json&filter={json.dumps(filter)}"
+        f"/collections/public.landsat_wrs/items?filter-lang=cql2-json&filter={json.dumps(filter_query)}"
     )
     assert response.status_code == 200
     assert response.headers["content-type"] == "application/geo+json"
@@ -222,7 +222,7 @@ def test_items_filter_cql_ids(app):
     response = app.get(
         "/collections/public.landsat_wrs/items?filter-lang=cql2-text&filter=ogc_fid IN (1,2)"
     )
-    print(response.content)
+
     assert response.status_code == 200
     assert response.headers["content-type"] == "application/geo+json"
     body = response.json()
@@ -237,9 +237,9 @@ def test_items_filter_cql_ids(app):
 
 def test_items_properties_filter_cql2(app):
     """Test /items endpoint with properties filter options."""
-    filter = {"op": "=", "args": [{"property": "path"}, 13]}
+    filter_query = {"op": "=", "args": [{"property": "path"}, 13]}
     response = app.get(
-        f"/collections/public.landsat_wrs/items?filter-lang=cql2-json&filter={json.dumps(filter)}"
+        f"/collections/public.landsat_wrs/items?filter-lang=cql2-json&filter={json.dumps(filter_query)}"
     )
     assert response.status_code == 200
     assert response.headers["content-type"] == "application/geo+json"
@@ -250,22 +250,22 @@ def test_items_properties_filter_cql2(app):
     assert body["features"][0]["properties"]["path"] == 13
 
     # invalid type (str instead of int)
-    filter = {"op": "=", "args": [{"property": "path"}, "d"]}
+    filter_query = {"op": "=", "args": [{"property": "path"}, "d"]}
     response = app.get(
-        f"/collections/public.landsat_wrs/items?filter-lang=cql2-json&filter={json.dumps(filter)}"
+        f"/collections/public.landsat_wrs/items?filter-lang=cql2-json&filter={json.dumps(filter_query)}"
     )
     assert response.status_code == 500
     assert "integer is required" in response.json()["detail"]
 
-    filter = {
+    filter_query = {
         "op": "and",
         "args": [
             {"op": "=", "args": [{"property": "path"}, 13]},
             {"op": "=", "args": [{"property": "row"}, 10]},
         ],
     }
     response = app.get(
-        f"/collections/public.landsat_wrs/items?filter-lang=cql2-json&filter={json.dumps(filter)}"
+        f"/collections/public.landsat_wrs/items?filter-lang=cql2-json&filter={json.dumps(filter_query)}"
     )
     assert response.status_code == 200
     assert response.headers["content-type"] == "application/geo+json"
@@ -353,14 +353,15 @@ def test_items_datetime(app):
     body = response.json()
     assert body["detail"] == "Invalid Datetime Column: the_datetime."
 
-    # TODO Fix table.Query
     # no items for 2004-10-10T10:23:54
-    # response = app.get("/collections/public.my_data/items?datetime=2004-10-10T10:23:54Z")
-    # assert response.status_code == 200
-    # assert response.headers["content-type"] == "application/geo+json"
-    # body = response.json()
-    # assert body["numberMatched"] == 0
-    # assert body["numberReturned"] == 0
+    response = app.get(
+        "/collections/public.my_data/items?datetime=2004-10-10T10:23:54Z"
+    )
+    assert response.status_code == 200
+    assert response.headers["content-type"] == "application/geo+json"
+    body = response.json()
+    assert body["numberMatched"] == 0
+    assert body["numberReturned"] == 0
 
     # Closed Interval
     response = app.get(

tifeatures/dbmodel.py

@@ -56,42 +56,39 @@ class Table(BaseModel):
     dbschema: str = Field(..., alias="schema")
     description: Optional[str]
     id_column: Optional[str]
-    geometry_columns: Optional[List[GeometryColumn]]
+    geometry_columns: List[GeometryColumn]
     properties: List[Column]
 
     @property
-    def datetime_columns(self) -> Optional[List[Column]]:
+    def datetime_columns(self) -> List[Column]:
         """Return the name of all timestamptz columns."""
         return [p for p in self.properties if p.type.startswith("timestamp")]
 
-    def datetime_column(self, dtcol: Optional[str] = None):
+    def datetime_column(self, name: Optional[str] = None) -> Optional[Column]:
         """Return the Column for either the passed in tstz column or the first tstz column."""
-        if self.datetime_columns:
-            for col in self.datetime_columns:
-                if dtcol is None or col.name == dtcol:
-                    return col
+        for col in self.datetime_columns:
+            if name is None or col.name == name:
+                return col
 
         return None
 
-    def geometry_column(self, gcol: Optional[str] = None) -> Optional[GeometryColumn]:
+    def geometry_column(self, name: Optional[str] = None) -> Optional[GeometryColumn]:
         """Return the name of the first geometry column."""
-        if (
-            self.geometry_columns is not None
-            and len(self.geometry_columns) > 0
-            and gcol != "none"
-        ):
-            for c in self.geometry_columns:
-                if gcol is None or c.name == gcol:
-                    return c
+        if name and name.lower() == "none":
+            return None
+
+        for col in self.geometry_columns:
+            if name is None or col.name == name:
+                return col
 
         return None
 
     @property
     def id_column_info(self) -> Column:  # type: ignore
         """Return Column for a unique identifier."""
-        for c in self.properties:
-            if c.name == self.id_column:
-                return c
+        for col in self.properties:
+            if col.name == self.id_column:
+                return col
 
     def columns(self, properties: Optional[List[str]] = None) -> List[str]:
         """Return table columns optionally filtered to only include columns from properties."""
@@ -104,7 +101,7 @@ def columns(self, properties: Optional[List[str]] = None) -> List[str]:
             if geom_col:
                 properties.append(geom_col.name)
 
-            cols = [c for c in cols if c in properties]
+            cols = [col for col in cols if col in properties]
 
         if len(cols) < 1:
             raise TypeError("No columns selected")

tifeatures/layer.py

@@ -17,6 +17,7 @@
 from tifeatures.errors import (
     InvalidDatetime,
     InvalidDatetimeColumnName,
+    InvalidGeometryColumnName,
     InvalidPropertyName,
     MissingDatetimeColumn,
 )
@@ -133,6 +134,7 @@ def _geom(
 
         if bbox_only:
             g = logic.Func("ST_Envelope", g)
+
         elif simplify:
             g = logic.Func(
                 "ST_SnapToGrid",
@@ -142,12 +144,14 @@ def _geom(
 
         if geometry_column.srid == 4326:
             g = logic.Func("ST_AsGeoJson", g)
+
         else:
             g = logic.Func(
                 "ST_Transform",
                 logic.Func("ST_AsGeoJson", g),
                 4326,
             )
+
         return g
 
     def _where(
@@ -337,9 +341,8 @@ async def query(
         simplify: Optional[float] = None,
     ) -> Tuple[FeatureCollection, int]:
         """Build and run Pg query."""
-
-        geometry_columns = self.geometry_columns or []
-        selected_geom_column = self.geometry_column(geom)
+        if geom and geom.lower() != "none" and not self.geometry_column(geom):
+            raise InvalidGeometryColumnName(f"Invalid Geometry Column: {geom}.")
 
         sql_query = """
             WITH
@@ -389,19 +392,16 @@ async def query(
             ),
             id_column=logic.V(self.id_column),
             geometry_q=self._geom(
-                geometry_column=selected_geom_column,
+                geometry_column=self.geometry_column(geom),
                 bbox_only=bbox_only,
                 simplify=simplify,
             ),
-            geom_columns=[g.name for g in geometry_columns],
+            geom_columns=[g.name for g in self.geometry_columns],
         )
 
         async with pool.acquire() as conn:
             items = await conn.fetchval(q, *p)
 
-        # TODO:
-        # - make sure we always return features (even empty)
-        # - make sure we always return total_count
         if items:
             return (
                 FeatureCollection(features=items["features"]),
@@ -459,10 +459,9 @@ async def feature(
     @property
     def queryables(self) -> Dict:
         """Return the queryables."""
-        geometries = self.geometry_columns or []
         geoms = {
             col.name: {"$ref": geojson_schema.get(col.geometry_type.upper(), "")}
-            for col in geometries
+            for col in self.geometry_columns
         }
         props = {
             col.name: {"name": col.name, "type": col.json_type}