diff --git a/app/notifications/rest.py b/app/notifications/rest.py index 34c70417e..964bee19b 100644 --- a/app/notifications/rest.py +++ b/app/notifications/rest.py @@ -64,9 +64,11 @@ def get_notification_by_id(notification_id): @notifications.route("/notifications", methods=["GET"]) def get_all_notifications(): - current_app.logger.debug(f"enter get_all_notifications()") + current_app.logger.debug("enter get_all_notifications()") data = notifications_filter_schema.load(request.args) - current_app.logger.debug(f"get_all_notifications() data {data} request.args {request.args}") + current_app.logger.debug( + f"get_all_notifications() data {data} request.args {request.args}" + ) include_jobs = data.get("include_jobs", False) page = data.get("page", 1) @@ -99,18 +101,17 @@ def get_all_notifications(): notification.normalised_to = recipient result = jsonify( - notifications=notification_with_personalisation_schema.dump( - pagination.items, many=True - ), - page_size=page_size, - total=pagination.total, - links=pagination_links( - pagination, ".get_all_notifications", **request.args.to_dict() - ), - ) + notifications=notification_with_personalisation_schema.dump( + pagination.items, many=True + ), + page_size=page_size, + total=pagination.total, + links=pagination_links( + pagination, ".get_all_notifications", **request.args.to_dict() + ), + ) current_app.logger.debug(f"result={result}") - return result,200 - + return result, 200 @notifications.route("/notifications/", methods=["POST"]) diff --git a/app/service/rest.py b/app/service/rest.py index 9a6aa7f3d..70c6e910d 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -389,10 +389,12 @@ def get_service_history(service_id): @service_blueprint.route("//notifications", methods=["GET", "POST"]) def get_all_notifications_for_service(service_id): - current_app.logger.debug(f"enter get_all_notifications_for_service") + current_app.logger.debug("enter get_all_notifications_for_service") if request.method == "GET": data = notifications_filter_schema.load(request.args) - current_app.logger.debug(f"use GET, request.args {request.args} and data {data}") + current_app.logger.debug( + f"use GET, request.args {request.args} and data {data}" + ) elif request.method == "POST": # Must transform request.get_json() to MultiDict as NotificationsFilterSchema expects a MultiDict. # Unlike request.args, request.get_json() does not return a MultiDict but instead just a dict. @@ -424,8 +426,10 @@ def get_all_notifications_for_service(service_id): # for whether to show pagination links count_pages = data.get("count_pages", True) - current_app.logger.debug(f"get pagination with {service_id} service_id filters {data} \ - limit_days {limit_days} include_jobs {include_jobs} include_one_off {include_one_off}") + current_app.logger.debug( + f"get pagination with {service_id} service_id filters {data} \ + limit_days {limit_days} include_jobs {include_jobs} include_one_off {include_one_off}" + ) pagination = notifications_dao.get_notifications_for_service( service_id, filter_dict=data,