Skip to content

Commit 4e619d8

Browse files
author
whitekernel
committed
[IMP] alerts v2 consolidation — merge alerts_filters blueprint into /api/v2/alerts/filters, add v2 endpoints for escalate/merge/unmerge/batch, mark legacy alerts_routes counterparts deprecated, business layer gains alerts_escalate/merge/unmerge/batch_* helpers
1 parent fb1a764 commit 4e619d8

6 files changed

Lines changed: 536 additions & 194 deletions

File tree

source/app/blueprints/rest/alerts_routes.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ def alerts_update_route(alert_id) -> Response:
421421

422422

423423
@alerts_rest_blueprint.route('/alerts/batch/update', methods=['POST'])
424+
@endpoint_deprecated('PUT', '/api/v2/alerts/{identifier} (repeated per alert)')
424425
@ac_api_requires(Permissions.alerts_write)
425426
def alerts_batch_update_route() -> Response:
426427
"""
@@ -500,6 +501,7 @@ def alerts_batch_update_route() -> Response:
500501

501502

502503
@alerts_rest_blueprint.route('/alerts/batch/delete', methods=['POST'])
504+
@endpoint_deprecated('DELETE', '/api/v2/alerts/{identifier} (repeated per alert)')
503505
@ac_api_requires(Permissions.alerts_delete)
504506
def alerts_batch_delete_route() -> Response:
505507
"""
@@ -592,6 +594,7 @@ def alerts_delete_route(alert_id) -> Response:
592594

593595

594596
@alerts_rest_blueprint.route('/alerts/escalate/<int:alert_id>', methods=['POST'])
597+
@endpoint_deprecated('POST', '/api/v2/alerts/escalate/{identifier}')
595598
@ac_api_requires(Permissions.alerts_write)
596599
def alerts_escalate_route(alert_id) -> Response:
597600
"""
@@ -663,6 +666,7 @@ def alerts_escalate_route(alert_id) -> Response:
663666

664667

665668
@alerts_rest_blueprint.route('/alerts/merge/<int:alert_id>', methods=['POST'])
669+
@endpoint_deprecated('POST', '/api/v2/alerts/merge/{identifier}')
666670
@ac_api_requires(Permissions.alerts_write)
667671
def alerts_merge_route(alert_id) -> Response:
668672
"""
@@ -730,6 +734,7 @@ def alerts_merge_route(alert_id) -> Response:
730734

731735

732736
@alerts_rest_blueprint.route('/alerts/unmerge/<int:alert_id>', methods=['POST'])
737+
@endpoint_deprecated('POST', '/api/v2/alerts/unmerge/{identifier}')
733738
@ac_api_requires(Permissions.alerts_write)
734739
def alerts_unmerge_route(alert_id) -> Response:
735740
"""
@@ -786,6 +791,7 @@ def alerts_unmerge_route(alert_id) -> Response:
786791

787792

788793
@alerts_rest_blueprint.route('/alerts/batch/merge', methods=['POST'])
794+
@endpoint_deprecated('POST', '/api/v2/alerts/batch/merge')
789795
@ac_api_requires(Permissions.alerts_write)
790796
def alerts_batch_merge_route() -> Response:
791797
"""
@@ -863,6 +869,7 @@ def alerts_batch_merge_route() -> Response:
863869

864870

865871
@alerts_rest_blueprint.route('/alerts/batch/escalate', methods=['POST'])
872+
@endpoint_deprecated('POST', '/api/v2/alerts/batch/escalate')
866873
@ac_api_requires(Permissions.alerts_write)
867874
def alerts_batch_escalate_route() -> Response:
868875
"""
@@ -966,6 +973,7 @@ def alert_comments_get(alert_id):
966973

967974

968975
@alerts_rest_blueprint.route('/alerts/<int:alert_id>/comments/<int:com_id>/delete', methods=['POST'])
976+
@endpoint_deprecated('DELETE', '/api/v2/alerts/{alert_identifier}/comments/{identifier}')
969977
@ac_api_requires(Permissions.alerts_write)
970978
def alert_comment_delete(alert_id, com_id):
971979
"""
@@ -1029,6 +1037,7 @@ def alert_comment_get(alert_id, com_id):
10291037

10301038

10311039
@alerts_rest_blueprint.route('/alerts/<int:alert_id>/comments/<int:com_id>/edit', methods=['POST'])
1040+
@endpoint_deprecated('PUT', '/api/v2/alerts/{alert_identifier}/comments/{identifier}')
10321041
@ac_api_requires(Permissions.alerts_write)
10331042
def alert_comment_edit(alert_id, com_id):
10341043
"""

source/app/blueprints/rest/api_v2_routes.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
from app.blueprints.rest.v2.tasks import tasks_blueprint
3737
from app.blueprints.rest.v2.profile import profile_blueprint
3838
from app.blueprints.rest.v2.search import search_blueprint
39-
from app.blueprints.rest.v2.alerts_filters import alerts_filters_blueprint
4039
from app.blueprints.rest.v2.avatars import admin_avatar_blueprint
4140
from app.blueprints.rest.v2.avatars import me_avatar_blueprint
4241
from app.blueprints.rest.v2.avatars import users_public_blueprint
@@ -70,7 +69,6 @@
7069
rest_v2_blueprint.register_blueprint(tags_blueprint)
7170
rest_v2_blueprint.register_blueprint(profile_blueprint)
7271
rest_v2_blueprint.register_blueprint(search_blueprint)
73-
rest_v2_blueprint.register_blueprint(alerts_filters_blueprint)
7472
rest_v2_blueprint.register_blueprint(cases_filters_blueprint)
7573
rest_v2_blueprint.register_blueprint(users_public_blueprint)
7674
rest_v2_blueprint.register_blueprint(me_avatar_blueprint)

0 commit comments

Comments
 (0)