darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-14 10:58:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

noqa the x == False for sqlalchemy

Browse Source
This commit is contained in:
Kenneth Kehl
2024-12-19 11:36:50 -08:00
parent 83193c221a
commit db16f94afb
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/dao/permissions_dao.py
View File

@@ -57,7 +57,7 @@ class PermissionDAO(DAOClass):
select(self.Meta.model)
.where(self.Meta.model.user_id == user_id)
.join(Permission.service)
.where(Permission.active == True) # noqa
.where(Permission.service.active == True) # noqa
)
.scalars()
.all()
@@ -69,7 +69,10 @@ class PermissionDAO(DAOClass):
select(self.Meta.model)
.where(self.Meta.model.user_id == user_id)
.join(Permission.service)
.where(Permission.active == True, Permission.id == service_id) # noqa
.where(
Permission.service.active == True, # noqa
Permission.service.id == service_id,
) # noqa
)
.scalars()
.all()

38
app/dao/services_dao.py
View File

@@ -394,26 +394,36 @@ def delete_service_and_all_associated_db_objects(service):
db.session.execute(stmt)
db.session.commit()
subq = select(Template.id).where(Service.service == service).subquery()
subq = select(Template.id).where(Template.service == service).subquery()
stmt = delete(TemplateRedacted).filter(TemplateRedacted.template_id.in_(subq))
_delete_commit(stmt)
_delete_commit(delete(ServiceSmsSender).where(Service.service == service))
_delete_commit(delete(ServiceEmailReplyTo).where(Service.service == service))
_delete_commit(delete(InvitedUser).where(Service.service == service))
_delete_commit(delete(Permission).where(Service.service == service))
_delete_commit(delete(NotificationHistory).where(Service.service == service))
_delete_commit(delete(Notification).where(Service.service == service))
_delete_commit(delete(Job).where(Service.service == service))
_delete_commit(delete(Template).where(Service.service == service))
_delete_commit(delete(TemplateHistory).where(Service.service_id == service.id))
_delete_commit(delete(ServicePermission).where(Service.service_id == service.id))
_delete_commit(delete(ApiKey).where(Service.service == service))
_delete_commit(delete(ServiceSmsSender).where(ServiceSmsSender.service == service))
_delete_commit(
delete(ApiKey.get_history_model()).where(Service.service_id == service.id)
delete(ServiceEmailReplyTo).where(ServiceEmailReplyTo.service == service)
)
_delete_commit(delete(AnnualBilling).where(Service.service_id == service.id))
_delete_commit(delete(InvitedUser).where(InvitedUser.service == service))
_delete_commit(delete(Permission).where(Permission.service == service))
_delete_commit(
delete(NotificationHistory).where(NotificationHistory.service == service)
)
_delete_commit(delete(Notification).where(Notification.service == service))
_delete_commit(delete(Job).where(Job.service == service))
_delete_commit(delete(Template).where(Template.service == service))
_delete_commit(
delete(TemplateHistory).where(TemplateHistory.service_id == service.id)
)
_delete_commit(
delete(ServicePermission).where(ServicePermission.service_id == service.id)
)
_delete_commit(delete(ApiKey).where(ApiKey.service == service))
_delete_commit(
delete(ApiKey.get_history_model()).where(
ApiKey.get_history_model().service_id == service.id
)
)
_delete_commit(delete(AnnualBilling).where(AnnualBilling.service_id == service.id))
stmt = (
select(VerifyCode).join(User).filter(User.id.in_([x.id for x in service.users]))