darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-11 09:27:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix delete

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-10 11:25:45 -07:00
parent 4de9ca5c07
commit 464dff64c7
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/dao/services_dao.py
View File

@@ -2,7 +2,7 @@ import uuid
from datetime import timedelta
from flask import current_app
from sqlalchemy import Float, cast, select
from sqlalchemy import Float, cast, delete, select
from sqlalchemy.orm import joinedload
from sqlalchemy.sql.expression import and_, asc, case, func
@@ -515,22 +515,22 @@ def delete_service_and_all_associated_db_objects(service):
# subq = db.session.query(Template.id).filter_by(service=service).subquery()
subq = select(Template.id).filter_by(service=service).subquery()
stmt = select(TemplateRedacted).filter(TemplateRedacted.template_id.in_(subq))
stmt = delete(TemplateRedacted).filter(TemplateRedacted.template_id.in_(subq))
_delete_commit(stmt)
_delete_commit(select(ServiceSmsSender).filter_by(service=service))
_delete_commit(select(ServiceEmailReplyTo).filter_by(service=service))
_delete_commit(select(InvitedUser).filter_by(service=service))
_delete_commit(select(Permission).filter_by(service=service))
_delete_commit(select(NotificationHistory).filter_by(service=service))
_delete_commit(select(Notification).filter_by(service=service))
_delete_commit(select(Job).filter_by(service=service))
_delete_commit(select(Template).filter_by(service=service))
_delete_commit(select(TemplateHistory).filter_by(service_id=service.id))
_delete_commit(select(ServicePermission).filter_by(service_id=service.id))
_delete_commit(select(ApiKey).filter_by(service=service))
_delete_commit(select(ApiKey.get_history_model()).filter_by(service_id=service.id))
_delete_commit(select(AnnualBilling).filter_by(service_id=service.id))
_delete_commit(delete(ServiceSmsSender).filter_by(service=service))
_delete_commit(delete(ServiceEmailReplyTo).filter_by(service=service))
_delete_commit(delete(InvitedUser).filter_by(service=service))
_delete_commit(delete(Permission).filter_by(service=service))
_delete_commit(delete(NotificationHistory).filter_by(service=service))
_delete_commit(delete(Notification).filter_by(service=service))
_delete_commit(delete(Job).filter_by(service=service))
_delete_commit(delete(Template).filter_by(service=service))
_delete_commit(delete(TemplateHistory).filter_by(service_id=service.id))
_delete_commit(delete(ServicePermission).filter_by(service_id=service.id))
_delete_commit(delete(ApiKey).filter_by(service=service))
_delete_commit(delete(ApiKey.get_history_model()).filter_by(service_id=service.id))
_delete_commit(delete(AnnualBilling).filter_by(service_id=service.id))
stmt = (
select(VerifyCode).join(User).filter(User.id.in_([x.id for x in service.users]))
@@ -542,7 +542,7 @@ def delete_service_and_all_associated_db_objects(service):
for user in users:
user.organizations = []
service.users.remove(user)
_delete_commit(select(Service.get_history_model()).filter_by(id=service.id))
_delete_commit(delete(Service.get_history_model()).filter_by(id=service.id))
db.session.delete(service)
db.session.commit()
for user in users: