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

fix permission_dao

Browse Source
This commit is contained in:
Kenneth Kehl
2024-11-18 08:41:57 -08:00
parent 2eb692a8d4
commit 4ef1847baf
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/dao/permissions_dao.py
View File

@@ -17,12 +17,12 @@ class PermissionDAO(DAOClass):
def remove_user_service_permissions(self, user, service): def remove_user_service_permissions(self, user, service):
db.session.execute( db.session.execute(
delete(self.Meta.model.filter_by(user=user, service=service)) delete(self.Meta.model).filter_by(user=user, service=service)
) )
db.session.commit() db.session.commit()
def remove_user_service_permissions_for_all_services(self, user): def remove_user_service_permissions_for_all_services(self, user):
db.session.execute(delete(self.Meta.model.filter_by(user=user))) db.session.execute(delete(self.Meta.model).filter_by(user=user))
db.session.commit() db.session.commit()
def set_user_service_permission( def set_user_service_permission(
@@ -31,13 +31,11 @@ class PermissionDAO(DAOClass):
try: try:
if replace: if replace:
db.session.execute( db.session.execute(
delete( delete(self.Meta.model).where(
self.Meta.model.filter( self.Meta.model.user == user, self.Meta.model.service == service
self.Meta.model.user == user,
self.Meta.model.service == service,
)
) )
) )
db.session.commit() db.session.commit()
for p in permissions: for p in permissions:
p.user = user p.user = user
@@ -54,11 +52,10 @@ class PermissionDAO(DAOClass):
def get_permissions_by_user_id(self, user_id): def get_permissions_by_user_id(self, user_id):
return ( return (
db.session.execute( db.session.execute(
select( select(self.Meta.model)
self.Meta.model.filter_by(user_id=user_id) .filter_by(user_id=user_id)
.join(Permission.service) .join(Permission.service)
.filter_by(active=True) .filter_by(active=True)
)
) )
.scalars() .scalars()
.all() .all()
@@ -66,12 +63,11 @@ class PermissionDAO(DAOClass):
def get_permissions_by_user_id_and_service_id(self, user_id, service_id): def get_permissions_by_user_id_and_service_id(self, user_id, service_id):
return ( return (
db.session.commit( db.session.execute(
select( select(self.Meta.model)
self.Meta.model.filter_by(user_id=user_id) .filter_by(user_id=user_id)
.join(Permission.service) .join(Permission.service)
.filter_by(active=True, id=service_id) .filter_by(active=True, id=service_id)
)
) )
.scalars() .scalars()
.all() .all()