darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-29 17:08:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decouple the set of org types from their labels

Browse Source 
In response to: [^1].

[^1]: https://github.com/alphagov/notifications-admin/pull/4196#discussion_r838383086
This commit is contained in:
Ben Thorner
2022-03-30 13:48:36 +01:00
parent fa01889d01
commit 6030e9e5bb
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/utils/branding.py
View File

@@ -1,6 +1,5 @@
from app.models.organisation import Organisation
NHS_TYPES = dict(Organisation.NHS_TYPES).keys()
NHS_EMAIL_BRANDING_ID = 'a7dc4e56-660b-4db7-8cff-12c37b12b5ea'
@@ -23,14 +22,14 @@ def get_email_choices(service):
yield ('govuk_and_org', f'GOV.UK and {service.organisation.name}')
if (
service.organisation_type in NHS_TYPES
service.organisation_type in Organisation.NHS_TYPES
and service.email_branding_id != NHS_EMAIL_BRANDING_ID
):
yield ('nhs', 'NHS')
if (
service.organisation
and service.organisation_type not in NHS_TYPES
and service.organisation_type not in Organisation.NHS_TYPES
and (
service.email_branding_id is None # GOV.UK is current branding
or service.email_branding_id != organisation_branding_id
@@ -43,14 +42,14 @@ def get_letter_choices(service):
organisation_branding_id = service.organisation.letter_branding_id if service.organisation else None
if (
service.organisation_type in NHS_TYPES
service.organisation_type in Organisation.NHS_TYPES
and service.letter_branding_name != 'NHS'
):
yield ('nhs', 'NHS')
if (
service.organisation
and service.organisation_type not in NHS_TYPES
and service.organisation_type not in Organisation.NHS_TYPES
and (
service.letter_branding_id is None # GOV.UK is current branding
or service.letter_branding_id != organisation_branding_id