-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement email notification when a service is suspended from the adm…
…in panel
- Loading branch information
Showing
5 changed files
with
216 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
""" | ||
Revision ID: 0425_bounce_rate_limits | ||
Revises: 0424_sms_templates_in_redacted | ||
Create Date: 2022-12-28 00:00:00 | ||
""" | ||
|
||
from datetime import datetime | ||
from alembic import op | ||
from flask import current_app | ||
|
||
|
||
revision = "0425_bounce_rate_limites" | ||
down_revision = "0424_sms_templates_in_redacted" | ||
|
||
bounce_rate_exceeded = current_app.config["BOUNCE_RATE_EXCEEDED_ID"] | ||
bounce_rate_warning = current_app.config["BOUNCE_RATE_WARNING_ID"] | ||
|
||
templates = [ | ||
{ | ||
"id": bounce_rate_exceeded, | ||
"name": "Bounce Rate Exceeded", | ||
"type": "email", | ||
"subject": "Notification service bounce rate exceeded", | ||
"content_lines": [ | ||
'The bounce rate for your service, "((service_name))" has been exceeded. ', | ||
"", | ||
"To ensure we can provide reliable, uninterrupted service to all users of Notify, we temporarily suspended your service: ((service_name))", | ||
"", | ||
"To resume your service, please [contact us](((contact_us_url)))", | ||
], | ||
}, | ||
{ | ||
"id": bounce_rate_warning, | ||
"name": "Bounce Rate Warning", | ||
"type": "email", | ||
"subject": "Notification service bounce rate warning", | ||
"content_lines": [ | ||
"Hello ((name))" "" 'Your service, "((service_name))" is approaching the bounce rate limit.', | ||
"", | ||
"To ensure that your service is not suspended, please ensure that your recipient lists are up to date and contain valid email addresses", | ||
"", | ||
"To learn more about managing the bounce rate for your services [contact us](((contact_us_url)))", | ||
], | ||
}, | ||
] | ||
|
||
|
||
def upgrade(): | ||
|
||
insert = """ | ||
INSERT INTO {} (id, name, template_type, created_at, content, archived, service_id, subject, | ||
created_by_id, version, process_type, hidden) | ||
VALUES ('{}', '{}', '{}', current_timestamp, '{}', False, '{}', '{}', '{}', 1, '{}', false) | ||
""" | ||
|
||
for template in templates: | ||
for table_name in "templates", "templates_history": | ||
op.execute( | ||
insert.format( | ||
table_name, | ||
template["id"], | ||
template["name"], | ||
template["type"], | ||
"\n".join(template["content_lines"]), | ||
current_app.config["NOTIFY_SERVICE_ID"], | ||
template.get("subject"), | ||
current_app.config["NOTIFY_USER_ID"], | ||
"normal", | ||
) | ||
) | ||
op.execute( | ||
f""" | ||
INSERT INTO template_redacted( | ||
template_id, | ||
redact_personalisation, | ||
updated_at, | ||
updated_by_id | ||
) VALUES ('{template["id"]}', false, current_timestamp, '{current_app.config["NOTIFY_USER_ID"]}') | ||
""" | ||
) | ||
|
||
|
||
def downgrade(): | ||
for template in templates: | ||
for table in "templates", "template_history": | ||
op.execute(f"DELETE FROM {table} where template_id = '{template['id']}'") | ||
op.execute(f"DELETE FROM template_redacted WHERE template_id = '{template['id']}'") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2851,38 +2851,23 @@ def test_delete_service_reply_to_email_address_archives_an_email_reply_to(sample | |
assert reply_to.archived is True | ||
|
||
|
||
def test_delete_service_reply_to_email_address_archives_default_reply_to_if_no_others_exist( | ||
def test_delete_service_reply_to_email_address_returns_400_if_archiving_default_reply_to( | ||
admin_request, notify_db_session, sample_service | ||
): | ||
reply_to = create_reply_to_email(service=sample_service, email_address="[email protected]") | ||
|
||
admin_request.post( | ||
"service.delete_service_reply_to_email_address", | ||
service_id=sample_service.id, | ||
reply_to_email_id=reply_to.id, | ||
) | ||
|
||
assert reply_to.archived is True | ||
|
||
|
||
def test_delete_service_reply_to_email_address_returns_400_if_archiving_default_reply_to_and_others_exist( | ||
admin_request, notify_db_session, sample_service | ||
): | ||
reply_to_1 = create_reply_to_email(service=sample_service, email_address="[email protected]") | ||
create_reply_to_email(service=sample_service, email_address="[email protected]") | ||
|
||
response = admin_request.post( | ||
"service.delete_service_reply_to_email_address", | ||
service_id=sample_service.id, | ||
reply_to_email_id=reply_to_1.id, | ||
reply_to_email_id=reply_to.id, | ||
_expected_status=400, | ||
) | ||
|
||
assert response == { | ||
"message": "You cannot delete a default email reply to address if other reply to addresses exist", | ||
"message": "You cannot delete a default email reply to address", | ||
"result": "error", | ||
} | ||
assert reply_to_1.archived is False | ||
assert reply_to.archived is False | ||
|
||
|
||
def test_get_email_reply_to_address(client, notify_db, notify_db_session): | ||
|
@@ -3405,6 +3390,7 @@ def test_cancel_notification_for_service_raises_invalid_request_when_notificatio | |
admin_request, | ||
sample_notification, | ||
): | ||
|
||
response = admin_request.post( | ||
"service.cancel_notification_for_service", | ||
service_id=sample_notification.service_id, | ||
|
@@ -3517,3 +3503,43 @@ def test_get_monthly_notification_data_by_service(mocker, admin_request): | |
|
||
dao_mock.assert_called_once_with(start_date, end_date) | ||
assert response == [] | ||
|
||
|
||
def test_suspend_service_bounce_rate_exceeded_email_sent(mocker, sample_service, admin_request, bounce_rate_templates): | ||
mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async") | ||
|
||
admin_request.post( | ||
"service.suspend_service", | ||
service_id=sample_service.id, | ||
_expected_status=204, | ||
) | ||
|
||
notification = Notification.query.first() | ||
# TODO: Mock a service with an exceeded bounce rate if we end up storing | ||
# that data as a status indicator in the DB | ||
service = Service.query.get(sample_service.id) | ||
|
||
mocked.assert_called_once_with([str(notification.id)], queue="notify-internal-tasks") | ||
assert notification.personalisation["service_name"] == sample_service.name | ||
assert service.active is False | ||
|
||
for api_key in service.api_keys: | ||
assert api_key.expiry_date <= datetime.utcnow() | ||
|
||
|
||
@pytest.mark.skip( | ||
reason="Depends on completion of ADR for bounce rate. How we will fetch and store whether a service has hit or is approaching the bounce rate needs to be decided and implemented" | ||
) | ||
def test_suspend_service_bounce_rate_not_exceeded_no_email_sent(mocker, sample_service, admin_request, bounce_rate_templates): | ||
mocked = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async") | ||
|
||
response = admin_request.post( | ||
"service.suspend_service", | ||
service_id=sample_service.id, | ||
_expected_status=204, | ||
) | ||
|
||
notification = Notification.query.first() | ||
service = Service.query.get(sample_service.id) | ||
|
||
assert True |