darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused letter_cumulative field

Browse Source 
I have searched for this in the code and can't see it being used
anywhere so have removed it!
This commit is contained in:
David McDonald
2022-04-25 11:11:45 +01:00
parent c63660d56d
commit c5d729b5f2
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/dashboard.py
View File

@@ -406,7 +406,6 @@ def get_sum_billing_units(billing_units, month=None):
def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, billing_units): def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, billing_units):
cumulative = 0 cumulative = 0
letter_cumulative = 0
sms_units = [x for x in billing_units if x['notification_type'] == 'sms'] sms_units = [x for x in billing_units if x['notification_type'] == 'sms']
letter_units = [x for x in billing_units if x['notification_type'] == 'letter'] letter_units = [x for x in billing_units if x['notification_type'] == 'letter']
for month in get_months_for_financial_year(year): for month in get_months_for_financial_year(year):
@@ -424,11 +423,9 @@ def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, bi
letter_total = 0 letter_total = 0
for x in letter_billing: for x in letter_billing:
letter_total += x.cost letter_total += x.cost
letter_cumulative += letter_total
yield { yield {
'name': month, 'name': month,
'letter_total': letter_total, 'letter_total': letter_total,
'letter_cumulative': letter_cumulative,
'paid': breakdown['paid'], 'paid': breakdown['paid'],
'free': breakdown['free'], 'free': breakdown['free'],
'letters': letter_billing 'letters': letter_billing

24
tests/app/main/views/test_dashboard.py
View File

@@ -1595,18 +1595,18 @@ def test_get_free_paid_breakdown_for_billable_units(now, expected_number_of_mont
] ]
) )
assert list(billing_units) == [ assert list(billing_units) == [
{'free': 100000, 'name': 'April', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 100000, 'name': 'April', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 100000, 'name': 'May', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 100000, 'name': 'May', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 50000, 'name': 'June', 'paid': 50000, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 50000, 'name': 'June', 'paid': 50000, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'July', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 0, 'name': 'July', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'August', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 0, 'name': 'August', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'September', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 0, 'name': 'September', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'October', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 0, 'name': 'October', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'November', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 0, 'name': 'November', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'December', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 0, 'name': 'December', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'January', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 0, 'name': 'January', 'paid': 0, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'February', 'paid': 2000, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, {'free': 0, 'name': 'February', 'paid': 2000, 'letter_total': 0, 'letters': []},
{'free': 0, 'name': 'March', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0} {'free': 0, 'name': 'March', 'paid': 0, 'letter_total': 0, 'letters': []}
][:expected_number_of_months] ][:expected_number_of_months]