Adding checks for existing properties.

stac_fastapi/core/stac_fastapi/core/utilities.py

@@ -177,11 +177,17 @@ def operations_to_script(operations: List) -> Dict:
     """
     source = ""
     for operation in operations:
+        nest, partition, key = operation.path.rpartition(".")
+        if nest:
+            source += f"if (!ctx._source.containsKey('{nest}')){{Debug.explain('{nest} does not exist');}}"
+
+        if operation.op != "add":
+            source += f"if (!ctx._source.{nest + partition}containsKey('{key}')){{Debug.explain('{operation.path} does not exist');}}"
+
         if operation.op in ["copy", "move"]:
             source += f"ctx._source.{operation.path} = ctx._source.{getattr(operation, 'from')};"
 
         if operation.op in ["remove", "move"]:
-            nest, partition, key = operation.path.rpartition(".")
             source += f"ctx._source.{nest + partition}remove('{key}');"
 
         if operation.op in ["add", "replace"]:

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -947,12 +947,15 @@ async def json_patch_item(
         script = operations_to_script(script_operations)
 
         if not new_collection_id and not new_item_id:
-            await self.client.update(
-                index=index_by_collection_id(collection_id),
-                id=mk_item_id(item_id, collection_id),
-                script=script,
-                refresh=refresh,
-            )
+            try:
+                await self.client.update(
+                    index=index_by_collection_id(collection_id),
+                    id=mk_item_id(item_id, collection_id),
+                    script=script,
+                    refresh=refresh,
+                )
+            except exceptions.BadRequestError as e:
+                raise KeyError(f"{e.info['error']['caused_by']['to_string']}")
 
         if new_collection_id:
             await self.client.reindex(