Merge pull request #1163 from alphagov/letter-template-subject

make sure template serialises letter subjects

app/models.py

@@ -464,7 +464,7 @@ class Template(db.Model):
             "created_by": self.created_by.email_address,
             "version": self.version,
             "body": self.content,
-            "subject": self.subject if self.template_type == EMAIL_TYPE else None
+            "subject": self.subject if self.template_type != SMS_TYPE else None
         }
 
         return serialized
@@ -506,18 +506,7 @@ class TemplateHistory(db.Model):
                              default=NORMAL)
 
     def serialize(self):
-        serialized = {
-            "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
+        return Template.serialize(self)
 
 
 MMG_PROVIDER = "mmg"

app/v2/template/get_template.py

@@ -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_id, authenticated_service.id, data.get('version'))
-
     return jsonify(template.serialize()), 200