darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-23 15:56:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added flag to remove default sender from user list

Browse Source
This commit is contained in:
Andrew Shumway
2023-10-15 16:28:25 -06:00
parent 3a3625017d
commit e0522393df
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/dao/services_dao.py
View File

@@ -273,6 +273,7 @@ def dao_create_service(
user, user,
service_id=None, service_id=None,
service_permissions=None, service_permissions=None,
create_default_sms_sender=False,
): ):
if not user: if not user:
raise ValueError("Can't create a service without a user") raise ValueError("Can't create a service without a user")
@@ -297,8 +298,11 @@ def dao_create_service(
) )
service.permissions.append(service_permission) service.permissions.append(service_permission)
# do we just add the default - or will we get a value from FE? # We are removing an sms default sender from being added to each
insert_service_sms_sender(service, current_app.config["FROM_NUMBER"]) # service as it is created, but we will pass a default flag
# because some tests need a default number.
if create_default_sms_sender:
insert_service_sms_sender(service, current_app.config["FROM_NUMBER"])
if organization: if organization:
service.organization_id = organization.id service.organization_id = organization.id

2
app/service/rest.py
View File

@@ -227,7 +227,7 @@ def create_service():
valid_service = Service.from_json(data) valid_service = Service.from_json(data)
with transaction(): with transaction():
dao_create_service(valid_service, user) dao_create_service(valid_service, user, create_default_sms_sender=True)
set_default_free_allowance_for_service(service=valid_service, year_start=None) set_default_free_allowance_for_service(service=valid_service, year_start=None)
return jsonify(data=service_schema.dump(valid_service)), 201 return jsonify(data=service_schema.dump(valid_service)), 201

12
tests/app/conftest.py
View File

@@ -219,7 +219,12 @@ def sample_service(sample_user):
service = Service.query.filter_by(name=service_name).first() service = Service.query.filter_by(name=service_name).first()
if not service: if not service:
service = Service(**data) service = Service(**data)
dao_create_service(service, sample_user, service_permissions=None) dao_create_service(
service,
sample_user,
service_permissions=None,
create_default_sms_sender=True,
)
else: else:
if sample_user not in service.users: if sample_user not in service.users:
dao_add_user_to_service(service, sample_user) dao_add_user_to_service(service, sample_user)
@@ -241,7 +246,9 @@ def _sample_service_full_permissions(notify_db_session):
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
def sample_template(sample_user): def sample_template(sample_user):
service = create_service( service = create_service(
service_permissions=[EMAIL_TYPE, SMS_TYPE], check_if_service_exists=True service_permissions=[EMAIL_TYPE, SMS_TYPE],
check_if_service_exists=True,
create_default_sms_sender=True,
) )
data = { data = {
@@ -798,6 +805,7 @@ def notify_service(notify_db_session, sample_user):
service=service, service=service,
service_id=current_app.config["NOTIFY_SERVICE_ID"], service_id=current_app.config["NOTIFY_SERVICE_ID"],
user=sample_user, user=sample_user,
create_default_sms_sender=True,
) )
data = { data = {

2
tests/app/db.py
View File

@@ -117,6 +117,7 @@ def create_service(
billing_contact_names=None, billing_contact_names=None,
billing_contact_email_addresses=None, billing_contact_email_addresses=None,
billing_reference=None, billing_reference=None,
create_default_sms_sender=True,
): ):
if check_if_service_exists: if check_if_service_exists:
service = Service.query.filter_by(name=service_name).first() service = Service.query.filter_by(name=service_name).first()
@@ -149,6 +150,7 @@ def create_service(
service.created_by, service.created_by,
service_id, service_id,
service_permissions=service_permissions, service_permissions=service_permissions,
create_default_sms_sender=create_default_sms_sender,
) )
service.active = active service.active = active