convert service_permissions_dao

app/dao/service_permissions_dao.py

@@ -1,12 +1,17 @@
+from sqlalchemy import delete, select
+
 from app import db
 from app.dao.dao_utils import autocommit
 from app.models import ServicePermission
 
 
 def dao_fetch_service_permissions(service_id):
-    return ServicePermission.query.filter(
-        ServicePermission.service_id == service_id
-    ).all()
+    # return ServicePermission.query.filter(
+    #    ServicePermission.service_id == service_id
+    # ).all()
+
+    stmt = select(ServicePermission).filter(ServicePermission.service_id == service_id)
+    return db.session.execute(stmt).scalars().all()
 
 
 @autocommit
@@ -16,9 +21,17 @@ def dao_add_service_permission(service_id, permission):
 
 
 def dao_remove_service_permission(service_id, permission):
-    deleted = ServicePermission.query.filter(
+    # deleted = ServicePermission.query.filter(
+    #     ServicePermission.service_id == service_id,
+    #     ServicePermission.permission == permission,
+    # ).delete()
+    # db.session.commit()
+    # return deleted
+
+    stmt = delete(ServicePermission).where(
         ServicePermission.service_id == service_id,
         ServicePermission.permission == permission,
-    ).delete()
+    )
+    result = db.session.execute(stmt)
     db.session.commit()
-    return deleted
+    return result.rowcount