fix fix fi x fix
This commit is contained in:
@@ -147,17 +147,26 @@ class CreditUsageViewSet(AccountModelViewSet):
|
||||
|
||||
# Default to current month if not provided
|
||||
now = timezone.now()
|
||||
|
||||
def parse_iso_datetime(dt_str):
|
||||
"""Parse ISO datetime string, handling Z suffix for UTC"""
|
||||
if not dt_str:
|
||||
return None
|
||||
# Handle Z suffix (UTC indicator) which Django's parse_datetime doesn't support
|
||||
if dt_str.endswith('Z'):
|
||||
dt_str = dt_str[:-1] + '+00:00'
|
||||
from django.utils.dateparse import parse_datetime
|
||||
return parse_datetime(dt_str)
|
||||
|
||||
if not start_date:
|
||||
start_date = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
|
||||
else:
|
||||
from django.utils.dateparse import parse_datetime
|
||||
start_date = parse_datetime(start_date) or start_date
|
||||
start_date = parse_iso_datetime(start_date) or start_date
|
||||
|
||||
if not end_date:
|
||||
end_date = now
|
||||
else:
|
||||
from django.utils.dateparse import parse_datetime
|
||||
end_date = parse_datetime(end_date) or end_date
|
||||
end_date = parse_iso_datetime(end_date) or end_date
|
||||
|
||||
# Get usage logs in date range
|
||||
usage_logs = CreditUsageLog.objects.filter(
|
||||
|
||||
@@ -1114,7 +1114,9 @@ class ContentViewSet(SiteSectorModelViewSet):
|
||||
request=request
|
||||
)
|
||||
|
||||
# Parse datetime
|
||||
# Parse datetime - handle Z suffix (UTC indicator) which Django's parse_datetime doesn't support
|
||||
if scheduled_at_str.endswith('Z'):
|
||||
scheduled_at_str = scheduled_at_str[:-1] + '+00:00'
|
||||
scheduled_at = parse_datetime(scheduled_at_str)
|
||||
if not scheduled_at:
|
||||
return error_response(
|
||||
|
||||
Reference in New Issue
Block a user