mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-16 02:02:13 -05:00
Merge pull request #2892 from alphagov/refactor-crown-dependency-check
Refactor crown dependency check
This commit is contained in:
@@ -136,7 +136,7 @@ def check_if_service_can_send_to_number(service, number):
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
# if number is international and not a crown dependency
|
# if number is international and not a crown dependency
|
||||||
international_phone_info.international and international_phone_info.country_prefix != '44'
|
international_phone_info.international and not international_phone_info.crown_dependency
|
||||||
) and INTERNATIONAL_SMS_TYPE not in [p.permission for p in service.permissions]:
|
) and INTERNATIONAL_SMS_TYPE not in [p.permission for p in service.permissions]:
|
||||||
raise BadRequestError(message="Cannot send to international mobile numbers")
|
raise BadRequestError(message="Cannot send to international mobile numbers")
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ notifications-python-client==5.5.1
|
|||||||
# PaaS
|
# PaaS
|
||||||
awscli-cwlogs>=1.4,<1.5
|
awscli-cwlogs>=1.4,<1.5
|
||||||
|
|
||||||
git+https://github.com/alphagov/notifications-utils.git@39.7.0#egg=notifications-utils==39.7.0
|
git+https://github.com/alphagov/notifications-utils.git@39.7.1#egg=notifications-utils==39.7.1
|
||||||
|
|
||||||
# gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains
|
# gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains
|
||||||
prometheus-client==0.7.1
|
prometheus-client==0.7.1
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ notifications-python-client==5.5.1
|
|||||||
# PaaS
|
# PaaS
|
||||||
awscli-cwlogs>=1.4,<1.5
|
awscli-cwlogs>=1.4,<1.5
|
||||||
|
|
||||||
git+https://github.com/alphagov/notifications-utils.git@39.7.0#egg=notifications-utils==39.7.0
|
git+https://github.com/alphagov/notifications-utils.git@39.7.1#egg=notifications-utils==39.7.1
|
||||||
|
|
||||||
# gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains
|
# gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains
|
||||||
prometheus-client==0.7.1
|
prometheus-client==0.7.1
|
||||||
@@ -39,16 +39,16 @@ alembic==1.4.2
|
|||||||
amqp==1.4.9
|
amqp==1.4.9
|
||||||
anyjson==0.3.3
|
anyjson==0.3.3
|
||||||
attrs==19.3.0
|
attrs==19.3.0
|
||||||
awscli==1.18.83
|
awscli==1.18.84
|
||||||
bcrypt==3.1.7
|
bcrypt==3.1.7
|
||||||
billiard==3.3.0.23
|
billiard==3.3.0.23
|
||||||
bleach==3.1.4
|
bleach==3.1.4
|
||||||
blinker==1.4
|
blinker==1.4
|
||||||
boto==2.49.0
|
boto==2.49.0
|
||||||
boto3==1.10.38
|
boto3==1.10.38
|
||||||
botocore==1.17.6
|
botocore==1.17.7
|
||||||
cachetools==4.1.0
|
cachetools==4.1.0
|
||||||
certifi==2020.4.5.2
|
certifi==2020.6.20
|
||||||
chardet==3.0.4
|
chardet==3.0.4
|
||||||
click==7.1.2
|
click==7.1.2
|
||||||
colorama==0.4.3
|
colorama==0.4.3
|
||||||
|
|||||||
Reference in New Issue
Block a user