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

updated cache to store map not single value, to accommodate the billable units and the total cost.

Browse Source
This commit is contained in:
Martyn Inglis
2017-05-24 09:59:37 +01:00
parent 0db8297693
commit 03346f467f
2 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/service/rest.py
View File

@@ -446,29 +446,35 @@ def get_monthly_template_stats(service_id):
@service_blueprint.route('/<uuid:service_id>/yearly-sms-billable-units') @service_blueprint.route('/<uuid:service_id>/yearly-sms-billable-units')
def get_yearly_sms_billable_units(service_id): def get_yearly_sms_billable_units(service_id):
try: cache_key = sms_billable_units_cache_key(service_id)
cache_key = sms_billable_units_cache_key(service_id) cached_billable_sms_units = redis_store.get_all_from_hash(cache_key)
cached_billable_sms_units = redis_store.get(cache_key) if cached_billable_sms_units:
if cached_billable_sms_units: return jsonify({
return jsonify({ 'billable_sms_units': int(cached_billable_sms_units[b'billable_units']),
'billable_sms_units': int(cached_billable_sms_units[0]), 'total_cost': float(cached_billable_sms_units[b'total_cost'])
'total_cost': float(cached_billable_sms_units[1]) })
}) else:
else: try:
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, total_cost = get_total_billable_units_for_sent_sms_notifications_in_date_range( except (ValueError, TypeError) as e:
start_date, current_app.logger.exception(e)
end_date, return jsonify(result='error', message='No valid year provided'), 400
service_id)
redis_store.set(cache_key, billable_units, ex=60)
return jsonify({
'billable_sms_units': billable_units,
'total_cost': total_cost
})
except (ValueError, TypeError) as e: billable_units, total_cost = get_total_billable_units_for_sent_sms_notifications_in_date_range(
print(e) start_date,
return jsonify(result='error', message='No valid year provided'), 400 end_date,
service_id)
cached_values = {
'billable_units': billable_units,
'total_cost': total_cost
}
redis_store.set_hash_and_expire(cache_key, cached_values, expire_in_seconds=60)
return jsonify({
'billable_sms_units': billable_units,
'total_cost': total_cost
})
@service_blueprint.route('/<uuid:service_id>/yearly-usage') @service_blueprint.route('/<uuid:service_id>/yearly-usage')

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

@@ -1736,8 +1736,8 @@ def test_get_yearly_billing_usage_count_returns_400_if_missing_year(client, samp
def test_get_yearly_billing_usage_count_returns_400_if_invalid_year(client, sample_service, mocker): def test_get_yearly_billing_usage_count_returns_400_if_invalid_year(client, sample_service, mocker):
redis_get_mock = mocker.patch('app.service.rest.redis_store.get', return_value=None) redis_get_mock = mocker.patch('app.service.rest.redis_store.get_all_from_hash', return_value=None)
redis_set_mock = mocker.patch('app.service.rest.redis_store.set') redis_set_mock = mocker.patch('app.service.rest.redis_store.set_hash_and_expire')
response = client.get( response = client.get(
'/service/{}/yearly-sms-billable-units?year=HAHAHAHAH'.format(sample_service.id), '/service/{}/yearly-sms-billable-units?year=HAHAHAHAH'.format(sample_service.id),
@@ -1752,8 +1752,8 @@ def test_get_yearly_billing_usage_count_returns_400_if_invalid_year(client, samp
def test_get_yearly_billing_usage_count_returns_200_if_year_provided(client, sample_service, mocker): def test_get_yearly_billing_usage_count_returns_200_if_year_provided(client, sample_service, mocker):
redis_get_mock = mocker.patch('app.service.rest.redis_store.get', return_value=None) redis_get_mock = mocker.patch('app.service.rest.redis_store.get_all_from_hash', return_value=None)
redis_set_mock = mocker.patch('app.service.rest.redis_store.set') redis_set_mock = mocker.patch('app.service.rest.redis_store.set_hash_and_expire')
start = datetime.utcnow() start = datetime.utcnow()
end = datetime.utcnow() + timedelta(minutes=10) end = datetime.utcnow() + timedelta(minutes=10)
@@ -1773,12 +1773,19 @@ def test_get_yearly_billing_usage_count_returns_200_if_year_provided(client, sam
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)
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)))
redis_set_mock.assert_called_once_with("{}-sms_billable_units".format(str(sample_service.id)), 100, ex=60) redis_set_mock.assert_called_once_with(
"{}-sms_billable_units".format(str(sample_service.id)),
{'billable_units': 100, 'total_cost': 200.0},
expire_in_seconds=60
)
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, 100.0)) redis_get_mock = mocker.patch(
redis_set_mock = mocker.patch('app.service.rest.redis_store.set') 'app.service.rest.redis_store.get_all_from_hash',
return_value={b'total_cost': 100.0, b'billable_units': 50}
)
redis_set_mock = mocker.patch('app.service.rest.redis_store.set_hash_and_expire')
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, 100.0) 'app.service.rest.get_total_billable_units_for_sent_sms_notifications_in_date_range', return_value=(50, 100.0)
) )