Merge branch 'fetch-notifications-endpoints' of github.com:alphagov/notifications-api into fetch-notifications-endpoints

Conflicts:
	app/dao/notifications_dao.py
This commit is contained in:
Martyn Inglis
2016-03-01 14:59:21 +00:00

View File

@@ -33,7 +33,6 @@ def get_notification(service_id, notification_id):
def get_notifications_for_service(service_id, page=1): def get_notifications_for_service(service_id, page=1):
print(service_id)
query = Notification.query.filter_by(service_id=service_id).order_by(desc(Notification.created_at)).paginate( query = Notification.query.filter_by(service_id=service_id).order_by(desc(Notification.created_at)).paginate(
page=page, page=page,
per_page=current_app.config['PAGE_SIZE'] per_page=current_app.config['PAGE_SIZE']