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

Merge branch 'master' into remove-stats-from-send

Browse Source
This commit is contained in:
Leo Hemsted
2016-08-09 14:41:00 +01:00
parent bdc6691cb9 981777a72a
commit 3f3463b1ff
55 changed files with 408 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/notify_client/service_api_client.py
View File

@@ -204,6 +204,9 @@ class ServiceAPIClient(NotificationsAPIClient):
def get_service_usage(self, service_id):
return self.get('/service/{0}/fragment/aggregate_statistics'.format(service_id))
def get_weekly_notification_stats(self, service_id):
return self.get(url='/service/{}/notifications/weekly'.format(service_id))
class ServicesBrowsableItem(BrowsableItem):
@property

19
app/notify_client/statistics_api_client.py
View File

@@ -12,16 +12,15 @@ class StatisticsApiClient(BaseAPIClient):
self.client_id = app.config['ADMIN_CLIENT_USER_NAME']
self.secret = app.config['ADMIN_CLIENT_SECRET']
def get_7_day_aggregate_for_service(self, service_id, date_from=None, week_count=None):
params = {}
if date_from is not None:
params['date_from'] = date_from
if week_count is not None:
params['week_count'] = week_count
return self.get(
url='/service/{}/notifications-statistics/seven_day_aggregate'.format(service_id),
params=params
)
def get_statistics_for_service_for_day(self, service_id, day):
url = '/service/{}/notifications-statistics/day/{}'.format(service_id, day)
try:
return self.get(url=url)['data']
except HTTPError as e:
if e.status_code == 404:
return None
else:
raise e
def get_statistics_for_all_services_for_day(self, day):
params = {