Skip to content

Commit 3ff0a9f

Browse files
committed
fix
1 parent b2ff45b commit 3ff0a9f

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

stac_fastapi/core/stac_fastapi/core/core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ async def item_collection(
325325
)
326326

327327
try:
328-
search = self.database.apply_datetime_filter(
328+
search, datetime_search = self.database.apply_datetime_filter(
329329
search=search, datetime=datetime
330330
)
331331
except (ValueError, TypeError) as e:
@@ -507,7 +507,7 @@ async def post_search(
507507
)
508508

509509
try:
510-
search = self.database.apply_datetime_filter(
510+
search, datetime_search = self.database.apply_datetime_filter(
511511
search=search, datetime=search_request.datetime
512512
)
513513
except (ValueError, TypeError) as e:

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ def apply_collections_filter(search: Search, collection_ids: List[str]):
279279
@staticmethod
280280
def apply_datetime_filter(
281281
search: Search, datetime: str | None
282-
) -> Search:
282+
) -> Tuple[Search, Dict[str, Optional[str]]]:
283283
"""Apply a filter to search on datetime, start_datetime, and end_datetime fields.
284284
285285
Args:
@@ -292,7 +292,7 @@ def apply_datetime_filter(
292292
datetime_search = return_date(datetime)
293293

294294
if not datetime_search:
295-
return search
295+
return search, datetime_search
296296

297297
if "eq" in datetime_search:
298298
# For exact matches, include:
@@ -359,7 +359,10 @@ def apply_datetime_filter(
359359
),
360360
]
361361

362-
return search.query(Q("bool", should=should, minimum_should_match=1))
362+
return (
363+
search.query(Q("bool", should=should, minimum_should_match=1)),
364+
datetime_search,
365+
)
363366

364367
@staticmethod
365368
def apply_bbox_filter(search: Search, bbox: List):

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
from stac_fastapi.types.links import resolve_links
6868
from stac_fastapi.types.stac import Collection, Item
6969

70-
7170
logger = logging.getLogger(__name__)
7271

7372

@@ -287,7 +286,7 @@ def apply_free_text_filter(search: Search, free_text_queries: Optional[List[str]
287286
@staticmethod
288287
def apply_datetime_filter(
289288
search: Search, datetime: str | None
290-
) -> Search:
289+
) -> Tuple[Search, Dict[str, Optional[str]]]:
291290
"""Apply a filter to search on datetime, start_datetime, and end_datetime fields.
292291
293292
Args:
@@ -300,7 +299,7 @@ def apply_datetime_filter(
300299
datetime_search = return_date(datetime)
301300

302301
if not datetime_search:
303-
return search
302+
return search, datetime_search
304303

305304
if "eq" in datetime_search:
306305
# For exact matches, include:
@@ -367,7 +366,10 @@ def apply_datetime_filter(
367366
),
368367
]
369368

370-
return search.query(Q("bool", should=should, minimum_should_match=1))
369+
return (
370+
search.query(Q("bool", should=should, minimum_should_match=1)),
371+
datetime_search,
372+
)
371373

372374
@staticmethod
373375
def apply_bbox_filter(search: Search, bbox: List):

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/aggregation/client.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
Aggregation,
2222
AggregationCollection,
2323
)
24-
from stac_fastapi.sfeos_helpers.database import return_date
2524
from stac_fastapi.types.rfc3339 import DateTimeType
2625

2726
from .format import frequency_agg, metric_agg
@@ -314,7 +313,7 @@ async def aggregate(
314313
)
315314

316315
if aggregate_request.datetime:
317-
search = self.database.apply_datetime_filter(
316+
search, datetime_search = self.database.apply_datetime_filter(
318317
search=search, datetime=aggregate_request.datetime
319318
)
320319

0 commit comments

Comments
 (0)