From c248d59d21f9e9eb4090bf72e21cb9fa11216b39 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 4 Feb 2025 11:27:12 -0500
Subject: [PATCH] Updated new endpoint to use timezone

---
 app/main/views/dashboard.py             | 5 +++--
 app/notify_client/service_api_client.py | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 4ebdf0cfa..45ef856e9 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -80,8 +80,6 @@ def service_dashboard(service_id):
 @user_has_permissions()
 def get_daily_stats(service_id):
     date_range = get_stats_date_range()
-
-    # Get timezone from request (default to UTC if not provided)
     user_timezone = request.args.get("timezone", "UTC")
 
     stats = service_api_client.get_service_notification_statistics_by_day(
@@ -94,12 +92,15 @@ def get_daily_stats(service_id):
 @user_has_permissions()
 def get_daily_stats_by_user(service_id):
     service_id = session.get("service_id")
+    user_timezone = request.args.get("timezone", "UTC")
+
     date_range = get_stats_date_range()
     stats = service_api_client.get_user_service_notification_statistics_by_day(
         service_id,
         user_id=current_user.id,
         start_date=date_range["start_date"],
         days=date_range["days"],
+        user_timezone=user_timezone,
     )
     return jsonify(stats)
 
diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py
index a5d8918ec..22074e3a3 100644
--- a/app/notify_client/service_api_client.py
+++ b/app/notify_client/service_api_client.py
@@ -55,16 +55,15 @@ class ServiceAPIClient(NotifyAdminAPIClient):
         )["data"]
 
     def get_user_service_notification_statistics_by_day(
-        self, service_id, user_id, start_date=None, days=None
+        self, service_id, user_id, start_date=None, days=None, user_timezone="UTC"
     ):
         if start_date is None:
             start_date = datetime.now(timezone.utc).strftime("%Y-%m-%d")
 
         return self.get(
-            "/service/{0}/statistics/user/{1}/{2}/{3}".format(
-                service_id, user_id, start_date, days
-            ),
-        )["data"]
+            "/service/{0}/statistics/user/{1}/{2}/{3}?timezone={4}".format(
+            service_id, user_id, start_date, days, user_timezone
+        ))["data"]
 
     def get_services(self, params_dict=None):
         """