database logic to folder

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py

@@ -8,7 +8,7 @@
     EsAsyncBaseFiltersClient,
     TransactionsClient,
 )
-from stac_fastapi.elasticsearch.database_logic import create_collection_index
+from stac_fastapi.elasticsearch.database_elasticsearch.database_logic import create_collection_index
 from stac_fastapi.elasticsearch.extensions import QueryExtension
 from stac_fastapi.elasticsearch.session import Session
 from stac_fastapi.extensions.core import (

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py

@@ -20,7 +20,7 @@
 
 from stac_fastapi.elasticsearch import serializers
 from stac_fastapi.elasticsearch.config import ElasticsearchSettings
-from stac_fastapi.elasticsearch.database_logic import DatabaseLogic
+from stac_fastapi.elasticsearch.database_elasticsearch.database_logic import DatabaseLogic
 from stac_fastapi.elasticsearch.models.links import PagingLinks
 from stac_fastapi.elasticsearch.serializers import CollectionSerializer, ItemSerializer
 from stac_fastapi.elasticsearch.session import Session

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py renamed to stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_elasticsearch/database_logic.py

@@ -17,6 +17,7 @@
 from stac_fastapi.elasticsearch.extensions import filter
 from stac_fastapi.types.errors import ConflictError, NotFoundError
 from stac_fastapi.types.stac import Collection, Item
+from stac_fastapi.elasticsearch.utilities import bbox2polygon
 
 logger = logging.getLogger(__name__)
 
@@ -229,21 +230,6 @@ async def delete_item_index(collection_id: str):
     await client.close()
 
 
-def bbox2polygon(b0: float, b1: float, b2: float, b3: float) -> List[List[List[float]]]:
-    """Transform a bounding box represented by its four coordinates `b0`, `b1`, `b2`, and `b3` into a polygon.
-
-    Args:
-        b0 (float): The x-coordinate of the lower-left corner of the bounding box.
-        b1 (float): The y-coordinate of the lower-left corner of the bounding box.
-        b2 (float): The x-coordinate of the upper-right corner of the bounding box.
-        b3 (float): The y-coordinate of the upper-right corner of the bounding box.
-
-    Returns:
-        List[List[List[float]]]: A polygon represented as a list of lists of coordinates.
-    """
-    return [[[b0, b1], [b2, b1], [b2, b3], [b0, b3], [b0, b1]]]
-
-
 def mk_item_id(item_id: str, collection_id: str):
     """Create the document id for an Item in Elasticsearch.
 

stac_fastapi/elasticsearch/tests/conftest.py

@@ -16,7 +16,7 @@
     CoreClient,
     TransactionsClient,
 )
-from stac_fastapi.elasticsearch.database_logic import create_collection_index
+from stac_fastapi.elasticsearch.database_elasticsearch.database_logic import create_collection_index
 from stac_fastapi.elasticsearch.extensions import QueryExtension
 from stac_fastapi.extensions.core import (  # FieldsExtension,
     ContextExtension,