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

Choose most specific domains first

Browse Source 
If we had organisations for GDS and Cabinet Office, then we’d always
want someone whose email address ends in `@cabinet-office.gov.uk` to
match to `cabinet-office.gov.uk` before matching to
`digital.cabinet-office.gov.uk`.

Sorting the list by shortest first addresses this.
This commit is contained in:
Chris Hill-Scott
2019-03-07 11:23:42 +00:00
parent c0fb9267bd
commit 6e8ce78603
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/dao/organisation_dao.py
View File

@@ -1,3 +1,5 @@
from sqlalchemy.sql.expression import func
from app import db from app import db
from app.dao.dao_utils import transactional from app.dao.dao_utils import transactional
from app.models import ( from app.models import (
@@ -28,7 +30,8 @@ def dao_get_organisation_by_email_address(email_address):
email_address = email_address.lower() email_address = email_address.lower()
for domain in Domain().query.all(): for domain in Domain.query.order_by(func.char_length(Domain.domain).desc()).all():
if ( if (
email_address.endswith("@{}".format(domain.domain)) or email_address.endswith("@{}".format(domain.domain)) or
email_address.endswith(".{}".format(domain.domain)) email_address.endswith(".{}".format(domain.domain))

4
tests/app/service/test_rest.py
View File

@@ -271,6 +271,10 @@ def test_create_service_with_domain_sets_organisation(
expected_org, expected_org,
): ):
red_herring_org = create_organisation(name='Sub example')
create_domain('specific.example.gov.uk', red_herring_org.id)
create_domain('aaaaaaaa.example.gov.uk', red_herring_org.id)
org = create_organisation() org = create_organisation()
create_domain('example.gov.uk', org.id) create_domain('example.gov.uk', org.id)
create_domain('test.gov.uk', org.id) create_domain('test.gov.uk', org.id)