darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 07:51:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

ensure template history serializes using template serialize fn

Browse Source
This commit is contained in:
Leo Hemsted
2017-08-09 12:24:35 +01:00
parent c9762f75a1
commit da02ffa32f
4 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models.py
View File

@@ -506,18 +506,7 @@ class TemplateHistory(db.Model):
default=NORMAL) default=NORMAL)
def serialize(self): def serialize(self):
serialized = { return Template.serialize(self)
"id": self.id,
"type": self.template_type,
"created_at": self.created_at.strftime(DATETIME_FORMAT),
"updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None,
"created_by": self.created_by.email_address,
"version": self.version,
"body": self.content,
"subject": self.subject if self.template_type == EMAIL_TYPE else None
}
return serialized
MMG_PROVIDER = "mmg" MMG_PROVIDER = "mmg"

1
app/v2/template/get_template.py
View File

@@ -18,5 +18,4 @@ def get_template_by_id(template_id, version=None):
template = templates_dao.dao_get_template_by_id_and_service_id( template = templates_dao.dao_get_template_by_id_and_service_id(
template_id, authenticated_service.id, data.get('version')) template_id, authenticated_service.id, data.get('version'))
return jsonify(template.serialize()), 200 return jsonify(template.serialize()), 200

2
tests/app/test_model.py
View File

@@ -217,4 +217,4 @@ def test_email_notification_serializes_with_subject(client, sample_email_templat
def test_letter_notification_serializes_with_subject(client, sample_letter_template): def test_letter_notification_serializes_with_subject(client, sample_letter_template):
res = sample_letter_template.serialize() res = sample_letter_template.serialize()
assert res['subject'] == 'Template Subject' assert res['subject'] == 'Template subject'

12
tests/app/v2/template/test_get_template.py
View File

@@ -3,16 +3,20 @@ import pytest
from flask import json from flask import json
from app import DATETIME_FORMAT from app import DATETIME_FORMAT
from app.models import EMAIL_TYPE, TEMPLATE_TYPES from app.models import TEMPLATE_TYPES, EMAIL_TYPE, SMS_TYPE, LETTER_TYPE
from tests import create_authorization_header from tests import create_authorization_header
from tests.app.db import create_template from tests.app.db import create_template
valid_version_params = [None, 1] valid_version_params = [None, 1]
@pytest.mark.parametrize("tmp_type", TEMPLATE_TYPES) @pytest.mark.parametrize("tmp_type, expected_subject", [
(SMS_TYPE, None),
(EMAIL_TYPE, 'Template subject'),
(LETTER_TYPE, 'Template subject')
])
@pytest.mark.parametrize("version", valid_version_params) @pytest.mark.parametrize("version", valid_version_params)
def test_get_template_by_id_returns_200(client, sample_service, tmp_type, version): def test_get_template_by_id_returns_200(client, sample_service, tmp_type, expected_subject, version):
template = create_template(sample_service, template_type=tmp_type) template = create_template(sample_service, template_type=tmp_type)
auth_header = create_authorization_header(service_id=sample_service.id) auth_header = create_authorization_header(service_id=sample_service.id)
@@ -34,7 +38,7 @@ def test_get_template_by_id_returns_200(client, sample_service, tmp_type, versio
'version': template.version, 'version': template.version,
'created_by': template.created_by.email_address, 'created_by': template.created_by.email_address,
'body': template.content, 'body': template.content,
"subject": template.subject if tmp_type == EMAIL_TYPE else None "subject": expected_subject
} }
assert json_response == expected_response assert json_response == expected_response