darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 15:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix flake 8

Browse Source
This commit is contained in:
Kenneth Kehl
2024-05-15 08:34:56 -07:00
parent c3a20eca17
commit e7c68531f2
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/notifications/rest.py
View File

@@ -64,9 +64,11 @@ def get_notification_by_id(notification_id):
@notifications.route("/notifications", methods=["GET"]) @notifications.route("/notifications", methods=["GET"])
def get_all_notifications(): 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) 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) include_jobs = data.get("include_jobs", False)
page = data.get("page", 1) page = data.get("page", 1)
@@ -99,18 +101,17 @@ def get_all_notifications():
notification.normalised_to = recipient notification.normalised_to = recipient
result = jsonify( result = jsonify(
notifications=notification_with_personalisation_schema.dump( notifications=notification_with_personalisation_schema.dump(
pagination.items, many=True pagination.items, many=True
), ),
page_size=page_size, page_size=page_size,
total=pagination.total, total=pagination.total,
links=pagination_links( links=pagination_links(
pagination, ".get_all_notifications", **request.args.to_dict() pagination, ".get_all_notifications", **request.args.to_dict()
), ),
) )
current_app.logger.debug(f"result={result}") current_app.logger.debug(f"result={result}")
return result,200 return result, 200
@notifications.route("/notifications/<string:notification_type>", methods=["POST"]) @notifications.route("/notifications/<string:notification_type>", methods=["POST"])

12
app/service/rest.py
View File

@@ -389,10 +389,12 @@ def get_service_history(service_id):
@service_blueprint.route("/<uuid:service_id>/notifications", methods=["GET", "POST"]) @service_blueprint.route("/<uuid:service_id>/notifications", methods=["GET", "POST"])
def get_all_notifications_for_service(service_id): 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": if request.method == "GET":
data = notifications_filter_schema.load(request.args) 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": elif request.method == "POST":
# Must transform request.get_json() to MultiDict as NotificationsFilterSchema expects a MultiDict. # 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. # 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 # for whether to show pagination links
count_pages = data.get("count_pages", True) count_pages = data.get("count_pages", True)
current_app.logger.debug(f"get pagination with {service_id} service_id filters {data} \ current_app.logger.debug(
limit_days {limit_days} include_jobs {include_jobs} include_one_off {include_one_off}") 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( pagination = notifications_dao.get_notifications_for_service(
service_id, service_id,
filter_dict=data, filter_dict=data,