diff --git a/app/schemas.py b/app/schemas.py index 17dea94bd..b5172c9d9 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -347,6 +347,7 @@ class TemplateSchema(BaseTemplateSchema): class TemplateHistorySchema(BaseSchema): reply_to = fields.Method("get_reply_to", allow_none=True) + reply_to_text = fields.Method("get_reply_to_text", allow_none=True) created_by = fields.Nested(UserSchema, only=['id', 'name', 'email_address'], dump_only=True) created_at = field_for(models.Template, 'created_at', format='%Y-%m-%d %H:%M:%S.%f') @@ -354,6 +355,9 @@ class TemplateHistorySchema(BaseSchema): def get_reply_to(self, template): return template.reply_to + def get_reply_to_text(self, template): + return template.get_reply_to_text() + class Meta: model = models.TemplateHistory diff --git a/migrations/versions/0164_add_organisation_service.py b/migrations/versions/0164_add_organisation_to_service.py similarity index 95% rename from migrations/versions/0164_add_organisation_service.py rename to migrations/versions/0164_add_organisation_to_service.py index 6e96ce7b4..14a7e5596 100644 --- a/migrations/versions/0164_add_organisation_service.py +++ b/migrations/versions/0164_add_organisation_to_service.py @@ -1,6 +1,6 @@ """ -Revision ID: 0164_add_organisation_service +Revision ID: 0164_add_organisation_to_service Revises: 0163_add_new_org_model Create Date: 2018-02-09 17:58:34.617206 diff --git a/tests/app/template/test_rest_history.py b/tests/app/template/test_rest_history.py index c26c4abc8..f4c638a4e 100644 --- a/tests/app/template/test_rest_history.py +++ b/tests/app/template/test_rest_history.py @@ -112,3 +112,4 @@ def test_update_template_reply_to_updates_history(client, sample_letter_template hist_json_resp = json.loads(resp.get_data(as_text=True)) assert 'service_letter_contact_id' not in hist_json_resp['data'] assert hist_json_resp['data']['reply_to'] == str(letter_contact.id) + assert hist_json_resp['data']['reply_to_text'] == letter_contact.contact_block