darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-23 11:29:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1928 from alphagov/platform-stats-fix

Browse Source 
Fix aggregate stats DAO function to use start_date
This commit is contained in:
Katie Smith
2018-07-03 09:33:05 +01:00
committed by GitHub
parent e1a7d99c72 4228b77ebb
commit d2f8a206a8
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/notifications_dao.py
View File

@@ -621,7 +621,7 @@ def fetch_aggregate_stats_by_date_range_for_all_services(start_date, end_date):
end_date = get_london_midnight_in_utc(end_date + timedelta(days=1))
table = NotificationHistory
if end_date >= datetime.utcnow() - timedelta(days=7):
if start_date >= datetime.utcnow() - timedelta(days=7):
table = Notification
query = db.session.query(

14
tests/app/dao/notification_dao/test_notification_dao.py
View File

@@ -1982,17 +1982,3 @@ def test_fetch_aggregate_stats_by_date_range_for_all_services_uses_bst_date(samp
assert len(result) == 1
assert result[0].status == 'sent'
@freeze_time('2018-01-08T12:00:00')
def test_fetch_aggregate_stats_by_date_range_for_all_services_gets_test_notifications_when_start_date_over_7_days_ago(
sample_template
):
ten_days_ago = datetime.utcnow().date() - timedelta(days=10)
today = datetime.utcnow().date()
create_notification(sample_template, key_type=KEY_TYPE_TEST, created_at=datetime.utcnow())
result = fetch_aggregate_stats_by_date_range_for_all_services(ten_days_ago, today)
assert len(result) == 1