Wire in the new API method that calculates the total cost and total billable units.

- Used on dashboard to calculate free tier/cost
- Update tests to mock new method
- Two new tests to check output on dashboard page
This commit is contained in:
Martyn Inglis
2017-05-24 10:35:52 +01:00
parent 1c1c5bd758
commit 52326539d6
6 changed files with 84 additions and 2 deletions

View File

@@ -186,7 +186,7 @@ def get_dashboard_partials(service_id):
'has_jobs': bool(immediate_jobs),
'usage': render_template(
'views/dashboard/_usage.html',
**calculate_usage(service_api_client.get_service_usage(
**calculate_fee_tier_usage(service_api_client.get_yearly_sms_unit_count_and_cost(
service_id,
get_current_financial_year(),
))
@@ -201,6 +201,18 @@ def get_dashboard_totals(statistics):
return statistics
def calculate_fee_tier_usage(usage):
# TODO: Don't hardcode these - get em from the API
sms_free_allowance = 250000
return({
'sms_chargeable': max(0, usage['billable_sms_units'] - sms_free_allowance),
'total_sms_bill': usage['billable_sms_units'],
'total_sms_cost': usage['total_cost'],
'sms_allowance_remaining': sms_free_allowance - int(usage['billable_sms_units'])
})
def calculate_usage(usage):
# TODO: Don't hardcode these - get em from the API
sms_free_allowance = 250000