darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 00:41:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update the dao_get_organisation_by_email_address to ignore .gsi in the email address.

Browse Source
This commit is contained in:
Rebecca Law
2019-04-05 15:47:16 +01:00
parent 4a085a1e31
commit 36b4a344fc
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/organisation_dao.py
View File

@@ -28,7 +28,7 @@ def dao_get_organisation_by_id(organisation_id):
def dao_get_organisation_by_email_address(email_address): def dao_get_organisation_by_email_address(email_address):
email_address = email_address.lower() email_address = email_address.lower().replace('.gsi.gov.uk', '.gov.uk')
for domain in Domain.query.order_by(func.char_length(Domain.domain).desc()).all(): for domain in Domain.query.order_by(func.char_length(Domain.domain).desc()).all():

11
tests/app/dao/test_organisation_dao.py
View File

@@ -235,10 +235,9 @@ def test_add_user_to_organisation_when_organisation_does_not_exist(sample_user):
('example.gov.uk', True), ('example.gov.uk', True),
)) ))
def test_get_organisation_by_email_address( def test_get_organisation_by_email_address(
admin_request,
sample_user,
domain, domain,
expected_org, expected_org,
notify_db_session
): ):
org = create_organisation() org = create_organisation()
@@ -255,3 +254,11 @@ def test_get_organisation_by_email_address(
assert found_org is org assert found_org is org
else: else:
assert found_org is None assert found_org is None
def test_get_organisation_by_email_address_ignores_gsi_gov_uk(notify_db_session):
org = create_organisation()
create_domain('example.gov.uk', org.id)
found_org = dao_get_organisation_by_email_address('test_gsi_address@example.gsi.gov.uk')
assert org == found_org