demo seed change 2

services/tenant/app/api/internal_demo.py

@@ -17,7 +17,7 @@ from pathlib import Path
 from app.core.database import get_db
 from app.models.tenants import Tenant, Subscription, TenantMember
 from app.models.tenant_location import TenantLocation
-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.config import settings
 
@@ -28,6 +28,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:
@@ -141,16 +197,16 @@ async def clone_demo_data(
                             max_locations=subscription_data.get('max_locations', 3),
                             max_products=subscription_data.get('max_products', 500),
                             features=subscription_data.get('features', {}),
-                            trial_ends_at=adjust_date_for_demo(
-                                datetime.fromisoformat(subscription_data['trial_ends_at'].replace('Z', '+00:00')),
+                            trial_ends_at=parse_date_field(
+                                subscription_data.get('trial_ends_at'),
                                 session_time,
-                                BASE_REFERENCE_DATE
-                            ) if subscription_data.get('trial_ends_at') else None,
-                            next_billing_date=adjust_date_for_demo(
-                                datetime.fromisoformat(subscription_data['next_billing_date'].replace('Z', '+00:00')),
+                                "trial_ends_at"
+                            ),
+                            next_billing_date=parse_date_field(
+                                subscription_data.get('next_billing_date'),
                                 session_time,
-                                BASE_REFERENCE_DATE
-                            ) if subscription_data.get('next_billing_date') else None
+                                "next_billing_date"
+                            )
                         )
 
                         db.add(subscription)