darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 23:55:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into letters-billing-table

Browse Source
This commit is contained in:
Rebecca Law
2017-05-31 15:49:23 +01:00
parent 0b642623fb 5d75f2f871
commit 505aae6f92
9 changed files with 83 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/dao/notifications_dao.py
View File

@@ -9,7 +9,8 @@ from flask import current_app
from notifications_utils.recipients import (
validate_and_format_phone_number,
validate_and_format_email_address,
InvalidPhoneError
InvalidPhoneError,
InvalidEmailError,
)
from werkzeug.datastructures import MultiDict
from sqlalchemy import (desc, func, or_, and_, asc)
@@ -477,7 +478,10 @@ def dao_get_notifications_by_to_field(service_id, search_term, statuses=None):
try:
normalised = validate_and_format_phone_number(search_term)
except InvalidPhoneError:
normalised = validate_and_format_email_address(search_term)
try:
normalised = validate_and_format_email_address(search_term)
except InvalidEmailError:
normalised = search_term
filters = [
Notification.service_id == service_id,