darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-11 10:28:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed the group by day aspects of template stats. Not needed. Grouped by template only.

Browse Source
This commit is contained in:
Martyn Inglis
2016-08-22 10:38:44 +01:00
parent 9eb559d4b2
commit b7476a1975
4 changed files with 62 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/app/dao/test_notification_dao.py
+15 -23
View File
@@ -137,14 +137,11 @@ def test_should_by_able_to_get_template_count_from_notifications_history_across_
results = dao_get_template_usage(sample_service.id)
assert len(results) == 5
assert len(results) == 2
assert [(row.name, row.template_type, row.count, row.day) for row in results] == [
('Email Template Name', 'email', 2, datetime(today.year, today.month, today.day).date()),
('Template Name', 'sms', 1, datetime(today.year, today.month, today.day).date()),
('Email Template Name', 'email', 3, datetime(yesterday.year, yesterday.month, yesterday.day).date()),
('Template Name', 'sms', 1, datetime(yesterday.year, yesterday.month, yesterday.day).date()),
('Template Name', 'sms', 3, datetime(one_month_ago.year, one_month_ago.month, one_month_ago.day).date())
assert [(row.name, row.template_type, row.count) for row in results] == [
('Email Template Name', 'email', 5),
('Template Name', 'sms', 5)
]
@@ -177,29 +174,24 @@ def test_should_by_able_to_get_template_count_from_notifications_history_with_da
assert len(results_day_one) == 2
results_day_two = dao_get_template_usage(sample_service.id, limit_days=1)
assert len(results_day_two) == 4
assert len(results_day_two) == 2
results_day_30 = dao_get_template_usage(sample_service.id, limit_days=31)
assert len(results_day_30) == 5
assert len(results_day_30) == 2
assert [(row.name, row.template_type, row.count, row.day) for row in results_day_one] == [
('Email Template Name', 'email', 2, datetime(today.year, today.month, today.day).date()),
('Template Name', 'sms', 1, datetime(today.year, today.month, today.day).date())
assert [(row.name, row.template_type, row.count) for row in results_day_one] == [
('Email Template Name', 'email', 2),
('Template Name', 'sms', 1)
]
assert [(row.name, row.template_type, row.count, row.day) for row in results_day_two] == [
('Email Template Name', 'email', 2, datetime(today.year, today.month, today.day).date()),
('Template Name', 'sms', 1, datetime(today.year, today.month, today.day).date()),
('Email Template Name', 'email', 3, datetime(yesterday.year, yesterday.month, yesterday.day).date()),
('Template Name', 'sms', 1, datetime(yesterday.year, yesterday.month, yesterday.day).date())
assert [(row.name, row.template_type, row.count) for row in results_day_two] == [
('Email Template Name', 'email', 5),
('Template Name', 'sms', 2),
]
assert [(row.name, row.template_type, row.count, row.day) for row in results_day_30] == [
('Email Template Name', 'email', 2, datetime(today.year, today.month, today.day).date()),
('Template Name', 'sms', 1, datetime(today.year, today.month, today.day).date()),
('Email Template Name', 'email', 3, datetime(yesterday.year, yesterday.month, yesterday.day).date()),
('Template Name', 'sms', 1, datetime(yesterday.year, yesterday.month, yesterday.day).date()),
('Template Name', 'sms', 3, datetime(one_month_ago.year, one_month_ago.month, one_month_ago.day).date())
assert [(row.name, row.template_type, row.count) for row in results_day_30] == [
('Email Template Name', 'email', 5),
('Template Name', 'sms', 5),
]