From 27a0ba1a6519a06abdf4ce1eee1eff2458e37967 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 12 May 2020 10:47:14 +0100
Subject: [PATCH] Reformat arguments for readability

We want to add another argument here, and doing so would make the line
length too long with all the arguments on one line.

Also uses the * operator to enforce keyword-only arguments.
---
 app/dao/jobs_dao.py |  9 ++++++++-
 app/job/rest.py     | 18 +++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/dao/jobs_dao.py b/app/dao/jobs_dao.py
index baff3bbb5..eef1486fd 100644
--- a/app/dao/jobs_dao.py
+++ b/app/dao/jobs_dao.py
@@ -58,7 +58,14 @@ def dao_get_job_by_service_id_and_job_id(service_id, job_id):
     return Job.query.filter_by(service_id=service_id, id=job_id).one()
 
 
-def dao_get_jobs_by_service_id(service_id, limit_days=None, page=1, page_size=50, statuses=None):
+def dao_get_jobs_by_service_id(
+    service_id,
+    *,
+    limit_days=None,
+    page=1,
+    page_size=50,
+    statuses=None,
+):
     query_filter = [
         Job.service_id == service_id,
         Job.original_file_name != current_app.config['TEST_MESSAGE_FILENAME'],
diff --git a/app/job/rest.py b/app/job/rest.py
index cde9c2b11..d324f7e7e 100644
--- a/app/job/rest.py
+++ b/app/job/rest.py
@@ -128,10 +128,12 @@ def get_jobs_by_service(service_id):
     else:
         limit_days = None
 
-    statuses = [x.strip() for x in request.args.get('statuses', '').split(',')]
-
-    page = int(request.args.get('page', 1))
-    return jsonify(**get_paginated_jobs(service_id, limit_days, statuses, page))
+    return jsonify(**get_paginated_jobs(
+        service_id,
+        limit_days=limit_days,
+        statuses=[x.strip() for x in request.args.get('statuses', '').split(',')],
+        page=int(request.args.get('page', 1)),
+    ))
 
 
 @job_blueprint.route('', methods=['POST'])
@@ -185,7 +187,13 @@ def create_job(service_id):
     return jsonify(data=job_json), 201
 
 
-def get_paginated_jobs(service_id, limit_days, statuses, page):
+def get_paginated_jobs(
+    service_id,
+    *,
+    limit_days,
+    statuses,
+    page,
+):
     pagination = dao_get_jobs_by_service_id(
         service_id,
         limit_days=limit_days,