add tests and format

Author: vincentsarago

tests/routes/test_items.py

@@ -598,3 +598,52 @@ def test_output_response_type(app):
     assert response.headers["content-type"] == "application/ndjson"
     body = response.text.splitlines()
     assert len(body) == 10
+
+
+def test_items_sortby(app):
+    """Test /items endpoint with sortby options."""
+    response = app.get("/collections/public.landsat_wrs/items?limit=1")
+    assert response.status_code == 200
+    assert response.headers["content-type"] == "application/geo+json"
+    body = response.json()
+    assert body["features"][0]["properties"]["ogc_fid"] == 1
+    assert body["numberMatched"] == 16269
+
+    response = app.get("/collections/public.landsat_wrs/items?limit=1&sortby=ogc_fid")
+    assert response.status_code == 200
+    assert response.headers["content-type"] == "application/geo+json"
+    body = response.json()
+    assert body["features"][0]["properties"]["ogc_fid"] == 1
+    assert body["numberMatched"] == 16269
+
+    response = app.get("/collections/public.landsat_wrs/items?limit=1&sortby=row")
+    assert response.status_code == 200
+    body = response.json()
+    assert body["features"][0]["properties"]["row"] == 1
+    assert body["numberMatched"] == 16269
+
+    response = app.get("/collections/public.landsat_wrs/items?limit=1&sortby=+row")
+    assert response.status_code == 200
+    body = response.json()
+    assert body["features"][0]["properties"]["row"] == 1
+
+    response = app.get("/collections/public.landsat_wrs/items?limit=1&sortby=-row")
+    assert response.status_code == 200
+    body = response.json()
+    assert body["features"][0]["properties"]["row"] == 248
+
+    response = app.get("/collections/public.landsat_wrs/items?limit=1&sortby=-row,path")
+    assert response.status_code == 200
+    body = response.json()
+    assert body["features"][0]["properties"]["row"] == 248
+    assert body["features"][0]["properties"]["path"] == 1
+
+    response = app.get("/collections/public.landsat_wrs/items?limit=1&sortby=path,-row")
+    assert response.status_code == 200
+    body = response.json()
+    assert body["features"][0]["properties"]["row"] == 248
+    assert body["features"][0]["properties"]["path"] == 1
+
+    # Invalid column name
+    response = app.get("/collections/public.landsat_wrs/items?limit=1&sortby=something")
+    assert response.status_code == 404

tifeatures/dbmodel.py

@@ -94,7 +94,7 @@ def columns(self, properties: Optional[List[str]] = None) -> List[str]:
         """Return table columns optionally filtered to only include columns from properties."""
         cols = [c.name for c in self.properties]
         if properties is not None:
-            if self.id_column is not None and self.id_column not in properties:
+            if self.id_column not in properties:
                 properties.append(self.id_column)
 
             geom_col = self.geometry_column()

tifeatures/dependencies.py

@@ -243,6 +243,11 @@ def filter_query(
     return None
 
 
-def sortby_query(sortby: Optional[str] = Query(None, description="Sort By Column")):
-    """Parse sortby parameter."""
+def sortby_query(
+    sortby: Optional[str] = Query(
+        None,
+        description="Column Sort the items by Column (ascending (default) or descending).",
+    )
+):
+    """Sortby dependency."""
     return sortby

tifeatures/layer.py

@@ -265,11 +265,11 @@ def _datetime_filter_to_sql(self, interval: List[str], dt_name: str):
     def _sortby(self, sortby: Optional[str]):
         sorts = []
         if sortby:
-            sortby = sortby.strip()
-            for s in sortby.split(","):
+            for s in sortby.strip().split(","):
                 parts = re.match(
                     "^(?P<direction>[+-]?)(?P<column>.*)$", s
                 ).groupdict()  # type:ignore
+
                 direction = parts["direction"]
                 column = parts["column"].strip()
                 if self.get_column(column):
@@ -279,9 +279,10 @@ def _sortby(self, sortby: Optional[str]):
                         sorts.append(logic.V(column))
                 else:
                     raise InvalidPropertyName(f"Property {column} does not exist.")
+
         else:
             sorts.append(logic.V(self.id_column))
-        print(sorts)
+
         return clauses.OrderBy(*sorts)
 
     def _features_query(