diff --git a/app/service/statistics.py b/app/service/statistics.py index 37de941e5..5c6accaa5 100644 --- a/app/service/statistics.py +++ b/app/service/statistics.py @@ -84,7 +84,8 @@ def create_zeroed_stats_dicts(): def _update_statuses_from_row(update_dict, row): - update_dict['requested'] += row.count + if row.status != 'cancelled': + update_dict['requested'] += row.count if row.status in ('delivered', 'sent'): update_dict['delivered'] += row.count elif row.status in ( diff --git a/tests/app/service/test_statistics.py b/tests/app/service/test_statistics.py index 0e55d67dd..07a5d5c09 100644 --- a/tests/app/service/test_statistics.py +++ b/tests/app/service/test_statistics.py @@ -39,7 +39,7 @@ NewStatsRow = collections.namedtuple('row', ('notification_type', 'status', 'key StatsRow('letter', 'virus-scan-failed', 1), StatsRow('letter', 'permanent-failure', 1), StatsRow('letter', 'cancelled', 1), - ], [4, 0, 4], [0, 0, 0], [4, 0, 3]), + ], [4, 0, 4], [0, 0, 0], [3, 0, 3]), 'convert_sent_to_delivered': ([ StatsRow('sms', 'sending', 1), StatsRow('sms', 'delivered', 1),