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

Merge pull request #2643 from alphagov/dont-count-pages-api-message-log

Browse Source 
Don't request pagination links for API Message log page
This commit is contained in:
Chris Hill-Scott
2019-01-09 12:27:35 +00:00
committed by GitHub
parent 606641a35e 6cd18f87de
commit 8b39bc14d1
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/notify_client/notification_api_client.py
View File

@@ -13,6 +13,7 @@ class NotificationApiClient(NotifyAdminAPIClient):
status=None,
page=None,
page_size=None,
count_pages=None,
limit_days=None,
include_jobs=None,
include_from_test_key=None,
@@ -20,25 +21,22 @@ class NotificationApiClient(NotifyAdminAPIClient):
to=None,
include_one_off=None,
):
params = {}
if page is not None:
params['page'] = page
if page_size is not None:
params['page_size'] = page_size
if template_type is not None:
params['template_type'] = template_type
if status is not None:
params['status'] = status
if include_jobs is not None:
params['include_jobs'] = include_jobs
if include_from_test_key is not None:
params['include_from_test_key'] = include_from_test_key
if format_for_csv is not None:
params['format_for_csv'] = format_for_csv
if to is not None:
params['to'] = to
if include_one_off is not None:
params['include_one_off'] = include_one_off
params = {
'page': page,
'page_size': page_size,
'template_type': template_type,
'status': status,
'include_jobs': include_jobs,
'include_from_test_key': include_from_test_key,
'format_for_csv': format_for_csv,
'to': to,
'include_one_off': include_one_off,
'count_pages': count_pages,
}
params = {k: v for k, v in params.items() if v is not None}
if job_id:
return self.get(
url='/service/{}/job/{}/notifications'.format(service_id, job_id),
@@ -71,7 +69,8 @@ class NotificationApiClient(NotifyAdminAPIClient):
service_id,
include_jobs=False,
include_from_test_key=True,
include_one_off=False
include_one_off=False,
count_pages=False
)
return self.map_letters_to_accepted(ret)