darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-11 09:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

update tests based on updated orgs

Browse Source
This commit is contained in:
stvnrlly
2022-09-15 18:47:04 +00:00
parent 7b51d1e7a6
commit 3e7b5b4370
15 changed files with 128 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/utils/branding.py
View File

@@ -7,49 +7,33 @@ def get_email_choices(service):
organisation_branding_id = service.organisation.email_branding_id if service.organisation else None
if (
service.organisation_type == Organisation.TYPE_CENTRAL
service.organisation_type == Organisation.TYPE_FEDERAL
and service.email_branding_id is not None # GOV.UK is not current branding
and organisation_branding_id is None # no default to supersede it (GOV.UK)
):
yield ('govuk', 'GOV.UK')
if (
service.organisation_type == Organisation.TYPE_CENTRAL
service.organisation_type == Organisation.TYPE_FEDERAL
and service.organisation
and organisation_branding_id is None # don't offer both if org has default
and service.email_branding_name.lower() != f'GOV.UK and {service.organisation.name}'.lower()
):
yield ('govuk_and_org', f'GOV.UK and {service.organisation.name}')
if (
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 Organisation.NHS_TYPES
and (
service.email_branding_id is None # GOV.UK is current branding
or service.email_branding_id != organisation_branding_id
)
):
yield ('organisation', service.organisation.name)
def get_letter_choices(service):
organisation_branding_id = service.organisation.letter_branding_id if service.organisation else None
if (
service.organisation_type in Organisation.NHS_TYPES
and service.letter_branding_name != 'NHS'
):
yield ('nhs', 'NHS')
# if (
# 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 Organisation.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