Add bbox and datetime to SQlAlchemy item_collection

Doesn't seem worth duplicating the code,
so just calls get_search.
Could only do so when bbox is present...

Author: carderne

Makefile

@@ -2,25 +2,25 @@
 APP_HOST ?= 0.0.0.0
 APP_PORT ?= 8080
 EXTERNAL_APP_PORT ?= ${APP_PORT}
-run_sqlalchemy = docker-compose run --rm \
+run_sqlalchemy = docker compose run --rm \
 				-p ${EXTERNAL_APP_PORT}:${APP_PORT} \
 				-e APP_HOST=${APP_HOST} \
 				-e APP_PORT=${APP_PORT} \
 				app-sqlalchemy
 
-run_pgstac = docker-compose run --rm \
+run_pgstac = docker compose run --rm \
 				-p ${EXTERNAL_APP_PORT}:${APP_PORT} \
 				-e APP_HOST=${APP_HOST} \
 				-e APP_PORT=${APP_PORT} \
 				app-pgstac
 
 .PHONY: image
 image:
-	docker-compose build
+	docker compose build
 
 .PHONY: docker-run-all
 docker-run-all:
-	docker-compose up
+	docker compose up
 
 .PHONY: docker-run-sqlalchemy
 docker-run-sqlalchemy: image
@@ -52,15 +52,15 @@ test-api:
 
 .PHONY: run-database
 run-database:
-	docker-compose run --rm database
+	docker compose run --rm database
 
 .PHONY: run-joplin-sqlalchemy
 run-joplin-sqlalchemy:
-	docker-compose run --rm loadjoplin-sqlalchemy
+	docker compose run --rm loadjoplin-sqlalchemy
 
 .PHONY: run-joplin-pgstac
 run-joplin-pgstac:
-	docker-compose run --rm loadjoplin-pgstac
+	docker compose run --rm loadjoplin-pgstac
 
 .PHONY: test
 test: test-sqlalchemy test-pgstac
@@ -82,10 +82,10 @@ sqlalchemy-install: pybase-install
 
 .PHONY: docs-image
 docs-image:
-	docker-compose -f docker-compose.docs.yml \
+	docker compose -f docker compose.docs.yml \
 		build
 
 .PHONY: docs
 docs: docs-image
-	docker-compose -f docker-compose.docs.yml \
+	docker compose -f docker compose.docs.yml \
 		run docs

stac_fastapi/sqlalchemy/stac_fastapi/sqlalchemy/core.py

@@ -99,77 +99,23 @@ def get_collection(self, collection_id: str, **kwargs) -> Collection:
             return self.collection_serializer.db_to_stac(collection, base_url)
 
     def item_collection(
-        self, collection_id: str, limit: int = 10, token: str = None, **kwargs
+        self,
+        collection_id: str,
+        bbox: Optional[List[NumType]] = None,
+        datetime: Optional[Union[str, datetime]] = None,
+        limit: int = 10,
+        token: str = None,
+        **kwargs,
     ) -> ItemCollection:
         """Read an item collection from the database."""
-        base_url = str(kwargs["request"].base_url)
-        with self.session.reader.context_session() as session:
-            collection_children = (
-                session.query(self.item_table)
-                .join(self.collection_table)
-                .filter(self.collection_table.id == collection_id)
-                .order_by(self.item_table.datetime.desc(), self.item_table.id)
-            )
-            count = None
-            if self.extension_is_enabled("ContextExtension"):
-                count_query = collection_children.statement.with_only_columns(
-                    [func.count()]
-                ).order_by(None)
-                count = collection_children.session.execute(count_query).scalar()
-            token = self.get_token(token) if token else token
-            page = get_page(collection_children, per_page=limit, page=(token or False))
-            # Create dynamic attributes for each page
-            page.next = (
-                self.insert_token(keyset=page.paging.bookmark_next)
-                if page.paging.has_next
-                else None
-            )
-            page.previous = (
-                self.insert_token(keyset=page.paging.bookmark_previous)
-                if page.paging.has_previous
-                else None
-            )
-
-            links = []
-            if page.next:
-                links.append(
-                    {
-                        "rel": Relations.next.value,
-                        "type": "application/geo+json",
-                        "href": f"{kwargs['request'].base_url}collections/{collection_id}/items?token={page.next}&limit={limit}",
-                        "method": "GET",
-                    }
-                )
-            if page.previous:
-                links.append(
-                    {
-                        "rel": Relations.previous.value,
-                        "type": "application/geo+json",
-                        "href": f"{kwargs['request'].base_url}collections/{collection_id}/items?token={page.previous}&limit={limit}",
-                        "method": "GET",
-                    }
-                )
-
-            response_features = []
-            for item in page:
-                response_features.append(
-                    self.item_serializer.db_to_stac(item, base_url=base_url)
-                )
-
-            context_obj = None
-            if self.extension_is_enabled("ContextExtension"):
-                context_obj = {
-                    "returned": len(page),
-                    "limit": limit,
-                    "matched": count,
-                }
-
-            return ItemCollection(
-                type="FeatureCollection",
-                features=response_features,
-                links=links,
-                context=context_obj,
-            )
+        return self.get_search(
+            collections=[collection_id],
+            bbox=bbox,
+            datetime=datetime,
+            limit=limit,
+            token=token,
+            **kwargs,
+        )
 
     def get_item(self, item_id: str, collection_id: str, **kwargs) -> Item:
         """Get item by id."""