This commit is contained in:
Kenneth Kehl
2024-11-18 08:13:08 -08:00
parent 6c44f81d10
commit 2eb692a8d4
4 changed files with 51 additions and 24 deletions

View File

@@ -65,7 +65,7 @@ def dao_update_service_sms_sender(
if old_default.id == service_sms_sender_id:
raise Exception("You must have at least one SMS sender as the default")
sms_sender_to_update = ServiceSmsSender.query.get(service_sms_sender_id)
sms_sender_to_update = db.session.get(ServiceSmsSender, service_sms_sender_id)
sms_sender_to_update.is_default = is_default
if not sms_sender_to_update.inbound_number_id and sms_sender:
sms_sender_to_update.sms_sender = sms_sender
@@ -85,9 +85,13 @@ def update_existing_sms_sender_with_inbound_number(
@autocommit
def archive_sms_sender(service_id, sms_sender_id):
sms_sender_to_archive = ServiceSmsSender.query.filter_by(
id=sms_sender_id, service_id=service_id
).one()
sms_sender_to_archive = (
db.session.execute(
select(ServiceSmsSender).filter_by(id=sms_sender_id, service_id=service_id)
)
.scalars()
.one()
)
if sms_sender_to_archive.inbound_number_id:
raise ArchiveValidationError("You cannot delete an inbound number")