From 23ce36dc484f37079afcc780120e5ae2b2dc28c3 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Wed, 7 Mar 2018 23:02:38 +0000
Subject: [PATCH] Update response to return is_precompiled_letter

---
 app/schemas.py                  | 6 +-----
 app/service/rest.py             | 8 ++------
 app/template_statistics/rest.py | 2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/schemas.py b/app/schemas.py
index c76c2c922..2131bb9b7 100644
--- a/app/schemas.py
+++ b/app/schemas.py
@@ -305,7 +305,6 @@ class NotificationModelSchema(BaseSchema):
 class BaseTemplateSchema(BaseSchema):
     reply_to = fields.Method("get_reply_to", allow_none=True)
     reply_to_text = fields.Method("get_reply_to_text", allow_none=True)
-    precompiled_letter = fields.Method("get_precompiled_letter")
 
     def get_reply_to(self, template):
         return template.reply_to
@@ -313,9 +312,6 @@ class BaseTemplateSchema(BaseSchema):
     def get_reply_to_text(self, template):
         return template.get_reply_to_text()
 
-    def get_precompiled_letter(self, template):
-        return template.is_precompiled_letter
-
     class Meta:
         model = models.Template
         exclude = ("service_id", "jobs", "service_letter_contact_id")
@@ -466,7 +462,7 @@ class NotificationWithTemplateSchema(BaseSchema):
             'content',
             'subject',
             'redact_personalisation',
-            'precompiled_letter'
+            'is_precompiled_letter'
         ],
         dump_only=True
     )
diff --git a/app/service/rest.py b/app/service/rest.py
index 2ccf51635..f6c7b8650 100644
--- a/app/service/rest.py
+++ b/app/service/rest.py
@@ -68,7 +68,7 @@ from app.errors import (
     InvalidRequest,
     register_errors
 )
-from app.models import Service, EmailBranding, LETTER_TYPE, PRECOMPILED_TEMPLATE_NAME
+from app.models import Service, EmailBranding
 from app.schema_validation import validate
 from app.service import statistics
 from app.service.service_senders_schema import (
@@ -537,11 +537,7 @@ def get_monthly_template_usage(service_id):
                     'month': i.month,
                     'year': i.year,
                     'count': i.count,
-                    'precompiled_letter': (
-                        i.template_type == LETTER_TYPE and
-                        i.hidden and
-                        i.name == PRECOMPILED_TEMPLATE_NAME
-                    )
+                    'is_precompiled_letter': i.is_precompiled_letter
                 }
             )
 
diff --git a/app/template_statistics/rest.py b/app/template_statistics/rest.py
index 2af5efdae..b7198409e 100644
--- a/app/template_statistics/rest.py
+++ b/app/template_statistics/rest.py
@@ -48,7 +48,7 @@ def get_template_statistics_for_service_by_day(service_id):
             'template_id': str(data.template_id),
             'template_name': data.name,
             'template_type': data.template_type,
-            'precompiled_letter': data.is_precompiled_letter
+            'is_precompiled_letter': data.is_precompiled_letter
         }
 
     return jsonify(data=[serialize(row) for row in stats])