post sort

Author: jonhealy1

stac_fastapi/core/stac_fastapi/core/core.py

@@ -229,7 +229,7 @@ async def all_collections(
         datetime: Optional[str] = None,
         limit: Optional[int] = None,
         fields: Optional[List[str]] = None,
-        sortby: Optional[str] = None,
+        sortby: Optional[Union[str, List[str]]] = None,
         filter_expr: Optional[str] = None,
         filter_lang: Optional[str] = None,
         q: Optional[Union[str, List[str]]] = None,
@@ -255,8 +255,6 @@ async def all_collections(
         request = kwargs["request"]
         base_url = str(request.base_url)
 
-        print("fields get: ", fields)
-
         limit = int(request.query_params.get("limit", os.getenv("STAC_ITEM_LIMIT", 10)))
 
         token = request.query_params.get("token")
@@ -265,18 +263,10 @@ async def all_collections(
         includes, excludes = set(), set()
         if fields:
             for field in fields:
-                print("Processing field:", field)
                 if field[0] == "-":
                     excludes.add(field[1:])
-                    print("Added to excludes:", field[1:])
                 else:
                     includes.add(field[1:] if field[0] in "+ " else field)
-                    print(
-                        "Added to includes:", field[1:] if field[0] in "+ " else field
-                    )
-            print("Final includes:", includes)
-            print("Final excludes:", excludes)
-        print("fields get: ", fields)
 
         sort = None
         if sortby:
@@ -293,6 +283,7 @@ async def all_collections(
             if parsed_sort:
                 sort = parsed_sort
 
+        print("sort: ", sort)
         # Convert q to a list if it's a string
         q_list = None
         if q is not None:
@@ -413,6 +404,8 @@ async def post_all_collections(
         Returns:
             A Collections object containing all the collections in the database and links to various resources.
         """
+        # Set the postbody attribute on the request object for PagingLinks
+        request.postbody = search_request.model_dump(exclude_unset=True)
         # Convert fields parameter from POST format to all_collections format
         fields = None
 
@@ -438,16 +431,27 @@ async def post_all_collections(
         # Convert sortby parameter from POST format to all_collections format
         sortby = None
         if hasattr(search_request, "sortby") and search_request.sortby:
-            sort_strings = []
+            # Create a list of sort strings in the format expected by all_collections
+            sortby = []
             for sort_item in search_request.sortby:
-                direction = sort_item.get("direction", "asc")
-                field = sort_item.get("field")
+                # Handle different types of sort items
+                if hasattr(sort_item, "field") and hasattr(sort_item, "direction"):
+                    # This is a Pydantic model with field and direction attributes
+                    field = sort_item.field
+                    direction = sort_item.direction
+                elif isinstance(sort_item, dict):
+                    # This is a dictionary with field and direction keys
+                    field = sort_item.get("field")
+                    direction = sort_item.get("direction", "asc")
+                else:
+                    # Skip this item if we can't extract field and direction
+                    continue
+
                 if field:
-                    prefix = "-" if direction.lower() == "desc" else "+"
-                    sort_strings.append(f"{prefix}{field}")
-            # Join the sort strings into a single string
-            if sort_strings:
-                sortby = ",".join(sort_strings)
+                    # Create a sort string in the format expected by all_collections
+                    # e.g., "-id" for descending sort on id field
+                    prefix = "-" if direction.lower() == "desc" else ""
+                    sortby.append(f"{prefix}{field}")
 
         # Pass all parameters from search_request to all_collections
         return await self.all_collections(

stac_fastapi/tests/api/test_api_search_collections.py

@@ -601,8 +601,14 @@ async def test_collections_number_matched_returned(app_client, txn_client, ctx):
 
 
 @pytest.mark.asyncio
-async def test_collections_search_post(app_client, txn_client, ctx):
-    """Verify POST /collections-search endpoint works."""
+async def test_collections_post(app_client, txn_client, ctx, monkeypatch):
+    """Verify POST /collections endpoint works."""
+    # Turn off the transaction extension to avoid conflict with collections POST endpoint
+    import os
+
+    original_value = os.environ.get("ENABLE_TRANSACTIONS_EXTENSIONS")
+    monkeypatch.setenv("ENABLE_TRANSACTIONS_EXTENSIONS", "False")
+
     # Create multiple collections with different ids
     base_collection = ctx.collection
 
@@ -641,10 +647,10 @@ async def test_collections_search_post(app_client, txn_client, ctx):
     # Check that numberMatched is greater than or equal to numberReturned
     assert resp_json["numberMatched"] >= resp_json["numberReturned"]
 
-    # Test POST search with query
+    # Test POST search with sortby
     resp = await app_client.post(
         "/collections",
-        json={"query": {"id": {"eq": f"{test_prefix}-1"}}},
+        json={"sortby": [{"field": "id", "direction": "desc"}]},
     )
     assert resp.status_code == 200
     resp_json = resp.json()
@@ -654,12 +660,32 @@ async def test_collections_search_post(app_client, txn_client, ctx):
         c for c in resp_json["collections"] if c["id"].startswith(test_prefix)
     ]
 
-    # Should return only 1 collection
-    assert len(test_collections) == 1
-    assert test_collections[0]["id"] == f"{test_prefix}-1"
+    # Check that collections are sorted by id in descending order
+    if len(test_collections) >= 2:
+        assert test_collections[0]["id"] > test_collections[1]["id"]
 
     # Check that numberReturned matches the number of collections returned
     assert resp_json["numberReturned"] == len(resp_json["collections"])
 
-    # Check that numberMatched matches the number of collections that match the query
-    assert resp_json["numberMatched"] >= 1
+    # Test POST search with fields
+    resp = await app_client.post(
+        "/collections",
+        json={"fields": {"exclude": ["stac_version"]}},
+    )
+    assert resp.status_code == 200
+    resp_json = resp.json()
+
+    # Filter collections to only include the ones we created for this test
+    test_collections = [
+        c for c in resp_json["collections"] if c["id"].startswith(test_prefix)
+    ]
+
+    # Check that stac_version is excluded from the collections
+    for collection in test_collections:
+        assert "stac_version" not in collection
+
+    # Restore the original environment variable value
+    if original_value is not None:
+        monkeypatch.setenv("ENABLE_TRANSACTIONS_EXTENSIONS", original_value)
+    else:
+        monkeypatch.delenv("ENABLE_TRANSACTIONS_EXTENSIONS", raising=False)