Adding collection patch tests.

Author: rhysrevans3

stac_fastapi/core/stac_fastapi/core/core.py

@@ -916,6 +916,7 @@ async def json_patch_collection(
             operations=operations,
             base_url=str(kwargs["request"].base_url),
         )
+
         return CollectionSerializer.db_to_stac(
             collection,
             kwargs["request"],

stac_fastapi/core/stac_fastapi/core/models/patch.py

@@ -1,6 +1,6 @@
 """patch helpers."""
 
-from typing import Any, Optional
+from typing import Any, Optional, Union
 
 from pydantic import BaseModel, computed_field, model_validator
 
@@ -17,7 +17,7 @@ class ElasticPath(BaseModel):
     nest: Optional[str] = None
     partition: Optional[str] = None
     key: Optional[str] = None
-    index: Optional[int] = None
+    _index: Optional[int] = None
 
     @model_validator(mode="before")
     @classmethod
@@ -31,13 +31,26 @@ def validate_model(cls, data: Any):
 
         data["nest"], data["partition"], data["key"] = data["path"].rpartition(".")
 
-        if data["key"].isdigit():
-            data["index"] = int(data["key"])
-            data["path"] = f"{data['nest']}[{data['index']}]"
+        if data["key"].isdigit() or data["key"] == "-":
+            data["_index"] = -1 if data["key"] == "-" else int(data["key"])
             data["nest"], data["partition"], data["key"] = data["nest"].rpartition(".")
+            data["path"] = f"{data['nest']}[{data['_index']}]"
 
         return data
 
+    @property
+    def index(self) -> Union[int, str, None]:
+        """Compute location of path.
+
+        Returns:
+            str: path location
+        """
+        if self._index and self._index < 0:
+
+            return f"ctx._source.{self.location}.size() - {-self._index}"
+
+        return self._index
+
     @computed_field  # type: ignore[misc]
     @property
     def location(self) -> str:

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -1216,12 +1216,18 @@ async def json_patch_collection(
 
         script = operations_to_script(script_operations)
 
-        await self.client.update(
-            index=COLLECTIONS_INDEX,
-            id=collection_id,
-            script=script,
-            refresh=True,
-        )
+        try:
+            await self.client.update(
+                index=COLLECTIONS_INDEX,
+                id=collection_id,
+                script=script,
+                refresh=True,
+            )
+
+        except exceptions.BadRequestError as exc:
+            raise HTTPException(
+                status_code=400, detail=exc.info["error"]["caused_by"]["to_string"]
+            ) from exc
 
         collection = await self.find_collection(collection_id)
 

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -1013,7 +1013,7 @@ async def json_patch_item(
 
         try:
             await self.client.update(
-                index=index_by_collection_id(collection_id),
+                index=index_alias_by_collection_id(collection_id),
                 id=mk_item_id(item_id, collection_id),
                 body={"script": script},
                 refresh=True,
@@ -1248,14 +1248,19 @@ async def json_patch_collection(
 
         script = operations_to_script(script_operations)
 
-        if not new_collection_id:
+        try:
             await self.client.update(
                 index=COLLECTIONS_INDEX,
                 id=collection_id,
-                body={"script": script},
-                refresh=refresh,
+                script=script,
+                refresh=True,
             )
 
+        except exceptions.BadRequestError as exc:
+            raise HTTPException(
+                status_code=400, detail=exc.info["error"]["caused_by"]["to_string"]
+            ) from exc
+
         collection = await self.find_collection(collection_id)
 
         if new_collection_id: