From 654557e793e2549268a6ab31c5d8c1aa005cf2cf Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Thu, 16 Nov 2023 12:47:47 -0800
Subject: [PATCH] fix

---
 app/utils/csv.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/utils/csv.py b/app/utils/csv.py
index 54a18c2d7..1c02ca8c5 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -2,6 +2,7 @@ import datetime
 
 import pytz
 from flask import current_app
+from flask_login import current_user
 from notifications_utils.recipients import RecipientCSV
 
 from app.models.spreadsheet import Spreadsheet
@@ -62,10 +63,6 @@ def get_errors_for_csv(recipients, template_type):
     return errors
 
 
-def get_user_preferred_timezone():
-    return "US/Eastern"
-
-
 def generate_notifications_csv(**kwargs):
     from app import notification_api_client
     from app.s3_client.s3_csv_client import s3download
@@ -162,6 +159,10 @@ def generate_notifications_csv(**kwargs):
 
 
 def convert_report_date_to_preferred_timezone(db_date_str_in_utc):
+    """
+    Report dates in the db are in UTC.  We need to convert them to the user's default timezone,
+    which defaults to "US/Eastern"
+    """
     date_arr = db_date_str_in_utc.split(" ")
     db_date_str_in_utc = f"{date_arr[0]}T{date_arr[1]}+00:00"
     utc_date_obj = datetime.datetime.fromisoformat(db_date_str_in_utc)
@@ -172,3 +173,10 @@ def convert_report_date_to_preferred_timezone(db_date_str_in_utc):
     preferred_tz_created_at = preferred_date_obj.strftime("%Y-%m-%d %H:%M:%S")
 
     return f"{preferred_tz_created_at} {get_user_preferred_timezone()}"
+
+
+def get_user_preferred_timezone():
+    if current_user and hasattr(current_user, "preferred_timezone"):
+        return current_user.preferred_timezone
+
+    return "US/Eastern"