mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-04 10:21:14 -05:00
Merge pull request #855 from GSA/add-simulated-to-local
Add simulated sms numbers to allow list in trial mode.
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
import itertools
|
import itertools
|
||||||
|
|
||||||
|
from flask import current_app
|
||||||
from notifications_utils.recipients import allowed_to_send_to
|
from notifications_utils.recipients import allowed_to_send_to
|
||||||
|
|
||||||
from app.dao.services_dao import dao_fetch_service_by_id
|
from app.dao.services_dao import dao_fetch_service_by_id
|
||||||
@@ -45,6 +46,9 @@ def service_allowed_to_send_to(
|
|||||||
member.recipient for member in service.guest_list if allow_guest_list_recipients
|
member.recipient for member in service.guest_list if allow_guest_list_recipients
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# As per discussion we have decided to allow official simulated
|
||||||
|
# numbers to go out in trial mode for development purposes.
|
||||||
|
guest_list_members.extend(current_app.config["SIMULATED_SMS_NUMBERS"])
|
||||||
if (key_type == KeyType.NORMAL and service.restricted) or (
|
if (key_type == KeyType.NORMAL and service.restricted) or (
|
||||||
key_type == KeyType.TEAM
|
key_type == KeyType.TEAM
|
||||||
):
|
):
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ from app.serialised_models import (
|
|||||||
SerialisedService,
|
SerialisedService,
|
||||||
SerialisedTemplate,
|
SerialisedTemplate,
|
||||||
)
|
)
|
||||||
|
from app.service.utils import service_allowed_to_send_to
|
||||||
from app.utils import get_template_instance
|
from app.utils import get_template_instance
|
||||||
from app.v2.errors import BadRequestError, RateLimitError, TotalRequestsError
|
from app.v2.errors import BadRequestError, RateLimitError, TotalRequestsError
|
||||||
from tests.app.db import (
|
from tests.app.db import (
|
||||||
@@ -802,3 +803,21 @@ def test_check_service_over_total_message_limit(mocker, sample_service):
|
|||||||
sample_service,
|
sample_service,
|
||||||
)
|
)
|
||||||
assert service_stats == 0
|
assert service_stats == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_service_allowed_to_send_to_simulated_numbers():
|
||||||
|
trial_mode_service = create_service(service_name="trial mode", restricted=True)
|
||||||
|
can_send = service_allowed_to_send_to(
|
||||||
|
"+14254147755",
|
||||||
|
trial_mode_service,
|
||||||
|
KeyType.NORMAL,
|
||||||
|
allow_guest_list_recipients=True,
|
||||||
|
)
|
||||||
|
can_not_send = service_allowed_to_send_to(
|
||||||
|
"+15555555555",
|
||||||
|
trial_mode_service,
|
||||||
|
KeyType.NORMAL,
|
||||||
|
allow_guest_list_recipients=True,
|
||||||
|
)
|
||||||
|
assert can_send is True
|
||||||
|
assert can_not_send is False
|
||||||
|
|||||||
Reference in New Issue
Block a user