Updated BE to allow for proper local to utc and back to local conversion

app/dao/services_dao.py

@@ -1,5 +1,7 @@
 import uuid
 from datetime import timedelta
+import datetime
+import pytz
 
 from flask import current_app
 from sqlalchemy import Float, cast, delete, select
@@ -734,31 +736,35 @@ def fetch_notification_stats_for_service_by_month_by_user(
     return db.session.execute(stmt).all()
 
 
-def get_specific_days_stats(data, start_date, days=None, end_date=None):
+def get_specific_days_stats(data, start_date, days=None, end_date=None, timezone="UTC"):
+    user_timezone = pytz.timezone(timezone if timezone else "UTC")
+
     if days is not None and end_date is not None:
         raise ValueError("Only set days OR set end_date, not both.")
     elif days is not None:
-        gen_range = generate_date_range(start_date, days=days)
+        date_range = list(generate_date_range(start_date, days=days))
     elif end_date is not None:
-        gen_range = generate_date_range(start_date, end_date)
+        date_range = list(generate_date_range(start_date, end_date))
     else:
         raise ValueError("Either days or end_date must be set.")
 
     for item in data:
-        print(
-            f"DEBUG12345 - Timestamp Check: {item.timestamp.isoformat()} {item.status.value})"
-        )
+        if not isinstance(item.timestamp, datetime.datetime):
+            print(f"ERROR: Found non-datetime value: {item.timestamp} ({type(item.timestamp)})")
 
-    grouped_data = {date: [] for date in gen_range} | {
-        timestamp.date(): [
-            row for row in data if row.timestamp.date() == timestamp.date()
-        ]
-        for timestamp in {item.timestamp for item in data}
-    }
 
+    # Group data by date, ensuring ALL dates in range are included
+    grouped_data = {date: [] for date in date_range}
+    for item in data:
+        local_datetime = item.timestamp.replace(tzinfo=pytz.utc).astimezone(user_timezone)
+        local_date = local_datetime.date()
+
+        grouped_data[local_date].append(item)
+
+    # Ensure all dates exist in the final output, even if empty
     stats = {
-        day.strftime("%Y-%m-%d"): statistics.format_statistics(rows)
-        for day, rows in grouped_data.items()
+        day.strftime("%Y-%m-%d"): statistics.format_statistics(grouped_data.get(day, []))
+        for day in date_range
     }
 
     return stats

app/service/rest.py

@@ -221,50 +221,45 @@ def get_service_notification_statistics(service_id):
 
 @service_blueprint.route("/<uuid:service_id>/statistics/<string:start>/<int:days>")
 def get_service_notification_statistics_by_day(service_id, start, days):
+    # Allow timezone override, default to UTC
+    user_timezone = request.args.get("timezone", "UTC")
     return jsonify(
-        data=get_service_statistics_for_specific_days(service_id, start, int(days))
+        data=get_service_statistics_for_specific_days(service_id, start, int(days), user_timezone)
     )
 
 
 def convert_local_to_utc(local_dt, user_timezone="America/New_York"):
-    local_tz = pytz.timezone(user_timezone)
-    localized_dt = local_tz.localize(local_dt)
+    local_timezone = pytz.timezone(user_timezone)
+    if local_dt.tzinfo is None:
+        localized_dt = local_timezone.localize(local_dt)
+    else:
+        localized_dt = local_dt.astimezone(local_timezone)
+
     return localized_dt.astimezone(pytz.utc)
 
 
-def get_service_statistics_for_specific_days(service_id, start, days=7):
-    print(f"DEBUG - Received start: {start}, days: {days}")
-
-    user_timezone = "America/New_York"
-    local_end_date = datetime.strptime(start, "%Y-%m-%d")
+def get_service_statistics_for_specific_days(service_id, start, days=7, timezone="UTC"):
+    user_timezone = pytz.timezone(timezone)
+    local_end_date = datetime.strptime(start, "%Y-%m-%d").replace(tzinfo=user_timezone)
     local_start_date = local_end_date - timedelta(days=days - 1)
 
-    utc_start_date = convert_local_to_utc(
-        local_start_date.replace(hour=0, minute=0, second=0), user_timezone
-    )
-    utc_end_date = convert_local_to_utc(
-        local_end_date.replace(hour=23, minute=59, second=59), user_timezone
-    )
+    utc_start_date = local_start_date.astimezone(pytz.utc).replace(hour=0, minute=0, second=0)
+    utc_end_date = local_end_date.astimezone(pytz.utc).replace(hour=23, minute=59, second=59)
 
-    now_local = (
-        datetime.utcnow()
-        .replace(tzinfo=pytz.utc)
-        .astimezone(pytz.timezone(user_timezone))
-    )
-    if now_local.hour >= 19:
+    now_utc = datetime.utcnow().replace(tzinfo=pytz.utc)
+    now_local = now_utc.astimezone(user_timezone)
+
+    # If the local day hasn't fully ended in UTC yet, extend the end date to the next day
+    if now_local.date() == local_end_date.date() and now_utc.date() > now_local.date():
         utc_end_date += timedelta(days=1)
 
-    print(f"DEBUG - Querying db from {utc_start_date} UTC to {utc_end_date} UTC")
-
-    results = dao_fetch_stats_for_service_from_days(
-        service_id, utc_start_date, utc_end_date
-    )
-
-    stats = get_specific_days_stats(results, utc_start_date, days=days)
+    results = dao_fetch_stats_for_service_from_days(service_id, utc_start_date, utc_end_date)
+    stats = get_specific_days_stats(results, utc_start_date, days=days, timezone=timezone)
 
     return stats
 
 
+
 @service_blueprint.route(
     "/<uuid:service_id>/statistics/user/<uuid:user_id>/<string:start>/<int:days>"
 )