Fix conflict

app/dao/jobs_dao.py

@@ -1,10 +1,11 @@
-from datetime import date, timedelta, datetime
-from sqlalchemy import desc, asc, cast, Date as sql_date
+from datetime import datetime
+
+from sqlalchemy import func, desc, asc, cast, Date as sql_date
+
 from app import db
 from app.dao import days_ago
 from app.models import Job, NotificationHistory, JOB_STATUS_SCHEDULED
 from app.statsd_decorators import statsd
-from sqlalchemy import func, asc
 
 
 @statsd(namespace="dao")
@@ -26,11 +27,18 @@ 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):
+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]
     if limit_days is not None:
         query_filter.append(cast(Job.created_at, sql_date) >= days_ago(limit_days))
-    return Job.query.filter(*query_filter).order_by(desc(Job.created_at)).all()
+    if statuses is not None and statuses != ['']:
+        query_filter.append(
+            Job.job_status.in_(statuses)
+        )
+    return Job.query \
+        .filter(*query_filter) \
+        .order_by(desc(Job.created_at)) \
+        .paginate(page=page, per_page=page_size)
 
 
 def dao_get_job_by_id(job_id):

app/dao/notifications_dao.py

@@ -228,14 +228,17 @@ def get_notifications(filter_dict=None):
 
 
 @statsd(namespace="dao")
-def get_notifications_for_service(service_id,
-                                  filter_dict=None,
-                                  page=1,
-                                  page_size=None,
-                                  limit_days=None,
-                                  key_type=None,
-                                  personalisation=False,
-                                  include_jobs=False):
+def get_notifications_for_service(
+    service_id,
+    filter_dict=None,
+    page=1,
+    page_size=None,
+    limit_days=None,
+    key_type=None,
+    personalisation=False,
+    include_jobs=False,
+    include_from_test_key=False
+):
     if page_size is None:
         page_size = current_app.config['PAGE_SIZE']
 
@@ -250,7 +253,7 @@ def get_notifications_for_service(service_id,
 
     if key_type is not None:
         filters.append(Notification.key_type == key_type)
-    else:
+    elif not include_from_test_key:
         filters.append(Notification.key_type != KEY_TYPE_TEST)
 
     query = Notification.query.filter(*filters)