darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 17:01:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #820 from alphagov/fix-monthly-miscount

Browse Source 
Fix miscount with monthly totals
This commit is contained in:
Chris Hill-Scott
2017-02-08 13:05:43 +00:00
committed by GitHub
parent cdc693fae5 0dfa4a93d5
commit 8cefe6a71b
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/dao/services_dao.py
View File

@@ -267,13 +267,13 @@ def dao_fetch_monthly_historical_stats_for_service(service_id, year):
)
months = {
datetime.strftime(date, '%Y-%m'): dict.fromkeys(
TEMPLATE_TYPES,
dict.fromkeys(
datetime.strftime(date, '%Y-%m'): {
template_type: dict.fromkeys(
NOTIFICATION_STATUS_TYPES,
0
)
)
for template_type in TEMPLATE_TYPES
}
for date in [
datetime(year, month, 1) for month in range(4, 13)
] + [

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

@@ -526,23 +526,27 @@ def test_fetch_monthly_historical_stats_separates_weeks(notify_db, notify_db_ses
result = dao_fetch_monthly_historical_stats_for_service(sample_template.service_id, 2016)
assert result['2016-04']['sms']['created'] == 1
assert result['2016-04']['sms']['sending'] == 0
assert result['2016-04']['sms']['delivered'] == 0
assert result['2016-04']['sms']['pending'] == 0
assert result['2016-04']['sms']['failed'] == 0
assert result['2016-04']['sms']['technical-failure'] == 0
assert result['2016-04']['sms']['temporary-failure'] == 0
assert result['2016-04']['sms']['permanent-failure'] == 0
for date, status, count in (
('2016-04', 'sending', 0),
('2016-04', 'delivered', 0),
('2016-04', 'pending', 0),
('2016-04', 'failed', 0),
('2016-04', 'technical-failure', 0),
('2016-04', 'temporary-failure', 0),
('2016-04', 'permanent-failure', 0),
assert result['2016-06']['sms']['created'] == 1
('2016-06', 'created', 1),
assert result['2016-10']['sms']['created'] == 1
('2016-10', 'created', 1),
assert result['2016-12']['sms']['created'] == 0
assert result['2016-12']['sms']['delivered'] == 1
('2016-12', 'created', 0),
('2016-12', 'delivered', 1),
assert result['2017-03']['sms']['created'] == 2
('2017-03', 'created', 2),
):
assert result[date]['sms'][status] == count
assert result[date]['email'][status] == 0
assert result[date]['letter'][status] == 0
assert result.keys() == {
'2016-04', '2016-05', '2016-06',