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

Use list comprehensions instead of filter

Browse Source 
“filter's pretty oldschool” – @leohemsted
This commit is contained in:
Chris Hill-Scott
2016-08-31 16:41:08 +01:00
parent 661f5ba702
commit 72f92b5249
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,18 +112,16 @@ def get_dashboard_partials(service_id):
template_statistics_client.get_template_statistics_for_service(service_id, limit_days=7) template_statistics_client.get_template_statistics_for_service(service_id, limit_days=7)
) )
jobs = add_rate_to_jobs(filter( jobs = add_rate_to_jobs([
lambda job: job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME'], job for job in job_api_client.get_job(service_id, limit_days=7)['data']
job_api_client.get_job(service_id, limit_days=7)['data'] if job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME']
)) ])
scheduled_jobs = filter( scheduled_jobs = [
lambda job: job['job_status'] == 'scheduled', job for job in jobs if job['job_status'] == 'scheduled'
jobs ]
) immediate_jobs = [
immediate_jobs = filter( job for job in jobs if job['job_status'] != 'scheduled'
lambda job: job['job_status'] != 'scheduled', ]
jobs
)
service = service_api_client.get_detailed_service(service_id) service = service_api_client.get_detailed_service(service_id)
return { return {

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

@@ -65,10 +65,10 @@ def _set_status_filters(filter_args):
def view_jobs(service_id): def view_jobs(service_id):
return render_template( return render_template(
'views/jobs/jobs.html', 'views/jobs/jobs.html',
jobs=filter( jobs=add_rate_to_jobs([
lambda job: job['job_status'] != 'scheduled', job for job in job_api_client.get_job(service_id)['data']
add_rate_to_jobs(job_api_client.get_job(service_id)['data']) if job['job_status'] != 'scheduled'
) ])
) )