fixed tests - part 1

Author: Grzegorz Pustulka

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -546,6 +546,7 @@ async def execute_search(
             search_after = json.loads(urlsafe_b64decode(token).decode())
 
         query = search.query.to_dict() if search.query else None
+
         index_param = await self.async_index_selector.select_indexes(
             collection_ids, datetime_search
         )

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/index.py

@@ -83,9 +83,7 @@ def filter_indexes_by_datetime(
 
     def parse_datetime(dt_str: str) -> datetime:
         """Parse datetime string, handling both with and without 'Z' suffix."""
-        if dt_str.endswith("Z"):
-            dt_str = dt_str[:-1]
-        return datetime.fromisoformat(dt_str.replace("Z", ""))
+        return datetime.fromisoformat(dt_str.rstrip('Z'))
 
     def extract_date_range_from_index(index_name: str) -> tuple:
         """Extract start and end dates from index name."""
@@ -101,23 +99,18 @@ def extract_date_range_from_index(index_name: str) -> tuple:
             end_date = datetime.strptime(dates[1], "%Y-%m-%d")
             return start_date, end_date
 
-    gte_dt = parse_datetime(gte)
-    lte_dt = parse_datetime(lte)
+    def is_index_in_range(start_date: datetime, end_date: datetime, gte_dt: datetime, lte_dt: datetime) -> bool:
+        """Check if index date range overlaps with filter range."""
+        return not (end_date.date() < gte_dt.date() or start_date.date() > lte_dt.date())
+
+    gte_dt = parse_datetime(gte) if gte else datetime.min.replace(microsecond=0)
+    lte_dt = parse_datetime(lte) if lte else datetime.max.replace(microsecond=0)
 
     filtered_indexes = []
 
     for index in indexes:
         start_date, end_date = extract_date_range_from_index(index)
-
-        include_index = True
-
-        if gte_dt and end_date.date() < gte_dt.date():
-            include_index = False
-
-        if lte_dt and start_date.date() > lte_dt.date():
-            include_index = False
-
-        if include_index:
+        if is_index_in_range(start_date, end_date, gte_dt, lte_dt):
             filtered_indexes.append(index)
 
     return filtered_indexes

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/index_insertion_strategies.py

@@ -4,6 +4,7 @@
 from abc import ABC, abstractmethod
 from datetime import timedelta
 from enum import Enum
+from fastapi import HTTPException, status
 from typing import Any, Dict, List, Union
 
 from stac_fastapi.core.utilities import get_bool_env
@@ -241,6 +242,13 @@ async def _get_target_index_base(
         check_size: bool = True,
     ) -> str:
         product_datetime = product["properties"]["datetime"]
+
+        if not product_datetime:
+            raise HTTPException(
+                status_code=400,
+                detail="Product datetime is required for indexing"
+            )
+
         datetime_range = {"gte": product_datetime, "lte": product_datetime}
         target_index = await index_selector.select_indexes(
             [collection_id], datetime_range
@@ -381,6 +389,13 @@ def _get_target_index_base(
         check_size: bool = True,
     ) -> str:
         product_datetime = product["properties"]["datetime"]
+
+        if not product_datetime:
+            raise HTTPException(
+                status_code=400,
+                detail="Product datetime is required for indexing"
+            )
+
         datetime_range = {"gte": product_datetime, "lte": product_datetime}
         target_index = index_selector.select_indexes([collection_id], datetime_range)
         all_indexes = index_selector.get_collection_indexes(collection_id)

stac_fastapi/tests/api/test_api.py

@@ -427,6 +427,9 @@ async def test_search_point_does_not_intersect(app_client, ctx):
 
 @pytest.mark.asyncio
 async def test_datetime_response_format(app_client, txn_client, ctx):
+    if os.getenv("ENABLE_DATETIME_INDEX_FILTERING"):
+        pytest.skip()
+
     first_item = dict(ctx.item)
 
     second_item = deepcopy(first_item)
@@ -464,6 +467,9 @@ async def test_datetime_response_format(app_client, txn_client, ctx):
 
 @pytest.mark.asyncio
 async def test_datetime_non_interval(app_client, txn_client, ctx):
+    if os.getenv("ENABLE_DATETIME_INDEX_FILTERING"):
+        pytest.skip()
+
     first_item = dict(ctx.item)
 
     second_item = deepcopy(first_item)
@@ -500,6 +506,9 @@ async def test_datetime_non_interval(app_client, txn_client, ctx):
 
 @pytest.mark.asyncio
 async def test_datetime_interval(app_client, txn_client, ctx):
+    if os.getenv("ENABLE_DATETIME_INDEX_FILTERING"):
+        pytest.skip()
+
     first_item = dict(ctx.item)
 
     second_item = deepcopy(first_item)
@@ -536,6 +545,9 @@ async def test_datetime_interval(app_client, txn_client, ctx):
 
 @pytest.mark.asyncio
 async def test_datetime_bad_non_interval(app_client, txn_client, ctx):
+    if os.getenv("ENABLE_DATETIME_INDEX_FILTERING"):
+        pytest.skip()
+
     first_item = dict(ctx.item)
 
     second_item = deepcopy(first_item)
@@ -572,6 +584,9 @@ async def test_datetime_bad_non_interval(app_client, txn_client, ctx):
 
 @pytest.mark.asyncio
 async def test_datetime_bad_interval(app_client, txn_client, ctx):
+    if os.getenv("ENABLE_DATETIME_INDEX_FILTERING"):
+        pytest.skip()
+
     first_item = dict(ctx.item)
 
     second_item = deepcopy(first_item)
@@ -777,6 +792,18 @@ async def test_create_new_index_when_size_limit_exceeded(app_client, load_test_d
         assert expected_index in indices.keys()
 
 
+@pytest.mark.asyncio
+async def test_bulk_create_item_fails_without_datetime(app_client, load_test_data, txn_client, ctx):
+    if not os.getenv("ENABLE_DATETIME_INDEX_FILTERING"):
+        pytest.skip()
+
+    item = deepcopy(load_test_data)
+    item["id"] = "second-item"
+    item["properties"]["datetime"] = None
+    response = await app_client.post(f"/collections/{item['collection']}/items", json=item)
+    assert response.status_code == 400
+
+
 @pytest.mark.asyncio
 async def test_bulk_create_items_with_same_date_range(app_client, load_test_data, txn_client, ctx):
     if not os.getenv("ENABLE_DATETIME_INDEX_FILTERING"):

stac_fastapi/tests/database/test_database.py

@@ -1,3 +1,4 @@
+import os
 import uuid
 
 import pytest
@@ -27,6 +28,9 @@ async def test_index_mapping_collections(ctx):
 
 @pytest.mark.asyncio
 async def test_index_mapping_items(txn_client, load_test_data):
+    if os.getenv("ENABLE_DATETIME_INDEX_FILTERING"):
+        pytest.skip()
+
     collection = load_test_data("test_collection.json")
     collection["id"] = str(uuid.uuid4())
     await txn_client.create_collection(