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

Add labels to query so that the named tuples can be referenced later.

Browse Source 
Remove unnecessary function
This commit is contained in:
Rebecca Law
2017-07-25 11:43:41 +01:00
parent 91f29517eb
commit eaf5cbb868
6 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dao/monthly_billing_dao.py
View File

@@ -50,8 +50,8 @@ def _monthly_billing_data_to_json(monthly):
# (month, billing_units, rate_multiplier, international, notification_type, rate)
# total cost must take into account the free allowance.
# might be a good idea to capture free allowance in this table
return [{"billing_units": x[1],
"rate_multiplier": x[2],
"international": x[3],
"rate": x[5],
"total_cost": (x[1] * x[2]) * x[5]} for x in monthly]
return [{"billing_units": x.billing_units,
"rate_multiplier": x.rate_multiplier,
"international": x.international,
"rate": x.rate,
"total_cost": (x.billing_units * x.rate_multiplier) * x.rate} for x in monthly]