Update daily notification stats to use 12am utc

app/dao/date_util.py

@@ -81,3 +81,10 @@ def get_financial_year_for_datetime(start_date):
 
 def get_midnight(datetime: datetime) -> datetime:
     return datetime.replace(hour=0, minute=0, second=0, microsecond=0)
+
+
+def utc_midnight_n_days_ago(number_of_days):
+    """
+    Returns utc midnight a number of days ago.
+    """
+    return get_midnight(datetime.utcnow() - timedelta(days=number_of_days))

app/dao/fact_notification_status_dao.py

@@ -8,6 +8,7 @@
 from sqlalchemy.types import DateTime, Integer
 
 from app import db
+from app.dao.date_util import utc_midnight_n_days_ago
 from app.models import (
     EMAIL_TYPE,
     KEY_TYPE_NORMAL,
@@ -34,7 +35,6 @@
 from app.utils import (
     get_local_timezone_midnight_in_utc,
     get_local_timezone_month_from_utc_column,
-    midnight_n_days_ago,
 )
 
 
@@ -239,7 +239,8 @@ 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):
-    start_date = midnight_n_days_ago(limit_days)
+    start_date = utc_midnight_n_days_ago(limit_days - 1)
+
     stats_for_7_days = db.session.query(
         FactNotificationStatus.notification_type.label("notification_type"),
         FactNotificationStatus.notification_status.label("status"),
@@ -259,7 +260,7 @@ def fetch_notification_status_for_service_for_today_and_7_previous_days(service_
             *([func.count().label("count")]),
         )
         .filter(
-            Notification.created_at >= midnight_n_days_ago(limit_days),
+            Notification.created_at >= start_date,
             Notification.service_id == service_id,
             Notification.key_type != KEY_TYPE_TEST,
         )

tests/app/dao/test_fact_notification_status_dao.py

@@ -1141,3 +1141,37 @@ def test_fetch_monthly_notification_statuses_per_service_for_rows_that_should_be
 
     results = fetch_monthly_notification_statuses_per_service(date(2019, 3, 1), date(2019, 3, 31))
     assert len(results) == 0
+
+
+@freeze_time("2018-10-31T18:00:00")
+def test_fetch_notification_status_for_service_for_today_handles_midnight_utc(
+    notify_db_session,
+):
+    service_1 = create_service(service_name="service_1")
+    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)
+    save_notification(create_notification(email_template, created_at=datetime(2018, 10, 30, 23, 59, 59), status="delivered"))
+    save_notification(create_notification(email_template, created_at=datetime(2018, 10, 30, 11, 59, 59), status="delivered"))
+    save_notification(create_notification(email_template, created_at=datetime(2018, 10, 29, 11, 59, 59), status="delivered"))
+
+    # create notifications that should be included in count
+    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, 1, 0, 0), status="delivered"))
+
+    # checking the daily stats for this day should give us the 2 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] == 2
+
+    # 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] == 4