From d2ecd2121e6bfd0f861839ad3308de2768299dce Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Wed, 7 Jun 2017 14:26:00 +0100 Subject: [PATCH 1/2] Wired in the free limit from the API --- app/main/views/dashboard.py | 7 +++---- tests/conftest.py | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 9091a2036..45736ac1e 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -190,7 +190,7 @@ def get_dashboard_partials(service_id): **calculate_free_tier_usage(service_api_client.get_yearly_sms_unit_count_and_cost( service_id, get_current_financial_year(), - )) + ), service) ), } @@ -202,9 +202,8 @@ def get_dashboard_totals(statistics): return statistics -def calculate_free_tier_usage(usage): - sms_free_allowance = current_app.config['SMS_FREE_TIER_AMOUNT'] - +def calculate_free_tier_usage(usage, service): + sms_free_allowance = service['data']['free_sms_fragment_limit'] return({ 'sms_chargeable': max(0, usage['billable_sms_units'] - sms_free_allowance), 'total_sms_bill': usage['billable_sms_units'], diff --git a/tests/conftest.py b/tests/conftest.py index 29a1969f8..2aa63a34b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -92,6 +92,7 @@ def mock_get_detailed_service(mocker, api_user_active): return { 'data': { 'id': service_id, + 'free_sms_fragment_limit': 250000, 'statistics': { 'email': {'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 { 'data': { 'id': service_id, + 'free_sms_fragment_limit': 250000, 'statistics': { 'email': {'requested': 0, 'delivered': 0, 'failed': 0}, 'sms': {'requested': 0, 'delivered': 0, 'failed': 0} From 834c255195865468bf7c916d18c0b38aa47564a7 Mon Sep 17 00:00:00 2001 From: minglis Date: Thu, 8 Jun 2017 13:55:13 +0100 Subject: [PATCH 2/2] Fixed typos --- tests/app/main/views/test_dashboard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 587a1fe46..be6aaead8 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -832,7 +832,7 @@ def test_should_show_all_jobs_with_valid_statuses( }) -def test_should_show_remaining_fee_tier_count( +def test_should_show_remaining_free_tier_count( logged_in_client, mock_get_service_templates, mock_get_template_statistics, @@ -853,7 +853,7 @@ def test_should_show_remaining_fee_tier_count( assert 'free text messages left' in response.get_data(as_text=True) -def test_should_show_cost_if_exceeded_fee_tier_count( +def test_should_show_cost_if_exceeded_free_tier_count( logged_in_client, mock_get_service_templates, mock_get_template_statistics,