darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-24 00:06:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1856 from alphagov/fix-date-bug

Browse Source 
Dates are hard to get right
This commit is contained in:
Rebecca Law
2018-05-01 15:00:49 +01:00
committed by GitHub
parent 6544666cd2 93c7ab6251
commit b02a7030cc
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/services_dao.py
View File

@@ -251,8 +251,10 @@ def delete_service_and_all_associated_db_objects(service):
@statsd(namespace="dao") @statsd(namespace="dao")
def dao_fetch_stats_for_service(service_id): def dao_fetch_stats_for_service(service_id):
# We want 7 days inclusive
start_date = get_london_midnight_in_utc(date.today() - timedelta(days=6))
return _stats_for_service_query(service_id).filter( return _stats_for_service_query(service_id).filter(
func.date(Notification.created_at) >= date.today() - timedelta(days=7) func.date(Notification.created_at) >= start_date
).all() ).all()

6
tests/app/dao/test_services_dao.py
View File

@@ -628,13 +628,13 @@ def test_fetch_stats_for_today_only_includes_today(notify_db, notify_db_session,
def test_fetch_stats_should_not_gather_notifications_older_than_7_days(notify_db, notify_db_session, sample_template): def test_fetch_stats_should_not_gather_notifications_older_than_7_days(notify_db, notify_db_session, sample_template):
# 8 days ago # 8 days ago
create_notification(notify_db, None, to_field='1', status='delivered', created_at='2001-01-01T12:00:00') create_notification(notify_db, None, to_field='1', status='delivered', created_at='2001-01-02T12:00:00')
# 7 days ago, 2hours ago # 7 days ago, 2hours ago
create_notification(notify_db, None, to_field='2', status='failed', created_at='2001-01-02T10:00:00') create_notification(notify_db, None, to_field='2', status='failed', created_at='2001-01-03T10:00:00')
# 7 days ago # 7 days ago
create_notification(notify_db, None, to_field='2', status='failed', created_at='2001-01-02T12:00:00') create_notification(notify_db, None, to_field='2', status='failed', created_at='2001-01-03T12:00:00')
# right_now # right_now
create_notification(notify_db, None, to_field='3', status='created', created_at='2001-01-09T12:00:00') create_notification(notify_db, None, to_field='3', status='created', created_at='2001-01-09T12:00:00')