darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 13:39:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3984 from alphagov/handle-cancel-letter-errors-from-api

Browse Source 
Catch cancel_letter errors from API
This commit is contained in:
Pea Tyczynska
2021-08-03 11:05:46 +01:00
committed by GitHub
parent 703516cbec e1420e7ff7
commit af6b1d38b5
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/main/views/notifications.py
View File

@@ -17,7 +17,7 @@ from flask import (
stream_with_context,
url_for,
)
from notifications_python_client.errors import APIError
from notifications_python_client.errors import APIError, HTTPError
from notifications_utils.letter_timings import (
get_letter_timings,
letter_can_be_cancelled,
@@ -185,7 +185,14 @@ def view_notification(service_id, notification_id):
def cancel_letter(service_id, notification_id):
if request.method == 'POST':
notification_api_client.update_notification_to_cancelled(current_service.id, notification_id)
try:
notification_api_client.update_notification_to_cancelled(current_service.id, notification_id)
except HTTPError as e:
message_fragments = ["already been cancelled", "too late to cancel"]
if e.status_code == 400 and any(fragment in e.message for fragment in message_fragments):
flash(e.message)
else:
raise e
return redirect(url_for('main.view_notification', service_id=service_id, notification_id=notification_id))
flash("Are you sure you want to cancel sending this letter?", 'cancel')