From e0522393dfbfcdba7ba30bda2689ce88d327450e Mon Sep 17 00:00:00 2001
From: Andrew Shumway <andrew.shumway@gsa.gov>
Date: Sun, 15 Oct 2023 16:28:25 -0600
Subject: [PATCH] Added flag to remove default sender from user list

---
 app/dao/services_dao.py |  8 ++++++--
 app/service/rest.py     |  2 +-
 tests/app/conftest.py   | 12 ++++++++++--
 tests/app/db.py         |  2 ++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py
index ac28eaabe..3dd3ae933 100644
--- a/app/dao/services_dao.py
+++ b/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
diff --git a/app/service/rest.py b/app/service/rest.py
index 4467c0720..0426bb086 100644
--- a/app/service/rest.py
+++ b/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
diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index 55828ed35..ec31f19c8 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -219,7 +219,12 @@ 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)
+        dao_create_service(
+            service,
+            sample_user,
+            service_permissions=None,
+            create_default_sms_sender=True,
+        )
     else:
         if sample_user not in service.users:
             dao_add_user_to_service(service, sample_user)
@@ -241,7 +246,9 @@ 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
+        service_permissions=[EMAIL_TYPE, SMS_TYPE],
+        check_if_service_exists=True,
+        create_default_sms_sender=True,
     )
 
     data = {
@@ -798,6 +805,7 @@ 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 63d7720bc..e6adec973 100644
--- a/tests/app/db.py
+++ b/tests/app/db.py
@@ -117,6 +117,7 @@ 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()
@@ -149,6 +150,7 @@ def create_service(
             service.created_by,
             service_id,
             service_permissions=service_permissions,
+            create_default_sms_sender=create_default_sms_sender,
         )
 
         service.active = active