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

Change how we populate and retrieve MonthlyBilling totals:

Browse Source 
1. For both email and sms, store [] in monthly_totals if
there is no billing data (no notifications sent etc.) and
return this via the API

2. General refactoring of indentation
This commit is contained in:
Imdad Ahad
2017-08-11 16:53:12 +01:00
parent 46ca086aa2
commit 94605d31fa
6 changed files with 78 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/app/celery/test_scheduled_tasks.py
View File

@@ -635,15 +635,12 @@ def test_populate_monthly_billing_populates_correctly(sample_template):
assert monthly_billing[0].end_date == jul_month_end
assert monthly_billing[0].notification_type == 'email'
assert monthly_billing[0].notification_type == 'email'
assert len(monthly_billing[1].monthly_totals) == 1
assert monthly_billing[0].monthly_totals[0]['billing_units'] == 0
assert monthly_billing[0].monthly_totals[0]['total_cost'] == 0
assert monthly_billing[0].monthly_totals == []
assert monthly_billing[1].service_id == sample_template.service_id
assert monthly_billing[1].start_date == jul_month_start
assert monthly_billing[1].end_date == jul_month_end
assert monthly_billing[1].notification_type == 'sms'
assert len(monthly_billing[1].monthly_totals) == 1
assert sorted(monthly_billing[1].monthly_totals[0]) == sorted(
{
'international': False,
@@ -672,7 +669,7 @@ def test_populate_monthly_billing_updates_correct_month_in_bst(sample_template):
assert monthly_billing[0].start_date == apr_month_start
assert monthly_billing[0].end_date == apr_month_end
assert monthly_billing[0].notification_type == 'email'
assert monthly_billing[0].monthly_totals[0]['billing_units'] == 0
assert monthly_billing[0].monthly_totals == []
assert monthly_billing[1].service_id == sample_template.service_id
assert monthly_billing[1].start_date == apr_month_start