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

Fix pagination bug and swapped file name with original file name.

Browse Source
This commit is contained in:
Nicholas Staples
2016-03-16 16:47:18 +00:00
parent 1425290eef
commit c3a15f9f30
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/notifications/rest.py
View File

@@ -193,13 +193,12 @@ def get_all_notifications():
return jsonify(result="error", message="Invalid page"), 400 return jsonify(result="error", message="Invalid page"), 400
all_notifications = notifications_dao.get_notifications_for_service(api_user['client'], page) all_notifications = notifications_dao.get_notifications_for_service(api_user['client'], page)
return jsonify( return jsonify(
notifications=notification_status_schema.dump(all_notifications.items, many=True).data, notifications=notification_status_schema.dump(all_notifications.items, many=True).data,
links=pagination_links( links=pagination_links(
all_notifications, all_notifications,
'.get_all_notifications', '.get_all_notifications',
request.args **request.args.to_dict()
) )
), 200 ), 200
@@ -213,13 +212,14 @@ def get_all_notifications_for_service(service_id):
return jsonify(result="error", message="Invalid page"), 400 return jsonify(result="error", message="Invalid page"), 400
all_notifications = notifications_dao.get_notifications_for_service(service_id, page) all_notifications = notifications_dao.get_notifications_for_service(service_id, page)
kwargs = request.args.to_dict()
kwargs['service_id'] = service_id
return jsonify( return jsonify(
notifications=notification_status_schema.dump(all_notifications.items, many=True).data, notifications=notification_status_schema.dump(all_notifications.items, many=True).data,
links=pagination_links( links=pagination_links(
all_notifications, all_notifications,
'.get_all_notifications_for_service', '.get_all_notifications_for_service',
request.args **kwargs
) )
), 200 ), 200
@@ -233,13 +233,15 @@ def get_all_notifications_for_service_job(service_id, job_id):
return jsonify(result="error", message="Invalid page"), 400 return jsonify(result="error", message="Invalid page"), 400
all_notifications = notifications_dao.get_notifications_for_job(service_id, job_id, page) all_notifications = notifications_dao.get_notifications_for_job(service_id, job_id, page)
kwargs = request.args.to_dict()
kwargs['service_id'] = service_id
kwargs['job_id'] = job_id
return jsonify( return jsonify(
notifications=notification_status_schema.dump(all_notifications.items, many=True).data, notifications=notification_status_schema.dump(all_notifications.items, many=True).data,
links=pagination_links( links=pagination_links(
all_notifications, all_notifications,
'.get_all_notifications_for_service_job', '.get_all_notifications_for_service_job',
request.args **kwargs
) )
), 200 ), 200
@@ -255,13 +257,15 @@ def get_page_from_request():
return 1 return 1
def pagination_links(pagination, endpoint, args): def pagination_links(pagination, endpoint, **kwargs):
if 'page' in kwargs:
kwargs.pop('page', None)
links = dict() links = dict()
if pagination.has_prev: if pagination.has_prev:
links['prev'] = url_for(endpoint, **dict(list(args.items()) + [('page', pagination.prev_num)])) links['prev'] = url_for(endpoint, page=pagination.prev_num, **kwargs)
if pagination.has_next: if pagination.has_next:
links['next'] = url_for(endpoint, **dict(list(args.items()) + [('page', pagination.next_num)])) links['next'] = url_for(endpoint, page=pagination.next_num, **kwargs)
links['last'] = url_for(endpoint, **dict(list(args.items()) + [('page', pagination.pages)])) links['last'] = url_for(endpoint, page=pagination.pages, **kwargs)
return links return links

4
app/schemas.py
View File

@@ -171,8 +171,8 @@ class SmsAdminNotificationSchema(SmsNotificationSchema):
class NotificationStatusSchema(BaseSchema): class NotificationStatusSchema(BaseSchema):
template = fields.Nested(TemplateSchema, only=["id", "name"], dump_only=True) template = fields.Nested(TemplateSchema, only=["id", "name", "template_type"], dump_only=True)
job = fields.Nested(JobSchema, only=["id", "file_name"], dump_only=True) job = fields.Nested(JobSchema, only=["id", "original_file_name"], dump_only=True)
class Meta: class Meta:
model = models.Notification model = models.Notification