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

Added new cost field to yearly billable sms endpoint.

Browse Source
This commit is contained in:
Martyn Inglis
2017-05-24 08:57:41 +01:00
parent 511e143ace
commit 78a55bafe0
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/service/rest.py
View File

@@ -448,19 +448,26 @@ def get_monthly_template_stats(service_id):
def get_yearly_sms_billable_units(service_id): def get_yearly_sms_billable_units(service_id):
try: try:
cache_key = sms_billable_units_cache_key(service_id) cache_key = sms_billable_units_cache_key(service_id)
cached_value = redis_store.get(cache_key) cached_billable_sms_units = redis_store.get(cache_key)
if cached_value: if cached_billable_sms_units:
return jsonify({'billable_sms_units': int(cached_value)}) return jsonify({
'billable_sms_units': int(cached_billable_sms_units[0]),
'total_cost': float(cached_billable_sms_units[1])
})
else: else:
start_date, end_date = get_financial_year(int(request.args.get('year'))) 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, start_date,
end_date, end_date,
service_id) service_id)
redis_store.set(cache_key, billable_units, ex=60) 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: except (ValueError, TypeError) as e:
print(e)
return jsonify(result='error', message='No valid year provided'), 400 return jsonify(result='error', message='No valid year provided'), 400

13
tests/app/service/test_rest.py
View File

@@ -1758,7 +1758,7 @@ def test_get_yearly_billing_usage_count_returns_200_if_year_provided(client, sam
start = datetime.utcnow() start = datetime.utcnow()
end = datetime.utcnow() + timedelta(minutes=10) end = datetime.utcnow() + timedelta(minutes=10)
mock_query = mocker.patch( 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)) mock_year = mocker.patch('app.service.rest.get_financial_year', return_value=(start, end))
response = client.get( 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 response.status_code == 200
assert json.loads(response.get_data(as_text=True)) == { 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_query.assert_called_once_with(start, end, sample_service.id)
mock_year.assert_called_once_with(2016) 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): 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') redis_set_mock = mocker.patch('app.service.rest.redis_store.set')
mock_query = mocker.patch( 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() 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), '/service/{}/yearly-sms-billable-units?year=2016'.format(sample_service.id),
headers=[create_authorization_header()] headers=[create_authorization_header()]
) )
print(response.get_data(as_text=True))
assert response.status_code == 200 assert response.status_code == 200
assert json.loads(response.get_data(as_text=True)) == { 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))) redis_get_mock.assert_called_once_with("{}-sms_billable_units".format(str(sample_service.id)))
mock_year.assert_not_called() mock_year.assert_not_called()