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

Wired in the free limit from the API

Browse Source
This commit is contained in:
Martyn Inglis
2017-06-07 14:26:00 +01:00
parent e236cc4cbe
commit d2ecd2121e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ def get_dashboard_partials(service_id):
**calculate_free_tier_usage(service_api_client.get_yearly_sms_unit_count_and_cost( **calculate_free_tier_usage(service_api_client.get_yearly_sms_unit_count_and_cost(
service_id, service_id,
get_current_financial_year(), get_current_financial_year(),
)) ), service)
), ),
} }
@@ -202,9 +202,8 @@ def get_dashboard_totals(statistics):
return statistics return statistics
def calculate_free_tier_usage(usage): def calculate_free_tier_usage(usage, service):
sms_free_allowance = current_app.config['SMS_FREE_TIER_AMOUNT'] sms_free_allowance = service['data']['free_sms_fragment_limit']
return({ return({
'sms_chargeable': max(0, usage['billable_sms_units'] - sms_free_allowance), 'sms_chargeable': max(0, usage['billable_sms_units'] - sms_free_allowance),
'total_sms_bill': usage['billable_sms_units'], 'total_sms_bill': usage['billable_sms_units'],

2
tests/conftest.py
View File

@@ -92,6 +92,7 @@ def mock_get_detailed_service(mocker, api_user_active):
return { return {
'data': { 'data': {
'id': service_id, 'id': service_id,
'free_sms_fragment_limit': 250000,
'statistics': { 'statistics': {
'email': {'requested': 0, 'delivered': 0, 'failed': 0}, 'email': {'requested': 0, 'delivered': 0, 'failed': 0},
'sms': {'requested': 0, 'delivered': 0, 'failed': 0} 'sms': {'requested': 0, 'delivered': 0, 'failed': 0}
@@ -109,6 +110,7 @@ def mock_get_detailed_service_for_today(mocker, api_user_active):
return { return {
'data': { 'data': {
'id': service_id, 'id': service_id,
'free_sms_fragment_limit': 250000,
'statistics': { 'statistics': {
'email': {'requested': 0, 'delivered': 0, 'failed': 0}, 'email': {'requested': 0, 'delivered': 0, 'failed': 0},
'sms': {'requested': 0, 'delivered': 0, 'failed': 0} 'sms': {'requested': 0, 'delivered': 0, 'failed': 0}