diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py index 3dd3ae933..ac28eaabe 100644 --- a/app/dao/services_dao.py +++ b/app/dao/services_dao.py @@ -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 diff --git a/app/service/rest.py b/app/service/rest.py index b05763c3f..9a833eaab 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -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 diff --git a/tests/app/conftest.py b/tests/app/conftest.py index ec31f19c8..55828ed35 100644 --- a/tests/app/conftest.py +++ b/tests/app/conftest.py @@ -219,12 +219,7 @@ def sample_service(sample_user): service = Service.query.filter_by(name=service_name).first() if not service: service = Service(**data) - dao_create_service( - service, - sample_user, - service_permissions=None, - create_default_sms_sender=True, - ) + dao_create_service(service, sample_user, service_permissions=None) else: if sample_user not in service.users: dao_add_user_to_service(service, sample_user) @@ -246,9 +241,7 @@ def _sample_service_full_permissions(notify_db_session): @pytest.fixture(scope="function") def sample_template(sample_user): service = create_service( - service_permissions=[EMAIL_TYPE, SMS_TYPE], - check_if_service_exists=True, - create_default_sms_sender=True, + service_permissions=[EMAIL_TYPE, SMS_TYPE], check_if_service_exists=True ) data = { @@ -805,7 +798,6 @@ def notify_service(notify_db_session, sample_user): service=service, service_id=current_app.config["NOTIFY_SERVICE_ID"], user=sample_user, - create_default_sms_sender=True, ) data = { diff --git a/tests/app/db.py b/tests/app/db.py index e6adec973..63d7720bc 100644 --- a/tests/app/db.py +++ b/tests/app/db.py @@ -117,7 +117,6 @@ def create_service( billing_contact_names=None, billing_contact_email_addresses=None, billing_reference=None, - create_default_sms_sender=True, ): if check_if_service_exists: service = Service.query.filter_by(name=service_name).first() @@ -150,7 +149,6 @@ def create_service( service.created_by, service_id, service_permissions=service_permissions, - create_default_sms_sender=create_default_sms_sender, ) service.active = active diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index f831c2424..9cf0829ea 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -380,13 +380,8 @@ def test_create_service( "created_by": str(sample_user.id), } - create_default_sms_sender = True - json_resp = admin_request.post( - "service.create_service", - _data=data, - _expected_status=201, - create_default_sms_sender=create_default_sms_sender, + "service.create_service", _data=data, _expected_status=201 ) assert json_resp["data"]["id"] @@ -404,6 +399,7 @@ def test_create_service( ) assert json_resp["data"]["name"] == "created service" + service_sms_senders = ServiceSmsSender.query.filter_by( service_id=service_db.id ).all()