From 4ef1847baff9d8c3ee2cd85f4758b08305a9c2ab Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Mon, 18 Nov 2024 08:41:57 -0800
Subject: [PATCH] fix permission_dao

---
 app/dao/permissions_dao.py | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/dao/permissions_dao.py b/app/dao/permissions_dao.py
index 13518671f..24503fa70 100644
--- a/app/dao/permissions_dao.py
+++ b/app/dao/permissions_dao.py
@@ -17,12 +17,12 @@ class PermissionDAO(DAOClass):
 
     def remove_user_service_permissions(self, user, service):
         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()
 
     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()
 
     def set_user_service_permission(
@@ -31,13 +31,11 @@ class PermissionDAO(DAOClass):
         try:
             if replace:
                 db.session.execute(
-                    delete(
-                        self.Meta.model.filter(
-                            self.Meta.model.user == user,
-                            self.Meta.model.service == service,
-                        )
+                    delete(self.Meta.model).where(
+                        self.Meta.model.user == user, self.Meta.model.service == service
                     )
                 )
+
                 db.session.commit()
             for p in permissions:
                 p.user = user
@@ -54,11 +52,10 @@ class PermissionDAO(DAOClass):
     def get_permissions_by_user_id(self, user_id):
         return (
             db.session.execute(
-                select(
-                    self.Meta.model.filter_by(user_id=user_id)
-                    .join(Permission.service)
-                    .filter_by(active=True)
-                )
+                select(self.Meta.model)
+                .filter_by(user_id=user_id)
+                .join(Permission.service)
+                .filter_by(active=True)
             )
             .scalars()
             .all()
@@ -66,12 +63,11 @@ class PermissionDAO(DAOClass):
 
     def get_permissions_by_user_id_and_service_id(self, user_id, service_id):
         return (
-            db.session.commit(
-                select(
-                    self.Meta.model.filter_by(user_id=user_id)
-                    .join(Permission.service)
-                    .filter_by(active=True, id=service_id)
-                )
+            db.session.execute(
+                select(self.Meta.model)
+                .filter_by(user_id=user_id)
+                .join(Permission.service)
+                .filter_by(active=True, id=service_id)
             )
             .scalars()
             .all()