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

Fix the schema for reply_to and added reply_to_text.

Browse Source
This commit is contained in:
Rebecca Law
2018-01-04 15:56:58 +00:00
parent d9668974ae
commit 0c5625fb8b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/schemas.py
View File

@@ -311,15 +311,15 @@ class NotificationModelSchema(BaseSchema):
class BaseTemplateSchema(BaseSchema): class BaseTemplateSchema(BaseSchema):
reply_to = fields.Method("get_reply_to", allow_none=True) reply_to = fields.Method("get_reply_to", allow_none=True)
reply_to_text = fields.Method("get_reply_to_text", allow_none=True)
def get_reply_to(self, template): def get_reply_to(self, template):
if template.template_type == 'letter':
text = template.get_reply_to_text()
return text
return template.reply_to return template.reply_to
def get_reply_to_text(self, template):
return template.get_reply_to_text()
class Meta: class Meta:
model = models.Template model = models.Template
exclude = ("service_id", "jobs", "service_letter_contact_id") exclude = ("service_id", "jobs", "service_letter_contact_id")

6
tests/app/template/test_rest.py
View File

@@ -581,7 +581,8 @@ def test_create_a_template_with_reply_to(admin_request, sample_user):
json_resp = admin_request.post('template.create_template', service_id=service.id, _data=data, _expected_status=201) json_resp = admin_request.post('template.create_template', service_id=service.id, _data=data, _expected_status=201)
assert json_resp['data']['template_type'] == 'letter' assert json_resp['data']['template_type'] == 'letter'
assert json_resp['data']['reply_to'] == str(letter_contact.contact_block) assert json_resp['data']['reply_to'] == str(letter_contact.id)
assert json_resp['data']['reply_to_text'] == letter_contact.contact_block
template = Template.query.get(json_resp['data']['id']) template = Template.query.get(json_resp['data']['id'])
from app.schemas import template_schema from app.schemas import template_schema
@@ -622,7 +623,8 @@ def test_get_template_reply_to(client, sample_letter_template):
json_resp = json.loads(resp.get_data(as_text=True)) json_resp = json.loads(resp.get_data(as_text=True))
assert 'service_letter_contact_id' not in json_resp['data'] assert 'service_letter_contact_id' not in json_resp['data']
assert json_resp['data']['reply_to'] == letter_contact.contact_block assert json_resp['data']['reply_to'] == str(letter_contact.id)
assert json_resp['data']['reply_to_text'] == letter_contact.contact_block
assert not json_resp['data']['is_letter_contact_blank'] assert not json_resp['data']['is_letter_contact_blank']