WIP

app/dao/email_branding_dao.py

@@ -11,10 +11,6 @@ def dao_get_email_branding_by_id(email_branding_id):
     return EmailBranding.query.filter_by(id=email_branding_id).one()
 
 
-def dao_get_email_branding_by_name(email_branding_name):
-    return EmailBranding.query.filter_by(name=email_branding_name).first()
-
-
 @autocommit
 def dao_create_email_branding(email_branding):
     db.session.add(email_branding)

app/dao/services_dao.py

@@ -9,7 +9,7 @@ from sqlalchemy.sql.expression import and_, asc, case, func
 from app import db
 from app.dao.dao_utils import VersionOptions, autocommit, version_class
 from app.dao.date_util import get_current_financial_year
-from app.dao.email_branding_dao import dao_get_email_branding_by_name
+from app.dao.email_branding_dao import dao_get_email_branding_by_id
 from app.dao.letter_branding_dao import dao_get_letter_branding_by_name
 from app.dao.organisation_dao import dao_get_organisation_by_email_address
 from app.dao.service_sms_sender_dao import insert_service_sms_sender
@@ -326,7 +326,7 @@ def dao_create_service(
             service.letter_branding = organisation.letter_branding
 
     elif service.organisation_type in NHS_ORGANISATION_TYPES or email_address_is_nhs(user.email_address):
-        service.email_branding = dao_get_email_branding_by_name('NHS')
+        service.email_branding = dao_get_email_branding_by_id(current_app.config['NHS_EMAIL_BRANDING_ID'])
         service.letter_branding = dao_get_letter_branding_by_name('NHS')
 
     if organisation:

tests/app/dao/test_email_branding_dao.py

@@ -1,6 +1,5 @@
 from app.dao.email_branding_dao import (
     dao_get_email_branding_by_id,
-    dao_get_email_branding_by_name,
     dao_get_email_branding_options,
     dao_update_email_branding,
 )
@@ -27,14 +26,6 @@ def test_get_email_branding_by_id_gets_correct_email_branding(notify_db, notify_
     assert email_branding_from_db == email_branding
 
 
-def test_get_email_branding_by_name_gets_correct_email_branding(notify_db, notify_db_session):
-    email_branding = create_email_branding(name="Crystal Gems")
-
-    email_branding_from_db = dao_get_email_branding_by_name("Crystal Gems")
-
-    assert email_branding_from_db == email_branding
-
-
 def test_update_email_branding(notify_db, notify_db_session):
     updated_name = 'new name'
     create_email_branding()