mirror of
https://github.com/GSA/notifications-api.git
synced 2026-05-30 10:58:28 -04:00
145d671e86
This commit changes the code in post notification endpoint to handle a serialised template (ie a `dict`) rather than a database object. This is the first step towards being able to cache the template and not hit the database on every request. There should be no functional changes here, it’s just refactoring. There are some changes to the tests where the signature of functions has changed. Importing of the template schema has to be done at a function level, otherwise Marshmallow gets weird. This commit also copies the `JSONModel` class from the admin app, which turns serialised data (a dict made from JSON) into an object on which certain predefined properties are allowed. This means we can still do the caching of serialised data, without having to change too much of the code in the app, or make it ugly by sprinkling dict lookups everywhere. We’re not copying all of JSONModel from the admin app, just the bits we need. We don’t need to compare or hash these objects, they’re just used for lookups. And redefining `__getattribute__` scares Leo.
91 lines
2.8 KiB
Python
91 lines
2.8 KiB
Python
from app.models import LETTER_TYPE
|
|
from app.models import Notification
|
|
from app.models import NOTIFICATION_CREATED
|
|
from app.notifications.process_letter_notifications import create_letter_notification
|
|
from app.notifications.validators import get_template_dict
|
|
from app.json_models import TemplateJSONModel
|
|
|
|
|
|
def test_create_letter_notification_creates_notification(sample_letter_template, sample_api_key):
|
|
data = {
|
|
'personalisation': {
|
|
'address_line_1': 'The Queen',
|
|
'address_line_2': 'Buckingham Palace',
|
|
'postcode': 'SW1 1AA',
|
|
}
|
|
}
|
|
|
|
template = TemplateJSONModel(get_template_dict(
|
|
sample_letter_template.id, sample_letter_template.service_id
|
|
))
|
|
|
|
notification = create_letter_notification(
|
|
data,
|
|
template,
|
|
sample_letter_template.service,
|
|
sample_api_key,
|
|
NOTIFICATION_CREATED,
|
|
)
|
|
|
|
assert notification == Notification.query.one()
|
|
assert notification.job is None
|
|
assert notification.status == NOTIFICATION_CREATED
|
|
assert notification.template_id == sample_letter_template.id
|
|
assert notification.template_version == sample_letter_template.version
|
|
assert notification.api_key == sample_api_key
|
|
assert notification.notification_type == LETTER_TYPE
|
|
assert notification.key_type == sample_api_key.key_type
|
|
assert notification.reference is not None
|
|
assert notification.client_reference is None
|
|
assert notification.postage == 'second'
|
|
|
|
|
|
def test_create_letter_notification_sets_reference(sample_letter_template, sample_api_key):
|
|
data = {
|
|
'personalisation': {
|
|
'address_line_1': 'The Queen',
|
|
'address_line_2': 'Buckingham Palace',
|
|
'postcode': 'SW1 1AA',
|
|
},
|
|
'reference': 'foo'
|
|
}
|
|
|
|
template = TemplateJSONModel(get_template_dict(
|
|
sample_letter_template.id, sample_letter_template.service_id
|
|
))
|
|
|
|
notification = create_letter_notification(
|
|
data,
|
|
template,
|
|
sample_letter_template.service,
|
|
sample_api_key,
|
|
NOTIFICATION_CREATED,
|
|
)
|
|
|
|
assert notification.client_reference == 'foo'
|
|
|
|
|
|
def test_create_letter_notification_sets_billable_units(sample_letter_template, sample_api_key):
|
|
data = {
|
|
'personalisation': {
|
|
'address_line_1': 'The Queen',
|
|
'address_line_2': 'Buckingham Palace',
|
|
'postcode': 'SW1 1AA',
|
|
},
|
|
}
|
|
|
|
template = TemplateJSONModel(get_template_dict(
|
|
sample_letter_template.id, sample_letter_template.service_id
|
|
))
|
|
|
|
notification = create_letter_notification(
|
|
data,
|
|
template,
|
|
sample_letter_template.service,
|
|
sample_api_key,
|
|
NOTIFICATION_CREATED,
|
|
billable_units=3,
|
|
)
|
|
|
|
assert notification.billable_units == 3
|