darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 17:45:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop persisting email branding logos if saving to db fails

Browse Source 
We were previously persisting the logo for the email branding and
deleting the temp files that get created before trying to update the
database with the new email branding. This meant that if there was an
error when saving (e.g. the domain used was a duplicate) the final logo
was already in S3 and trying to go 'back' in the browser would give an
error since the temp files needed to display the create branding page
had already been deleted.

This changes the order we do things in, so that we try persisting the
email branding to the database first.
This commit is contained in:
Katie Smith
2019-01-25 12:07:04 +00:00
parent 0bf3a4b16d
commit 52acf890dd
4 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/app/main/views/test_email_branding.py
View File

@@ -4,6 +4,7 @@ from unittest.mock import call
import pytest
from bs4 import BeautifulSoup
from flask import url_for
from notifications_python_client.errors import HTTPError
from app.main.s3_client import LOGO_LOCATION_STRUCTURE, TEMP_TAG
from tests.conftest import (
@@ -241,7 +242,7 @@ def test_create_new_email_branding_when_branding_saved(
filename=data['logo']
)
mocker.patch('app.main.views.email_branding.persist_logo', return_value=data['logo'])
mocker.patch('app.main.views.email_branding.persist_logo')
mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
logged_in_platform_admin_client.post(
@@ -257,9 +258,11 @@ def test_create_new_email_branding_when_branding_saved(
}
)
updated_logo_name = '{}-{}'.format(fake_uuid, data['logo'])
assert mock_create_email_branding.called
assert mock_create_email_branding.call_args == call(
logo=data['logo'],
logo=updated_logo_name,
name=data['name'],
text=data['text'],
colour=data['colour'],
@@ -340,7 +343,7 @@ def test_update_existing_branding(
filename=data['logo']
)
mocker.patch('app.main.views.email_branding.persist_logo', return_value=data['logo'])
mocker.patch('app.main.views.email_branding.persist_logo')
mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
logged_in_platform_admin_client.post(
@@ -352,10 +355,12 @@ def test_update_existing_branding(
}
)
updated_logo_name = '{}-{}'.format(fake_uuid, data['logo'])
assert mock_update_email_branding.called
assert mock_update_email_branding.call_args == call(
branding_id=fake_uuid,
logo=data['logo'],
logo=updated_logo_name,
name=data['name'],
text=data['text'],
colour=data['colour'],
@@ -408,7 +413,7 @@ def test_logo_persisted_when_organisation_saved(
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename='test.png')
mocked_upload_logo = mocker.patch('app.main.views.email_branding.upload_logo')
mocked_persist_logo = mocker.patch('app.main.views.email_branding.persist_logo', return_value='test.png')
mocked_persist_logo = mocker.patch('app.main.views.email_branding.persist_logo')
mocked_delete_temp_files_by = mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
resp = logged_in_platform_admin_client.post(
@@ -424,6 +429,31 @@ def test_logo_persisted_when_organisation_saved(
assert mock_create_email_branding.called
def test_logo_does_not_get_persisted_if_updating_email_branding_client_throws_an_error(
logged_in_platform_admin_client,
mock_create_email_branding,
mocker,
fake_uuid
):
with logged_in_platform_admin_client.session_transaction() as session:
user_id = session["user_id"]
temp_filename = LOGO_LOCATION_STRUCTURE.format(
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename='test.png')
mocked_persist_logo = mocker.patch('app.main.views.email_branding.persist_logo')
mocked_delete_temp_files_by = mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
mocker.patch('app.main.views.email_branding.email_branding_client.create_email_branding', side_effect=HTTPError())
logged_in_platform_admin_client.post(
url_for('.create_email_branding', logo=temp_filename),
content_type='multipart/form-data'
)
assert not mocked_persist_logo.called
assert not mocked_delete_temp_files_by.called
@pytest.mark.parametrize('colour_hex, expected_status_code', [
('#FF00FF', 302),
('hello', 200),