Added flag to remove default sender from user list

app/dao/services_dao.py

@@ -273,6 +273,7 @@ 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")
@@ -297,8 +298,11 @@ def dao_create_service(
         )
         service.permissions.append(service_permission)
 
-    # do we just add the default - or will we get a value from FE?
-    insert_service_sms_sender(service, current_app.config["FROM_NUMBER"])
+    # 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"])
 
     if organization:
         service.organization_id = organization.id

app/service/rest.py

@@ -227,7 +227,7 @@ def create_service():
     valid_service = Service.from_json(data)
 
     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)
 
     return jsonify(data=service_schema.dump(valid_service)), 201