darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 09:26:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Merge pull request #2887 from alphagov/cache-the-serialised-things""

Browse Source 
This reverts commit 7e85e37e1d.
This commit is contained in:
Chris Hill-Scott
2020-06-26 14:10:12 +01:00
parent 6d52d733a4
commit 3ffdb3093b
15 changed files with 215 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/v2/notifications/post_notifications.py
View File

@@ -332,7 +332,7 @@ def process_letter_notification(
if api_key.key_type == KEY_TYPE_TEAM:
raise BadRequestError(message='Cannot send letters with a team api key', status_code=403)
if not api_key.service.research_mode and api_key.service.restricted and api_key.key_type != KEY_TYPE_TEST:
if not service.research_mode and service.restricted and api_key.key_type != KEY_TYPE_TEST:
raise BadRequestError(message='Cannot send letters when service is in trial mode', status_code=403)
if precompiled:
@@ -342,7 +342,7 @@ def process_letter_notification(
template=template,
reply_to_text=reply_to_text)
validate_address(api_key, letter_data)
validate_address(service, letter_data)
test_key = api_key.key_type == KEY_TYPE_TEST
@@ -391,10 +391,10 @@ def process_letter_notification(
return resp
def validate_address(api_key, letter_data):
def validate_address(service, letter_data):
address = PostalAddress.from_personalisation(
letter_data['personalisation'],
allow_international_letters=api_key.service.has_permission(INTERNATIONAL_LETTERS),
allow_international_letters=(INTERNATIONAL_LETTERS in service.permissions),
)
if not address.has_enough_lines:
raise ValidationError(