Merge pull request #589 from alphagov/org-rendering

Render organisational branding in emails

app/celery/provider_tasks.py

@@ -1,29 +1,29 @@
 from datetime import datetime
 from monotonic import monotonic
+from urllib.parse import urljoin
+
 from flask import current_app
+from notifications_utils.recipients import (
+    validate_and_format_phone_number
+)
+from notifications_utils.template import Template, get_sms_fragment_count
+from notifications_utils.renderers import HTMLEmail, PlainTextEmail, SMSMessage
+
 from app import notify_celery, statsd_client, clients, create_uuid
 from app.clients.email import EmailClientException
 from app.clients.sms import SmsClientException
-
 from app.dao.notifications_dao import (
     update_provider_stats,
     get_notification_by_id,
     dao_update_notification,
     update_notification_status_by_id
 )
-
 from app.dao.provider_details_dao import get_provider_details_by_notification_type
 from app.dao.services_dao import dao_fetch_service_by_id
 from app.celery.research_mode_tasks import send_sms_response, send_email_response
-from notifications_utils.recipients import (
-    validate_and_format_phone_number
-)
-
 from app.dao.templates_dao import dao_get_template_by_id
-from notifications_utils.template import Template, get_sms_fragment_count
-from notifications_utils.renderers import HTMLEmail, PlainTextEmail, SMSMessage
 
-from app.models import SMS_TYPE, EMAIL_TYPE, KEY_TYPE_TEST
+from app.models import SMS_TYPE, EMAIL_TYPE, KEY_TYPE_TEST, BRANDING_ORG
 from app.statsd_decorators import statsd
 
 
@@ -133,7 +133,7 @@ def send_email_to_provider(self, service_id, notification_id):
             html_email = Template(
                 template_dict,
                 values=notification.personalisation,
-                renderer=HTMLEmail()
+                renderer=get_html_email_renderer(service)
             )
 
             plain_text_email = Template(
@@ -185,3 +185,22 @@ def send_email_to_provider(self, service_id, notification_id):
         )
         delta_milliseconds = (datetime.utcnow() - notification.created_at).total_seconds() * 1000
         statsd_client.timing("email.total-time", delta_milliseconds)
+
+
+def get_html_email_renderer(service):
+    govuk_banner = service.branding != BRANDING_ORG
+    if service.organisation:
+        logo = '{}{}{}'.format(
+            current_app.config['ADMIN_BASE_URL'],
+            current_app.config['BRANDING_PATH'],
+            service.organisation.logo
+        )
+        branding = {
+            'brand_colour': service.organisation.colour,
+            'brand_logo': logo,
+            'brand_name': service.organisation.name,
+        }
+    else:
+        branding = {}
+
+    return HTMLEmail(govuk_banner=govuk_banner, **branding)

app/models.py

@@ -116,7 +116,7 @@ class Service(db.Model, Versioned):
         secondary=user_to_service,
         backref=db.backref('user_to_service', lazy='dynamic'))
     restricted = db.Column(db.Boolean, index=False, unique=False, nullable=False)
-    research_mode = db.Column(db.Boolean, index=False, unique=False, nullable=True, default=False)
+    research_mode = db.Column(db.Boolean, index=False, unique=False, nullable=False, default=False)
     email_from = db.Column(db.Text, index=False, unique=True, nullable=False)
     created_by = db.relationship('User')
     created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)

app/schemas.py

@@ -103,6 +103,8 @@ class ProviderDetailsSchema(BaseSchema):
 class ServiceSchema(BaseSchema):
 
     created_by = field_for(models.Service, 'created_by', required=True)
+    organisation = field_for(models.Service, 'organisation')
+    branding = field_for(models.Service, 'branding')
 
     class Meta:
         model = models.Service
@@ -114,8 +116,7 @@ class ServiceSchema(BaseSchema):
                    'old_id',
                    'template_statistics',
                    'service_provider_stats',
-                   'service_notification_stats',
-                   'organisation')
+                   'service_notification_stats')
         strict = True
 
     @validates('sms_sender')