darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 05:59:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Migrate letter cost calculation to use API field

Browse Source 
The values in the tests are calculated manually from other fields
in the mocked API response.
This commit is contained in:
Ben Thorner
2022-05-03 10:25:58 +01:00
parent d798a0d60f
commit c0ee24ff19
3 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,11 +409,9 @@ def get_monthly_usage_breakdown(year, monthly_usage):
sms_rate = monthly_sms[0]['rate'] if len(monthly_sms) else 0
monthly_letters = [row for row in letters if row['month'] == month]
letter_cost = sum(row['letter_cost'] for row in monthly_letters)
letter_breakdown = format_letter_details_for_month(monthly_letters)
letter_cost = 0
for x in letter_breakdown:
letter_cost += x.cost
yield {
'month': month,
'letter_cost': letter_cost,
@@ -446,7 +444,7 @@ def format_letter_details_for_month(letter_units_for_month):
letter_details = LetterDetails(
sent=sum(x['billing_units'] for x in rate_group),
rate=rate_group[0]['rate'],
cost=(sum(x['billing_units'] for x in rate_group) * rate_group[0]['rate']),
cost=sum(x['letter_cost'] for x in rate_group),
postage_description=rate_group[0]['postage']
)