demo seed change 2

services/recipes/app/api/internal_demo.py

@@ -17,7 +17,7 @@ import json
 from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).parent.parent.parent.parent))
-from shared.utils.demo_dates import adjust_date_for_demo, BASE_REFERENCE_DATE
+from shared.utils.demo_dates import adjust_date_for_demo, resolve_time_marker
 
 from app.core.database import get_db
 from app.models.recipes import (
@@ -34,6 +34,62 @@ router = APIRouter()
 DEMO_TENANT_PROFESSIONAL = "a1b2c3d4-e5f6-47a8-b9c0-d1e2f3a4b5c6"
 
 
+def parse_date_field(
+    field_value: any,
+    session_time: datetime,
+    field_name: str = "date"
+) -> Optional[datetime]:
+    """
+    Parse a date field from JSON, supporting BASE_TS markers and ISO timestamps.
+
+    Args:
+        field_value: The date field value (can be BASE_TS marker, ISO string, or None)
+        session_time: Session creation time (timezone-aware UTC)
+        field_name: Name of the field (for logging)
+
+    Returns:
+        Timezone-aware UTC datetime or None
+    """
+    if field_value is None:
+        return None
+
+    # Handle BASE_TS markers
+    if isinstance(field_value, str) and field_value.startswith("BASE_TS"):
+        try:
+            return resolve_time_marker(field_value, session_time)
+        except (ValueError, AttributeError) as e:
+            logger.warning(
+                "Failed to resolve BASE_TS marker",
+                field_name=field_name,
+                marker=field_value,
+                error=str(e)
+            )
+            return None
+
+    # Handle ISO timestamps (legacy format - convert to absolute datetime)
+    if isinstance(field_value, str) and ('T' in field_value or 'Z' in field_value):
+        try:
+            parsed_date = datetime.fromisoformat(field_value.replace('Z', '+00:00'))
+            # Adjust relative to session time
+            return adjust_date_for_demo(parsed_date, session_time)
+        except (ValueError, AttributeError) as e:
+            logger.warning(
+                "Failed to parse ISO timestamp",
+                field_name=field_name,
+                value=field_value,
+                error=str(e)
+            )
+            return None
+
+    logger.warning(
+        "Unknown date format",
+        field_name=field_name,
+        value=field_value,
+        value_type=type(field_value).__name__
+    )
+    return None
+
+
 def verify_internal_api_key(x_internal_api_key: Optional[str] = Header(None)):
     """Verify internal API key for service-to-service communication"""
     if x_internal_api_key != settings.INTERNAL_API_KEY:
@@ -148,16 +204,16 @@ async def clone_demo_data(
                     detail=f"Invalid UUID format in recipe data: {str(e)}"
                 )
 
-            # Adjust dates relative to session creation time
-            adjusted_created_at = adjust_date_for_demo(
-                datetime.fromisoformat(recipe_data['created_at'].replace('Z', '+00:00')),
+            # Parse date fields (supports BASE_TS markers and ISO timestamps)
+            adjusted_created_at = parse_date_field(
+                recipe_data.get('created_at'),
                 session_time,
-                BASE_REFERENCE_DATE
+                "created_at"
             )
-            adjusted_updated_at = adjust_date_for_demo(
-                datetime.fromisoformat(recipe_data['updated_at'].replace('Z', '+00:00')),
+            adjusted_updated_at = parse_date_field(
+                recipe_data.get('updated_at'),
                 session_time,
-                BASE_REFERENCE_DATE
+                "updated_at"
             )
 
             # Map field names from seed data to model fields
@@ -332,7 +388,7 @@ async def delete_demo_tenant_data(
     Delete all demo data for a virtual tenant.
     This endpoint is idempotent - safe to call multiple times.
     """
-    start_time = datetime.now()
+    start_time = datetime.now(timezone.utc)
     
     records_deleted = {
         "recipes": 0,
@@ -373,7 +429,7 @@ async def delete_demo_tenant_data(
             "status": "deleted",
             "virtual_tenant_id": str(virtual_tenant_id),
             "records_deleted": records_deleted,
-            "duration_ms": int((datetime.now() - start_time).total_seconds() * 1000)
+            "duration_ms": int((datetime.now(timezone.utc) - start_time).total_seconds() * 1000)
         }
 
     except Exception as e: