inherit from base database logic

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -12,6 +12,7 @@
 from starlette.requests import Request
 
 from elasticsearch import exceptions, helpers  # type: ignore
+from stac_fastapi.core.base_database_logic import BaseDatabaseLogic
 from stac_fastapi.core.database_logic import (
     COLLECTIONS_INDEX,
     DEFAULT_SORT,
@@ -124,7 +125,7 @@ async def delete_item_index(collection_id: str):
 
 
 @attr.s
-class DatabaseLogic:
+class DatabaseLogic(BaseDatabaseLogic):
     """Database logic."""
 
     client = AsyncElasticsearchSettings().create_client

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -15,6 +15,7 @@
 from starlette.requests import Request
 
 from stac_fastapi.core import serializers
+from stac_fastapi.core.base_database_logic import BaseDatabaseLogic
 from stac_fastapi.core.database_logic import (
     COLLECTIONS_INDEX,
     DEFAULT_SORT,
@@ -145,7 +146,7 @@ async def delete_item_index(collection_id: str):
 
 
 @attr.s
-class DatabaseLogic:
+class DatabaseLogic(BaseDatabaseLogic):
     """Database logic."""
 
     client = AsyncSearchSettings().create_client
@@ -274,7 +275,9 @@ async def get_all_collections(
             # Ensure we have a valid sort value for next_token
             next_token_values = hits[-1].get("sort")
             if next_token_values:
-                next_token = next_token_values[0]
+                next_token = urlsafe_b64encode(
+                    json.dumps(next_token_values).encode()
+                ).decode()
 
         return collections, next_token