darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 18:01:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Purge functional tests command added with passing test.

Browse Source 
Code quality fix.
This commit is contained in:
Nicholas Staples
2016-05-06 11:07:11 +01:00
parent e10728ccae
commit d40d9f76d4
9 changed files with 144 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/dao/notifications_dao.py
View File

@@ -200,11 +200,10 @@ def get_notifications_for_job(service_id, job_id, filter_dict=None, page=1, page
page_size = current_app.config['PAGE_SIZE']
query = Notification.query.filter_by(service_id=service_id, job_id=job_id)
query = filter_query(query, filter_dict)
pagination = query.order_by(desc(Notification.created_at)).paginate(
return query.order_by(desc(Notification.created_at)).paginate(
page=page,
per_page=page_size
)
return pagination
def get_notification(service_id, notification_id):
@@ -215,7 +214,11 @@ def get_notification_by_id(notification_id):
return Notification.query.filter_by(id=notification_id).first()
def get_notifications_for_service(service_id, filter_dict=None, page=1, page_size=None, limit_days=None):
def get_notifications_for_service(service_id,
filter_dict=None,
page=1,
page_size=None,
limit_days=None):
if page_size is None:
page_size = current_app.config['PAGE_SIZE']
filters = [Notification.service_id == service_id]
@@ -226,11 +229,10 @@ def get_notifications_for_service(service_id, filter_dict=None, page=1, page_siz
query = Notification.query.filter(*filters)
query = filter_query(query, filter_dict)
pagination = query.order_by(desc(Notification.created_at)).paginate(
return query.order_by(desc(Notification.created_at)).paginate(
page=page,
per_page=page_size
)
return pagination
def filter_query(query, filter_dict=None):