darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 16:01:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change the resultset from the yearly and monthly billing data queries.

Browse Source 
Fix some formatting of the return objects.
This commit is contained in:
Rebecca Law
2017-04-27 15:43:57 +01:00
committed by Ken Tsang
parent fdbadf967e
commit 1a64509186
6 changed files with 121 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/service/rest.py
View File

@@ -420,11 +420,11 @@ def get_yearly_billing_usage(service_id):
try:
year = int(request.args.get('year'))
results = notification_usage_dao.get_yearly_billing_data(service_id, year)
json_result = [{"billing_units": x[0],
"notification_type": x[1],
json_result = [{"credits": x[0],
"billing_units": x[1],
"rate_multiplier": x[2],
"international": x[3],
"phone_prefix": x[4],
"notification_type": x[3],
"international": x[4],
"rate": x[5]
} for x in results]
return json.dumps(json_result)
@@ -440,11 +440,10 @@ def get_yearly_monthly_usage(service_id):
results = notification_usage_dao.get_monthly_billing_data(service_id, year)
json_results = [{"month": x[0],
"billing_units": x[1],
"notification_type": x[2],
"rate_multiplier": x[3],
"international": x[4],
"phone_prefix": x[5],
"rate": x[6]
"rate_multiplier": x[2],
"international": x[3],
"notification_type": x[4],
"rate": x[5]
} for x in results]
return json.dumps(json_results)
except TypeError: