update date format logic, test

Author: jonhealy1

stac_fastapi/core/stac_fastapi/core/core.py

@@ -37,7 +37,7 @@
 from stac_fastapi.types.core import AsyncBaseCoreClient, AsyncBaseTransactionsClient
 from stac_fastapi.types.extension import ApiExtension
 from stac_fastapi.types.requests import get_base_url
-from stac_fastapi.types.rfc3339 import DateTimeType
+from stac_fastapi.types.rfc3339 import DateTimeType, rfc3339_str_to_datetime
 from stac_fastapi.types.search import BaseSearchPostRequest
 
 logger = logging.getLogger(__name__)
@@ -428,35 +428,31 @@ def _return_date(
 
     def _format_datetime_range(self, date_str: str) -> str:
         """
-        Convert a datetime range string into a normalized UTC string for API requests.
+        Convert a datetime range string into a normalized UTC string for API requests using rfc3339_str_to_datetime.
 
         Args:
             date_str (str): A string containing two datetime values separated by a '/'.
 
         Returns:
             str: A string formatted as 'YYYY-MM-DDTHH:MM:SSZ/YYYY-MM-DDTHH:MM:SSZ', with '..' used if any element is None.
         """
-        if not isinstance(date_str, str) or "/" not in date_str:
-            return "../.."
-        try:
-            start, end = date_str.split("/", 1)
-        except Exception:
-            return "../.."
 
         def normalize(dt):
             dt = dt.strip()
             if not dt or dt == "..":
                 return ".."
-            # Replace any timezone offset with 'Z'
-            if dt.endswith("Z"):
-                return dt
-            if "+" in dt:
-                return dt[: dt.index("+")] + "Z"
-            if "-" in dt[10:]:  # skip date part, look for tz in time part
-                idx = dt.index("-", 10)
-                return dt[:idx] + "Z"
-            return dt  # fallback, return as-is
+            dt_obj = rfc3339_str_to_datetime(dt)
+            dt_utc = dt_obj.astimezone(timezone.utc)
+            return dt_utc.strftime("%Y-%m-%dT%H:%M:%SZ")
 
+        if not isinstance(date_str, str):
+            return "../.."
+        if "/" not in date_str:
+            return f"{normalize(date_str)}/{normalize(date_str)}"
+        try:
+            start, end = date_str.split("/", 1)
+        except Exception:
+            return "../.."
         return f"{normalize(start)}/{normalize(end)}"
 
     async def get_search(

stac_fastapi/tests/resources/test_item.py

@@ -2,7 +2,7 @@
 import os
 import uuid
 from copy import deepcopy
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from random import randint
 from urllib.parse import parse_qs, urlparse, urlsplit
 
@@ -478,13 +478,10 @@ async def test_item_search_temporal_window_timezone_get(
     app_client, ctx, load_test_data
 ):
     """Test GET search with spatio-temporal query ending with Zulu and pagination(core)"""
-    tzinfo = timezone(timedelta(hours=1))
     test_item = load_test_data("test_item.json")
     item_date = rfc3339_str_to_datetime(test_item["properties"]["datetime"])
     item_date_before = item_date - timedelta(seconds=1)
-    item_date_before = item_date_before.replace(tzinfo=tzinfo)
     item_date_after = item_date + timedelta(seconds=1)
-    item_date_after = item_date_after.replace(tzinfo=tzinfo)
 
     params = {
         "collections": test_item["collection"],