Formatted

Author: yubarajshrestha

src/masonite_permission/mixins/has_permissions.py

@@ -7,19 +7,22 @@ class HasPermissions:
     def permissions(self):
         from ..models.permission import Permission
 
-        return (
-            Permission.where_in("id", lambda q: (
+        return Permission.where_in(
+            "id",
+            lambda q: (
                 q.table("model_has_permissions")
                 .select("model_has_permissions.permission_id")
-                .where_raw(f"""
+                .where_raw(
+                    f"""
                     (model_has_permissions.permissionable_type = 'users' and model_has_permissions.permissionable_id = {self.id})
                     or
                     (model_has_permissions.permissionable_type = 'roles' and model_has_permissions.permissionable_id in (
                         select role_user.role_id from role_user where role_user.user_id = {self.id}
                     ))
-                """)
-            )).get()
-        )
+                """
+                )
+            ),
+        ).get()
 
     def attach_permission(self, permission):
         """Assign a permission to a role
@@ -155,7 +158,11 @@ def sync_permissions(self, *args):
         ids = []
 
         if len(permission_ids) > 0 and len(permission_slugs) > 0:
-            ids = Permission.where_raw(f"(id in {permission_ids}) or slug in {permission_slugs}").get().pluck("id")
+            ids = (
+                Permission.where_raw(f"(id in {permission_ids}) or slug in {permission_slugs}")
+                .get()
+                .pluck("id")
+            )
         elif len(permission_ids) > 0:
             ids = list(Permission.where_in("id", permission_ids).get().pluck("id"))
         elif len(permission_slugs) > 0:

tests/integrations/app/controllers/WelcomeController.py

@@ -2,11 +2,8 @@
 from masonite.views import View
 from masonite.controllers import Controller
 
-from src.masonite_permission.models.permission import Permission
 from src.masonite_permission.models.role import Role
 from tests.integrations.app.models.User import User
-from masoniteorm.expressions import JoinClause
-from masoniteorm.query import QueryBuilder
 
 
 class WelcomeController(Controller):
@@ -21,61 +18,5 @@ def show(self, view: View):
 
     def test(self):
         user = User.first()
-        role = Role.first()
-
-        # user.sync_permissions(["create-post", "edit-user"])
-        # role.sync_permissions(["create-user", "edit-user", "delete-user"])
 
         return user.permissions()
-        
-        # user_two = User.create(
-        #     {
-        #         "name": "John",
-        #         "email": "john@example.com",
-        #         "password": "OK",
-        #         "phone": "+123456789",
-        #     }
-        # )
-
-        # user_two.sync_permissions("delete-user")
-
-        return (
-            QueryBuilder().table("permissions").select_raw("permissions.id, permissions.name").where_in("id", lambda q: (
-                q.table("model_has_permissions")
-                .select("model_has_permissions.permission_id")
-                .where_raw(f"""
-                    (model_has_permissions.permissionable_type = 'users' and model_has_permissions.permissionable_id = {user.id})
-                    or
-                    (model_has_permissions.permissionable_type = 'roles' and model_has_permissions.permissionable_id in (
-                        select role_user.role_id from role_user where role_user.user_id = {user.id}
-                    ))
-                """)
-            )).get()
-        )
-
-        return (
-            QueryBuilder().table("permissions")
-            .select_raw("permissions.id, permissions.name, permissions.slug, users.id")
-            .join(pivot_query)
-            .join(role_permission_query)
-            .join(user_permission_query)
-            .group_by("permissions.id, users.id")
-            .where("users.id", 1)
-            .get()
-        )
-
-        user = User.first()
-        admin = Role.where("slug", "admin").first()
-        
-        
-        user.attach_permission("edit-user")
-
-        admin.sync_permissions(["create-post", "edit-post", "delete-post"])
-
-        user.sync_roles(['admin', 'editor'])
-
-        return user.permissions()
-
-        return {
-            "roles": permission.roles().serialize(),
-        }