darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 23:41:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set postage to second class when creating new letter template

Browse Source 
Also get rid of checks for CHOOSE_POSTAGE permission when creating
and updating a template.
This commit is contained in:
Pea Tyczynska
2019-01-30 16:26:49 +00:00
parent 208af8a508
commit ccd5a758f0
2 changed files with 33 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/template/rest.py
View File

@@ -31,7 +31,7 @@ from app.errors import (
InvalidRequest
)
from app.letters.utils import get_letter_pdf
from app.models import SMS_TYPE, Template, CHOOSE_POSTAGE
from app.models import SMS_TYPE, Template, SECOND_CLASS, LETTER_TYPE
from app.notifications.validators import service_has_permission, check_reply_to
from app.schema_validation import validate
from app.schemas import (template_schema, template_history_schema)
@@ -78,11 +78,8 @@ def create_template(service_id):
errors = {'template_type': [message]}
raise InvalidRequest(errors, 403)
if new_template.postage:
if not service_has_permission(CHOOSE_POSTAGE, fetched_service.permissions):
message = "Setting postage on templates is not enabled for this service."
errors = {'template_postage': [message]}
raise InvalidRequest(errors, 403)
if not new_template.postage and new_template.template_type == LETTER_TYPE:
new_template.postage = SECOND_CLASS
new_template.service = fetched_service
@@ -116,12 +113,6 @@ def update_template(service_id, template_id):
if data.get('redact_personalisation') is True:
return redact_template(fetched_template, data)
if data.get('postage'):
if not service_has_permission(CHOOSE_POSTAGE, fetched_template.service.permissions):
message = "Setting postage on templates is not enabled for this service."
errors = {'template_postage': [message]}
raise InvalidRequest(errors, 403)
if "reply_to" in data:
check_reply_to(service_id, data.get("reply_to"), fetched_template.template_type)
updated = dao_update_template_reply_to(template_id=template_id, reply_to=data.get("reply_to"))