Refactored and Updated Query

Author: yubarajshrestha

setup.py

@@ -8,7 +8,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version="0.1.7",
+    version="0.1.8",
     packages=[
         "masonite_permission",
         "masonite_permission.config",

src/masonite_permission/mixins/has_permissions.py

@@ -1,15 +1,15 @@
 from masoniteorm.query import QueryBuilder
-from masoniteorm.collection.Collection import Collection
 from ..exceptions import PermissionException
 
 
 class HasPermissions:
-
     def _permission_query(self):
         """Return a query builder for permissions"""
         from ..models.permission import Permission
-        
-        role_id_query = f"select role_user.role_id from role_user where role_user.user_id = {self.id}"
+
+        role_id_query = (
+            f"select role_user.role_id from role_user where role_user.user_id = {self.id}"
+        )
 
         return Permission.where_in(
             "id",
@@ -35,6 +35,7 @@ def _permission_query(self):
                 )
             ),
         )
+
     def permissions(self):
         return self._permission_query().get()
 
@@ -145,8 +146,7 @@ def revoke_permission_to(self, *args):
             "permission_id", permissions.pluck("id")
         ).where("permissionable_type", self.get_table_name()).delete()
 
-    def sync_permissions(self, *args):
-        """Sync permissions from related model"""
+    def _get_permission_ids(self, args):
         from ..models.permission import Permission
 
         permission_ids = []
@@ -182,6 +182,12 @@ def sync_permissions(self, *args):
         elif len(permission_slugs) > 0:
             ids = list(Permission.where_in("slug", permission_slugs).get().pluck("id"))
 
+        return ids
+
+    def sync_permissions(self, *args):
+        """Sync permissions from related model"""
+
+        ids = self._get_permission_ids(args)
         data = []
         for permission in ids:
             data.append(
@@ -208,7 +214,7 @@ def has_permission_to(self, permission):
 
     def has_any_permission(self, *args):
         """Check if user has any of the permissions"""
-        
+
         slugs = []
         if type(args[0]) == list:
             slugs = args[0]
@@ -219,7 +225,6 @@ def has_any_permission(self, *args):
 
     def has_all_permissions(self, *args):
         """Check if user has all of the permissions"""
-        from ..models.permission import Permission
 
         slugs = []
         if type(args[0]) == list:

src/masonite_permission/mixins/has_roles.py

@@ -4,13 +4,11 @@
 
 
 class HasRoles:
-
     def _role_query(self):
         from ..models.role import Role
 
-        return (
-            Role.join("role_user as ru", "ru.role_id", "=", "roles.id")
-            .where("ru.user_id", self.id)
+        return Role.join("role_user as ru", "ru.role_id", "=", "roles.id").where(
+            "ru.user_id", self.id
         )
 
     def roles(self):
@@ -44,8 +42,7 @@ def has_all_roles(self, *args):
 
         return self._role_query().where_in("slug", slugs).count() == len(slugs)
 
-    def sync_roles(self, *args):
-        """Assign a role to a user"""
+    def _get_role_ids(self, args):
         from ..models.role import Role
 
         role_ids = []
@@ -69,16 +66,18 @@ def sync_roles(self, *args):
         ids = []
 
         if len(role_ids) > 0 and len(role_slugs) > 0:
-            ids = (
-                Role.where_raw(f"(id in {role_ids}) or slug in {role_slugs}")
-                .get()
-                .pluck("id")
-            )
+            ids = Role.where_raw(f"(id in {role_ids}) or slug in {role_slugs}").get().pluck("id")
         elif len(role_ids) > 0:
             ids = list(Role.where_in("id", role_ids).get().pluck("id"))
         elif len(role_slugs) > 0:
             ids = list(Role.where_in("slug", role_slugs).get().pluck("id"))
 
+        return ids
+
+    def sync_roles(self, *args):
+        """Assign a role to a user"""
+
+        ids = self._get_role_ids(args)
         data = []
         for role in ids:
             data.append({"user_id": self.id, "role_id": role})

tests/integrations/app/controllers/WelcomeController.py

@@ -19,7 +19,7 @@ def show(self, view: View):
     def test(self):
         user = User.first()
         # user.sync_permissions("create-user", "edit-user", "edit-post")
-        
+
         return {
             "has_permission": user.has_all_permissions("create-user", "edit-user"),
-        }
+        }