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

separate get_job and get_jobs in job_api_client

Browse Source 
also remove the status parameter, as we never use it anywhere
This commit is contained in:
Leo Hemsted
2016-09-22 09:53:33 +01:00
parent 5bb700ac81
commit 549a17c1f7
6 changed files with 16 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ def get_dashboard_partials(service_id):
)
jobs = add_rate_to_jobs([
job for job in job_api_client.get_job(service_id, limit_days=7)['data']
job for job in job_api_client.get_jobs(service_id, limit_days=7)['data']
if job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME']
])
scheduled_jobs = sorted([

2
app/main/views/jobs.py
View File

@@ -68,7 +68,7 @@ def view_jobs(service_id):
return render_template(
'views/jobs/jobs.html',
jobs=add_rate_to_jobs([
job for job in job_api_client.get_job(service_id)['data']
job for job in job_api_client.get_jobs(service_id)['data']
if job['job_status'] not in ['scheduled', 'cancelled']
])
)

22
app/notify_client/job_api_client.py
View File

@@ -26,21 +26,19 @@ class JobApiClient(BaseAPIClient):
results['requested'] += outcome['count']
return results
def get_job(self, service_id, job_id=None, limit_days=None, status=None):
if job_id:
params = {}
if status is not None:
params['status'] = status
job = self.get(url='/service/{}/job/{}'.format(service_id, job_id), params=params)
def get_job(self, service_id, job_id):
params = {}
job = self.get(url='/service/{}/job/{}'.format(service_id, job_id), params=params)
stats = self.__convert_statistics(job['data'])
job['data']['notifications_sent'] = stats['delivered'] + stats['failed']
job['data']['notifications_delivered'] = stats['delivered']
job['data']['notifications_failed'] = stats['failed']
job['data']['notifications_requested'] = stats['requested']
stats = self.__convert_statistics(job['data'])
job['data']['notifications_sent'] = stats['delivered'] + stats['failed']
job['data']['notifications_delivered'] = stats['delivered']
job['data']['notifications_failed'] = stats['failed']
job['data']['notifications_requested'] = stats['requested']
return job
return job
def get_jobs(self, service_id, limit_days=None):
params = {}
if limit_days is not None:
params['limit_days'] = limit_days

4
app/statistics_utils.py
View File

@@ -74,9 +74,7 @@ def statistics_by_state(statistics):
def get_failure_rate_for_job(job):
if not job.get('notifications_delivered'):
if job.get('notifications_failed'):
return 1
return 0
return 1 if job.get('notifications_failed') else 0
return (
job.get('notifications_failed', 0) /
(job.get('notifications_failed', 0) + job.get('notifications_delivered', 0))