Revert "Added flag to remove default sender from user list"

This commit is contained in:
Andrew Shumway
2023-11-06 11:49:17 -07:00
committed by GitHub
parent 9cdc507f6c
commit d0368695db
5 changed files with 7 additions and 33 deletions

View File

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

View File

@@ -227,16 +227,8 @@ def create_service():
# unpack valid json into service object
valid_service = Service.from_json(data)
# Grabbing flag from request object for default SMS sender.
# This will only be true in our tests now; the value will default to false in normal app usage.
create_default_sms_sender = bool(
request.args.get("create_default_sms_sender", False)
)
with transaction():
dao_create_service(
valid_service, user, create_default_sms_sender=create_default_sms_sender
)
dao_create_service(valid_service, user)
set_default_free_allowance_for_service(service=valid_service, year_start=None)
return jsonify(data=service_schema.dump(valid_service)), 201