Fix time range for for daily stats (#2097)

* fix(daily stats): for daily stats, use the time range of now back until midnight UTC as this is what is used to apply limits in the app

* chore: formatting

* fix: remove testing code

* chore: remove unused function

---------

Co-authored-by: Jumana B <[email protected]>

Author: andrewleith

app/dao/fact_notification_status_dao.py

@@ -239,13 +239,19 @@ def fetch_notification_status_for_service_for_day(bst_day, service_id):
 
 
 def fetch_notification_status_for_service_for_today_and_7_previous_days(service_id, by_template=False, limit_days=7):
-    ft_start_date = utc_midnight_n_days_ago(limit_days)
+    if limit_days == 1:
+        ft_start_date = utc_midnight_n_days_ago(limit_days - 1)
+        # For daily stats, service limits reset at 12:00am UTC each night, so we need to fetch the data from 12:00 UTC to now
+        start = utc_midnight_n_days_ago(0)
+        end = datetime.utcnow()
+    else:
+        ft_start_date = utc_midnight_n_days_ago(limit_days)
 
-    # The nightly task that populates ft_notification_status counts collects notifications from
-    # 5AM the day before to 5AM of the current day. So we need to match that timeframe when
-    # we fetch notifications for the current day.
-    start = (tz_aware_midnight_n_days_ago(1) + timedelta(hours=5)).replace(minute=0, second=0, microsecond=0)
-    end = (tz_aware_midnight_n_days_ago(0) + timedelta(hours=5)).replace(minute=0, second=0, microsecond=0)
+        # The nightly task that populates ft_notification_status counts collects notifications from
+        # 5AM the day before to 5AM of the current day. So we need to match that timeframe when
+        # we fetch notifications for the current day.
+        start = (tz_aware_midnight_n_days_ago(1) + timedelta(hours=5)).replace(minute=0, second=0, microsecond=0)
+        end = (tz_aware_midnight_n_days_ago(0) + timedelta(hours=5)).replace(minute=0, second=0, microsecond=0)
 
     stats_for_7_days = db.session.query(
         FactNotificationStatus.notification_type.label("notification_type"),

tests/app/dao/test_fact_notification_status_dao.py

@@ -1158,29 +1158,22 @@ def test_fetch_notification_status_for_service_for_today_handles_midnight_utc(
     email_template = create_template(service=service_1, template_type=EMAIL_TYPE)
 
     # create notifications that should not be included in today's count
-    create_ft_notification_status(date(2018, 10, 29), "email", service_1, count=30)
+    create_ft_notification_status(date(2018, 10, 24), "email", service_1, count=30)
+    create_ft_notification_status(date(2018, 10, 31), "email", service_1, count=20)
+
     save_notification(create_notification(email_template, created_at=datetime(2018, 10, 31, 0, 0, 0), status="delivered"))
     save_notification(create_notification(email_template, created_at=datetime(2018, 10, 31, 11, 59, 59), status="delivered"))
     save_notification(create_notification(email_template, created_at=datetime(2018, 10, 31, 11, 59, 59), status="delivered"))
     save_notification(create_notification(email_template, created_at=datetime(2018, 10, 31, 23, 59, 59), status="delivered"))
 
     # create notifications that should be included in count
-    create_ft_notification_status(date(2018, 10, 31), "email", service_1, count=5)
-    create_ft_notification_status(date(2018, 10, 30), "email", service_1, count=5)
-    save_notification(create_notification(email_template, created_at=datetime(2018, 10, 31, 13, 0, 0), status="delivered"))
-    save_notification(create_notification(email_template, created_at=datetime(2018, 10, 31, 6, 0, 0), status="delivered"))
-    save_notification(create_notification(email_template, created_at=datetime(2018, 11, 1, 22, 59, 59), status="delivered"))
+    save_notification(create_notification(email_template, created_at=datetime(2018, 11, 1, 13, 0, 0), status="delivered"))
+    save_notification(create_notification(email_template, created_at=datetime(2018, 11, 1, 6, 0, 0), status="delivered"))
+    save_notification(create_notification(email_template, created_at=datetime(2018, 11, 1, 17, 59, 59), status="delivered"))
 
-    # checking the daily stats for this day should give us the 2 created after 12am UTC
+    # checking the daily stats for this day should give us the 3 created after 12am UTC
     results = sorted(
         fetch_notification_status_for_service_for_today_and_7_previous_days(service_1.id, limit_days=1),
         key=lambda x: (x.notification_type, x.status),
     )
-    assert results[0][2] == 6
-
-    # checking the daily stats for the last 2 days should give us the 2 created after 12am UTC and the 1 from the day before
-    results = sorted(
-        fetch_notification_status_for_service_for_today_and_7_previous_days(service_1.id, limit_days=2),
-        key=lambda x: (x.notification_type, x.status),
-    )
-    assert results[0][2] == 11
+    assert results[0][2] == 3