Return empty item collection instead of error when searching

stac_fastapi/pgstac/stac_fastapi/pgstac/core.py

@@ -90,7 +90,7 @@ async def get_collection(self, id: str, **kwargs) -> Collection:
             )
             collection = await conn.fetchval(q, *p)
         if collection is None:
-            raise NotFoundError
+            raise NotFoundError(f"Collection {id} does not exist.")
         links = await CollectionLinks(collection_id=id, request=request).get_links()
         collection["links"] = links
         return Collection(**collection)
@@ -128,8 +128,6 @@ async def _search_base(
         prev: Optional[str] = items.pop("prev", None)
         collection = ItemCollection(**items)
         cleaned_features: List[Item] = []
-        if collection["features"] is None or len(collection["features"]) == 0:
-            raise NotFoundError("No features found")
 
         for feature in collection["features"]:
             feature = Item(**feature)
@@ -176,13 +174,16 @@ async def item_collection(
         Returns:
             An ItemCollection.
         """
+        # If collection does not exist, NotFoundError wil be raised
+        await self.get_collection(id, **kwargs)
+
         req = PgstacSearch(collections=[id], limit=limit, token=token)
-        collection = await self._search_base(req, **kwargs)
+        item_collection = await self._search_base(req, **kwargs)
         links = await CollectionLinks(
             collection_id=id, request=kwargs["request"]
-        ).get_links(extra_links=collection["links"])
-        collection["links"] = links
-        return collection
+        ).get_links(extra_links=item_collection["links"])
+        item_collection["links"] = links
+        return item_collection
 
     async def get_item(self, item_id: str, collection_id: str, **kwargs) -> Item:
         """Get item by id.
@@ -195,9 +196,15 @@ async def get_item(self, item_id: str, collection_id: str, **kwargs) -> Item:
         Returns:
             Item.
         """
+        # If collection does not exist, NotFoundError wil be raised
+        await self.get_collection(collection_id, **kwargs)
+
         req = PgstacSearch(ids=[item_id], limit=1)
-        collection = await self._search_base(req, **kwargs)
-        return Item(**collection["features"][0])
+        item_collection = await self._search_base(req, **kwargs)
+        if not item_collection["features"]:
+            raise NotFoundError(f"Collection {collection_id} does not exist.")
+
+        return Item(**item_collection["features"][0])
 
     async def post_search(
         self, search_request: PgstacSearch, **kwargs

stac_fastapi/pgstac/tests/resources/test_item.py

@@ -338,6 +338,22 @@ async def test_item_search_by_id_post(app_client, load_test_data, load_test_coll
     assert set([feat["id"] for feat in resp_json["features"]]) == set(ids)
 
 
+@pytest.mark.asyncio
+async def test_item_search_by_id_no_results_post(
+    app_client, load_test_data, load_test_collection
+):
+    """Test POST search by item id (core) when there are no results"""
+    test_item = load_test_data("test_item.json")
+
+    search_ids = ["nonexistent_id"]
+
+    params = {"collections": [test_item["collection"]], "ids": search_ids}
+    resp = await app_client.post("/search", json=params)
+    assert resp.status_code == 200
+    resp_json = resp.json()
+    assert len(resp_json["features"]) == 0
+
+
 @pytest.mark.asyncio
 async def test_item_search_spatial_query_post(
     app_client, load_test_data, load_test_collection
@@ -650,7 +666,9 @@ async def test_item_search_get_query_extension(
         ),
     }
     resp = await app_client.get("/search", params=params)
-    assert resp.status_code == 404
+    # No items found should still return a 200 but with an empty list of features
+    assert resp.status_code == 200
+    assert len(resp.json()["features"]) == 0
 
     params["query"] = json.dumps(
         {"proj:epsg": {"eq": test_item["properties"]["proj:epsg"]}}
@@ -671,6 +689,13 @@ async def test_get_missing_item_collection(app_client):
     assert resp.status_code == 404
 
 
+@pytest.mark.asyncio
+async def test_get_item_from_missing_item_collection(app_client):
+    """Test reading an item from a collection which does not exist"""
+    resp = await app_client.get("/collections/invalid-collection/items/some-item")
+    assert resp.status_code == 404
+
+
 @pytest.mark.asyncio
 async def test_pagination_item_collection(
     app_client, load_test_data, load_test_collection