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

Merge pull request #3065 from alphagov/rename-endpoint

Browse Source 
Remove ft from method and url, it doesn't add any meaning.
This commit is contained in:
Katie Smith
2019-07-29 10:07:31 +01:00
committed by GitHub
parent 691a607ccf e0bcad77f5
commit e72540d3f9
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/dashboard.py
View File

@@ -143,8 +143,8 @@ def usage(service_id):
year, current_financial_year = requested_and_current_financial_year(request)
free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(service_id, year)
units = billing_api_client.get_billable_units_ft(service_id, year)
yearly_usage = billing_api_client.get_service_usage_ft(service_id, year)
units = billing_api_client.get_billable_units(service_id, year)
yearly_usage = billing_api_client.get_service_usage(service_id, year)
usage_template = 'views/usage.html'
if current_service.has_permission('letter'):

8
app/notify_client/billing_api_client.py
View File

@@ -3,15 +3,15 @@ from app.notify_client import NotifyAdminAPIClient
class BillingAPIClient(NotifyAdminAPIClient):
def get_billable_units_ft(self, service_id, year):
def get_billable_units(self, service_id, year):
return self.get(
'/service/{0}/billing/ft-monthly-usage'.format(service_id),
'/service/{0}/billing/monthly-usage'.format(service_id),
params=dict(year=year)
)
def get_service_usage_ft(self, service_id, year=None):
def get_service_usage(self, service_id, year=None):
return self.get(
'/service/{0}/billing/ft-yearly-usage-summary'.format(service_id),
'/service/{0}/billing/yearly-usage-summary'.format(service_id),
params=dict(year=year)
)