Adding default None to partials.

Author: rhysrevans3

stac_fastapi/extensions/tests/test_transaction.py

@@ -1,5 +1,5 @@
 import json
-from typing import Iterator, Union
+from typing import Iterator, List, Union
 
 import pytest
 from stac_pydantic import Collection
@@ -51,7 +51,7 @@ def patch_item(
         self,
         collection_id: str,
         item_id: str,
-        patch: Union[PartialItem, PatchOperation],
+        patch: Union[PartialItem, List[PatchOperation]],
         **kwargs,
     ):
         return {
@@ -75,7 +75,7 @@ def update_collection(self, collection_id: str, collection: Collection, **kwargs
     def patch_collection(
         self,
         collection_id: str,
-        patch: Union[PartialCollection, PatchOperation],
+        patch: Union[PartialCollection, List[PatchOperation]],
         **kwargs,
     ):
         return {
@@ -113,7 +113,7 @@ def test_update_item(client: TestClient, item: Item) -> None:
     assert response.json()["type"] == "Feature"
 
 
-def test_patch_item(client: TestClient) -> None:
+def test_patch_operation_item(client: TestClient) -> None:
     response = client.patch(
         "/collections/a-collection/items/an-item",
         content='[{"op": "add", "path": "/properties/foo", "value": "bar"}]',
@@ -126,6 +126,17 @@ def test_patch_item(client: TestClient) -> None:
     ]
 
 
+def test_patch_merge_item(client: TestClient, item: Item) -> None:
+    response = client.patch(
+        "/collections/a-collection/items/an-item",
+        content=json.dumps(item),
+    )
+    assert response.is_success, response.text
+    assert response.json()["path_collection_id"] == "a-collection"
+    assert response.json()["path_item_id"] == "an-item"
+    assert response.json()["patch"]["type"] == "Feature"
+
+
 def test_delete_item(client: TestClient) -> None:
     response = client.delete("/collections/a-collection/items/an-item")
     assert response.is_success, response.text
@@ -146,7 +157,7 @@ def test_update_collection(client: TestClient, collection: Collection) -> None:
     assert response.json()["type"] == "Collection"
 
 
-def test_patch_collection(client: TestClient) -> None:
+def test_patch_operation_collection(client: TestClient) -> None:
     response = client.patch(
         "/collections/a-collection",
         content='[{"op": "add", "path": "/properties/foo", "value": "bar"}]',
@@ -158,6 +169,16 @@ def test_patch_collection(client: TestClient) -> None:
     ]
 
 
+def test_patch_merge_collection(client: TestClient, collection: Collection) -> None:
+    response = client.patch(
+        "/collections/a-collection",
+        content=json.dumps(collection),
+    )
+    assert response.is_success, response.text
+    assert response.json()["path_collection_id"] == "a-collection"
+    assert response.json()["patch"]["type"] == "Collection"
+
+
 def test_delete_collection(client: TestClient, collection: Collection) -> None:
     response = client.delete("/collections/a-collection")
     assert response.is_success, response.text

stac_fastapi/types/stac_fastapi/types/stac.py

@@ -198,33 +198,33 @@ def operations(self) -> List[PatchOperation]:
 class PartialCollection(BasePartial):
     """Partial STAC Collection."""
 
-    type: Optional[str]
-    stac_version: Optional[str]
-    stac_extensions: Optional[List[str]]
-    id: Optional[str]
-    title: Optional[str]
-    description: Optional[str]
-    links: List[Dict[str, Any]]
-    keywords: Optional[List[str]]
-    license: Optional[str]
-    providers: Optional[List[Dict[str, Any]]]
-    extent: Optional[Dict[str, Any]]
-    summaries: Optional[Dict[str, Any]]
-    assets: Optional[Dict[str, Any]]
+    type: Optional[str] = None
+    stac_version: Optional[str] = None
+    stac_extensions: Optional[List[str]] = None
+    id: Optional[str] = None
+    title: Optional[str] = None
+    description: Optional[str] = None
+    links: List[Dict[str, Any]] = None
+    keywords: Optional[List[str]] = None
+    license: Optional[str] = None
+    providers: Optional[List[Dict[str, Any]]] = None
+    extent: Optional[Dict[str, Any]] = None
+    summaries: Optional[Dict[str, Any]] = None
+    assets: Optional[Dict[str, Any]] = None
     numberMatched: Optional[int] = None
     numberReturned: Optional[int] = None
 
 
 class PartialItem(BasePartial):
     """Partial STAC Item."""
 
-    type: Optional[Literal["Feature"]]
-    stac_version: Optional[str]
-    stac_extensions: Optional[List[str]]
-    id: Optional[str]
-    geometry: Optional[Dict[str, Any]]
-    bbox: Optional[BBox]
-    properties: Optional[Dict[str, Any]]
-    links: Optional[List[Dict[str, Any]]]
-    assets: Optional[Dict[str, Any]]
-    collection: Optional[str]
+    type: Optional[Literal["Feature"]] = None
+    stac_version: Optional[str] = None
+    stac_extensions: Optional[List[str]] = None
+    id: Optional[str] = None
+    geometry: Optional[Dict[str, Any]] = None
+    bbox: Optional[BBox] = None
+    properties: Optional[Dict[str, Any]] = None
+    links: Optional[List[Dict[str, Any]]] = None
+    assets: Optional[Dict[str, Any]] = None
+    collection: Optional[str] = None