darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 09:26:08 -05: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):
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