mirror of
https://github.com/GSA/notifications-api.git
synced 2026-05-05 08:40:29 -04:00
Remove letters-related code (#175)
This deletes a big ol' chunk of code related to letters. It's not everything—there are still a few things that might be tied to sms/email—but it's the the heart of letters function. SMS and email function should be untouched by this. Areas affected: - Things obviously about letters - PDF tasks, used for precompiling letters - Virus scanning, used for those PDFs - FTP, used to send letters to the printer - Postage stuff
This commit is contained in:
@@ -1,29 +1,23 @@
|
||||
import pytest
|
||||
from flask import json
|
||||
|
||||
from app.models import EMAIL_TYPE, LETTER_TYPE, SMS_TYPE, TEMPLATE_TYPES
|
||||
from app.models import EMAIL_TYPE, SMS_TYPE, TEMPLATE_TYPES
|
||||
from app.utils import DATETIME_FORMAT
|
||||
from tests import create_service_authorization_header
|
||||
from tests.app.db import create_letter_contact, create_template
|
||||
from tests.app.db import create_template
|
||||
|
||||
valid_version_params = [None, 1]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("tmp_type, expected_name, expected_subject,postage", [
|
||||
(SMS_TYPE, 'sms Template Name', None, None),
|
||||
(EMAIL_TYPE, 'email Template Name', 'Template subject', None),
|
||||
(LETTER_TYPE, 'letter Template Name', 'Template subject', "second")
|
||||
@pytest.mark.parametrize("tmp_type, expected_name, expected_subject", [
|
||||
(SMS_TYPE, 'sms Template Name', None),
|
||||
(EMAIL_TYPE, 'email Template Name', 'Template subject'),
|
||||
])
|
||||
@pytest.mark.parametrize("version", valid_version_params)
|
||||
def test_get_template_by_id_returns_200(
|
||||
client, sample_service, tmp_type, expected_name, expected_subject, version, postage
|
||||
client, sample_service, tmp_type, expected_name, expected_subject, version
|
||||
):
|
||||
letter_contact_block_id = None
|
||||
if tmp_type == 'letter':
|
||||
letter_contact_block = create_letter_contact(sample_service, "Buckingham Palace, London, SW1A 1AA")
|
||||
letter_contact_block_id = letter_contact_block.id
|
||||
|
||||
template = create_template(sample_service, template_type=tmp_type, contact_block_id=(letter_contact_block_id))
|
||||
template = create_template(sample_service, template_type=tmp_type)
|
||||
auth_header = create_service_authorization_header(service_id=sample_service.id)
|
||||
|
||||
version_path = '/version/{}'.format(version) if version else ''
|
||||
@@ -47,8 +41,6 @@ def test_get_template_by_id_returns_200(
|
||||
"subject": expected_subject,
|
||||
'name': expected_name,
|
||||
'personalisation': {},
|
||||
'postage': postage,
|
||||
'letter_contact_block': letter_contact_block.contact_block if letter_contact_block_id else None,
|
||||
}
|
||||
|
||||
assert json_response == expected_response
|
||||
@@ -105,44 +97,6 @@ def test_get_template_by_id_returns_placeholders(
|
||||
assert json_response['personalisation'] == expected_personalisation
|
||||
|
||||
|
||||
@pytest.mark.parametrize("version", valid_version_params)
|
||||
def test_get_letter_template_by_id_returns_placeholders(
|
||||
client,
|
||||
sample_service,
|
||||
version,
|
||||
):
|
||||
contact_block = create_letter_contact(
|
||||
service=sample_service,
|
||||
contact_block='((contact block))',
|
||||
)
|
||||
template = create_template(
|
||||
sample_service,
|
||||
template_type=LETTER_TYPE,
|
||||
subject="((letterSubject))",
|
||||
content="((letter_content))",
|
||||
reply_to=contact_block.id,
|
||||
)
|
||||
auth_header = create_service_authorization_header(service_id=sample_service.id)
|
||||
|
||||
version_path = '/version/{}'.format(version) if version else ''
|
||||
|
||||
response = client.get(path='/v2/template/{}{}'.format(template.id, version_path),
|
||||
headers=[('Content-Type', 'application/json'), auth_header])
|
||||
|
||||
json_response = json.loads(response.get_data(as_text=True))
|
||||
assert json_response['personalisation'] == {
|
||||
"letterSubject": {
|
||||
"required": True,
|
||||
},
|
||||
"letter_content": {
|
||||
"required": True,
|
||||
},
|
||||
"contact block": {
|
||||
"required": True,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def test_get_template_with_non_existent_template_id_returns_404(client, fake_uuid, sample_service):
|
||||
auth_header = create_service_authorization_header(service_id=sample_service.id)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import pytest
|
||||
from flask import json
|
||||
|
||||
from app.models import EMAIL_TYPE, LETTER_TYPE, TEMPLATE_TYPES
|
||||
from app.models import EMAIL_TYPE, TEMPLATE_TYPES
|
||||
from tests import create_service_authorization_header
|
||||
from tests.app.db import create_template
|
||||
|
||||
@@ -96,10 +96,8 @@ def test_valid_post_template_returns_200(
|
||||
|
||||
assert resp_json['id'] == str(template.id)
|
||||
|
||||
if tmp_type in {EMAIL_TYPE, LETTER_TYPE}:
|
||||
assert expected_subject in resp_json['subject']
|
||||
|
||||
if tmp_type == EMAIL_TYPE:
|
||||
assert expected_subject in resp_json['subject']
|
||||
assert resp_json['html'] == expected_html
|
||||
else:
|
||||
assert resp_json['html'] is None
|
||||
@@ -107,15 +105,13 @@ def test_valid_post_template_returns_200(
|
||||
assert expected_content in resp_json['body']
|
||||
|
||||
|
||||
@pytest.mark.parametrize("template_type", (EMAIL_TYPE, LETTER_TYPE))
|
||||
def test_email_and_letter_templates_not_rendered_into_content(
|
||||
def test_email_templates_not_rendered_into_content(
|
||||
client,
|
||||
sample_service,
|
||||
template_type,
|
||||
sample_service
|
||||
):
|
||||
template = create_template(
|
||||
sample_service,
|
||||
template_type=template_type,
|
||||
template_type=EMAIL_TYPE,
|
||||
subject='Test',
|
||||
content=(
|
||||
'Hello\n'
|
||||
|
||||
@@ -34,7 +34,6 @@ valid_json_get_response_with_optionals = {
|
||||
'body': 'some body',
|
||||
'subject': "some subject",
|
||||
'name': 'some name',
|
||||
'postage': 'first',
|
||||
}
|
||||
|
||||
valid_request_args = [{"id": str(uuid.uuid4()), "version": 1}, {"id": str(uuid.uuid4())}]
|
||||
@@ -80,7 +79,6 @@ valid_json_post_response_with_optionals = {
|
||||
'version': 1,
|
||||
'body': "some body",
|
||||
'subject': 'some subject',
|
||||
'postage': 'second',
|
||||
'html': '<p>some body</p>',
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user