From 78a55bafe0f5d3e4b405a25622d235ec122f7d1f Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Wed, 24 May 2017 08:57:41 +0100 Subject: [PATCH] Added new cost field to yearly billable sms endpoint. --- app/service/rest.py | 17 ++++++++++++----- tests/app/service/test_rest.py | 13 ++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/service/rest.py b/app/service/rest.py index f52b18174..ad0c39d12 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -448,19 +448,26 @@ def get_monthly_template_stats(service_id): def get_yearly_sms_billable_units(service_id): try: cache_key = sms_billable_units_cache_key(service_id) - cached_value = redis_store.get(cache_key) - if cached_value: - return jsonify({'billable_sms_units': int(cached_value)}) + cached_billable_sms_units = redis_store.get(cache_key) + if cached_billable_sms_units: + return jsonify({ + 'billable_sms_units': int(cached_billable_sms_units[0]), + 'total_cost': float(cached_billable_sms_units[1]) + }) else: start_date, end_date = get_financial_year(int(request.args.get('year'))) - billable_units = get_total_billable_units_for_sent_sms_notifications_in_date_range( + billable_units, total_cost = get_total_billable_units_for_sent_sms_notifications_in_date_range( start_date, end_date, service_id) redis_store.set(cache_key, billable_units, ex=60) - return jsonify({'billable_sms_units': billable_units}) + return jsonify({ + 'billable_sms_units': billable_units, + 'total_cost': total_cost + }) except (ValueError, TypeError) as e: + print(e) return jsonify(result='error', message='No valid year provided'), 400 diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 4d9882e82..4231de249 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -1758,7 +1758,7 @@ def test_get_yearly_billing_usage_count_returns_200_if_year_provided(client, sam start = datetime.utcnow() end = datetime.utcnow() + timedelta(minutes=10) mock_query = mocker.patch( - 'app.service.rest.get_total_billable_units_for_sent_sms_notifications_in_date_range', return_value=100 + 'app.service.rest.get_total_billable_units_for_sent_sms_notifications_in_date_range', return_value=(100, 200.0) ) mock_year = mocker.patch('app.service.rest.get_financial_year', return_value=(start, end)) response = client.get( @@ -1767,7 +1767,8 @@ def test_get_yearly_billing_usage_count_returns_200_if_year_provided(client, sam ) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == { - 'billable_sms_units': 100 + 'billable_sms_units': 100, + 'total_cost': 200.0 } mock_query.assert_called_once_with(start, end, sample_service.id) mock_year.assert_called_once_with(2016) @@ -1776,10 +1777,10 @@ def test_get_yearly_billing_usage_count_returns_200_if_year_provided(client, sam def test_get_yearly_billing_usage_count_returns_from_cache_if_present(client, sample_service, mocker): - redis_get_mock = mocker.patch('app.service.rest.redis_store.get', return_value=50) + redis_get_mock = mocker.patch('app.service.rest.redis_store.get', return_value=(50, 100.0)) redis_set_mock = mocker.patch('app.service.rest.redis_store.set') mock_query = mocker.patch( - 'app.service.rest.get_total_billable_units_for_sent_sms_notifications_in_date_range', return_value=50 + 'app.service.rest.get_total_billable_units_for_sent_sms_notifications_in_date_range', return_value=(50, 100.0) ) start = datetime.utcnow() @@ -1790,9 +1791,11 @@ def test_get_yearly_billing_usage_count_returns_from_cache_if_present(client, sa '/service/{}/yearly-sms-billable-units?year=2016'.format(sample_service.id), headers=[create_authorization_header()] ) + print(response.get_data(as_text=True)) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == { - 'billable_sms_units': 50 + 'billable_sms_units': 50, + 'total_cost': 100.0 } redis_get_mock.assert_called_once_with("{}-sms_billable_units".format(str(sample_service.id))) mock_year.assert_not_called()