add test item collection bbox

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py

@@ -101,17 +101,38 @@ async def item_collection(
     ) -> ItemCollection:
         """Read an item collection from the database."""
         request: Request = kwargs["request"]
-        base_url = str(kwargs["request"].base_url)
+        base_url = str(request.base_url)
+
+        collection = await self.get_collection(collection_id=collection_id, request=request)
+        try:
+            collection_id = collection["id"]
+        except:
+            raise HTTPException(status_code=404, detail="Collection not found")
+ 
+        search = self.database.make_search()
+        search = self.database.apply_collections_filter(
+            search=search, collection_ids=[collection_id]
+        )
+
+        if datetime:
+            datetime_search = self._return_date(datetime)
+            search = self.database.apply_datetime_filter(
+                search=search, datetime_search=datetime_search
+            )
+
+        if bbox:
+            bbox = [float(x) for x in bbox]
+            if len(bbox) == 6:
+                bbox = [bbox[0], bbox[1], bbox[3], bbox[4]]
+        
+            search = self.database.apply_bbox_filter(search=search, bbox=bbox)
 
         items, maybe_count, next_token = await self.database.execute_search(
-            search=self.database.apply_collections_filter(
-                self.database.make_search(), [collection_id]
-            ),
+            search=search,
             limit=limit,
-            token=token,
             sort=None,
+            token=token,  # type: ignore
             collection_ids=[collection_id],
-            ignore_unavailable=False,
         )
 
         items = [

stac_fastapi/elasticsearch/tests/resources/test_item.py

@@ -191,6 +191,48 @@ async def test_get_item_collection(app_client, ctx, txn_client):
         assert matched == item_count + 1
 
 
+async def test_item_collection_filter_bbox(app_client, ctx, txn_client):
+    item = ctx.item
+    collection = item["collection"]
+
+    bbox = "100,-50,170,-20"
+    resp = await app_client.get(f"/collections/{collection}/items", params={"bbox": bbox})
+    assert resp.status_code == 200
+    resp_json = resp.json()
+    assert len(resp_json["features"]) == 1
+
+    bbox = "1,2,3,4"
+    resp = await app_client.get(f"/collections/{collection}/items", params={"bbox": bbox})
+    assert resp.status_code == 200
+    resp_json = resp.json()
+    assert len(resp_json["features"]) == 0
+
+
+# def test_item_collection_filter_datetime(
+#     load_test_data, app_client, postgres_transactions
+# ):
+#     item = load_test_data("test_item.json")
+#     collection = item["collection"]
+#     postgres_transactions.create_item(
+#         item["collection"], item, request=MockStarletteRequest
+#     )
+
+#     datetime_range = "2020-01-01T00:00:00.00Z/.."
+#     resp = app_client.get(
+#         f"/collections/{collection}/items", params={"datetime": datetime_range}
+#     )
+#     assert resp.status_code == 200
+#     resp_json = resp.json()
+#     assert len(resp_json["features"]) == 1
+
+#     datetime_range = "2018-01-01T00:00:00.00Z/2019-01-01T00:00:00.00Z"
+#     resp = app_client.get(
+#         f"/collections/{collection}/items", params={"datetime": datetime_range}
+#     )
+#     assert resp.status_code == 200
+#     resp_json = resp.json()
+#     assert len(resp_json["features"]) == 0
+
 @pytest.mark.skip(reason="Pagination extension not implemented")
 async def test_pagination(app_client, load_test_data):
     """Test item collection pagination (paging extension)"""