Merge pull request #625 from jbernal0019/master

Improve speed of DB queries related to granting a user permission to accesss folder/files resources

Author: jbernal0019

chris_backend/core/models.py

@@ -175,18 +175,19 @@ def has_user_permission(self, user, permission=''):
         Custom method to determine whether a user has been granted a permission
         to access the folder (perhaps through one of its groups).
         """
+        grp_qs = user.groups.all()
+
         if not permission:
-            lookup = models.Q(shared_folders=self) | models.Q(groups__shared_folders=self)
-            qs = User.objects.filter(username=user.username).filter(lookup)
+            if FolderUserPermission.objects.filter(folder=self, user=user).exists():
+                return True
+            qs = FolderGroupPermission.objects.filter(folder=self, group__in=grp_qs)
         else:
             p = validate_permission(permission)
             if FolderUserPermission.objects.filter(folder=self, user=user,
                                                    permission=p).exists():
                 return True
-
-            user_grp_ids = [g.id for g in user.groups.all()]
             qs = FolderGroupPermission.objects.filter(folder=self, permission=p,
-                                                      group__pk__in=user_grp_ids)
+                                                      group__in=grp_qs)
         return qs.exists()
 
     def grant_group_permission(self, group, permission):
@@ -593,18 +594,19 @@ def has_user_permission(self, user, permission=''):
         Custom method to determine whether a user has been granted a permission to
         access the file (perhaps through one of its groups).
         """
+        grp_qs = user.groups.all()
+
         if not permission:
-            lookup = models.Q(shared_files=self) | models.Q(groups__shared_files=self)
-            qs = User.objects.filter(username=user.username).filter(lookup)
+            if FileUserPermission.objects.filter(file=self, user=user).exists():
+                return True
+            qs = FileGroupPermission.objects.filter(file=self, group__in=grp_qs)
         else:
             p = validate_permission(permission)
             if FileUserPermission.objects.filter(file=self, user=user,
                                                  permission=p).exists():
                 return True
-
-            user_grp_ids = [g.id for g in user.groups.all()]
             qs = FileGroupPermission.objects.filter(file=self, permission=p,
-                                                    group__pk__in=user_grp_ids)
+                                                    group__in=grp_qs)
         return qs.exists()
 
     def grant_group_permission(self, group, permission):
@@ -879,19 +881,19 @@ def has_user_permission(self, user, permission=''):
         Custom method to determine whether a user has been granted a permission to
         access the link file (perhaps through one of its groups).
         """
+        grp_qs = user.groups.all()
+
         if not permission:
-            lookup = models.Q(shared_link_files=self) | models.Q(
-                groups__shared_link_files=self)
-            qs = User.objects.filter(username=user.username).filter(lookup)
+            if LinkFileUserPermission.objects.filter(link_file=self, user=user).exists():
+                return True
+            qs = LinkFileGroupPermission.objects.filter(link_file=self, group__in=grp_qs)
         else:
             p = validate_permission(permission)
             if LinkFileUserPermission.objects.filter(link_file=self, user=user,
                                                      permission=p).exists():
                 return True
-
-            user_grp_ids = [g.id for g in user.groups.all()]
             qs = LinkFileGroupPermission.objects.filter(link_file=self, permission=p,
-                                                        group__pk__in=user_grp_ids)
+                                                        group__in=grp_qs)
         return qs.exists()
 
     def grant_group_permission(self, group, permission):

chris_backend/feeds/views.py

@@ -165,9 +165,8 @@ def get_feeds_queryset(self, user):
         if not user.is_authenticated:
             return tag.feeds.filter(public=True)
 
-        group_ids = [g.id for g in user.groups.all()]
         lookup = Q(owner=user) | Q(public=True) | Q(shared_users=user) | Q(
-            shared_groups__pk__in=group_ids)
+            shared_groups__in=user.groups.all())
         return tag.feeds.filter(lookup)
 
 
@@ -261,9 +260,8 @@ def get_taggings_queryset(self, user):
         if not user.is_authenticated:
             return Tagging.objects.filter(tag=tag).filter(feed__public=True)
 
-        group_ids = [g.id for g in user.groups.all()]
         lookup = Q(feed__owner=user) | (Q(feed__public=True) | Q(
-            feed__shared_users=user) | Q(feed__shared_groups__pk__in=group_ids))
+            feed__shared_users=user) | Q(feed__shared_groups__in=user.groups.all()))
         return Tagging.objects.filter(tag=tag).filter(lookup)
 
 
@@ -299,8 +297,8 @@ def get_queryset(self):
         if user.username == 'chris':
             return Feed.objects.exclude(public=True)
 
-        group_ids = [g.id for g in user.groups.all()]
-        lookup = Q(owner=user) | Q(shared_users=user) | Q(shared_groups__pk__in=group_ids)
+        lookup = Q(owner=user) | Q(shared_users=user) | Q(
+            shared_groups__in=user.groups.all())
         return Feed.objects.filter(lookup)
 
     def list(self, request, *args, **kwargs):
@@ -368,8 +366,8 @@ def get_queryset(self):
         if user.username == 'chris':
             return Feed.objects.exclude(public=True)
 
-        group_ids = [g.id for g in user.groups.all()]
-        lookup = Q(owner=user) | Q(shared_users=user) | Q(shared_groups__pk__in=group_ids)
+        lookup = Q(owner=user) | Q(shared_users=user) | Q(
+            shared_groups__in=user.groups.all())
         return Feed.objects.filter(lookup)
 
 

chris_backend/filebrowser/services.py

@@ -36,8 +36,7 @@ def get_folder_children_queryset(folder, user=None):
         return folder.children.all()
 
     lookup = models.Q(owner=user) | models.Q(public=True) | models.Q(
-        shared_users=user) | models.Q(shared_groups__pk__in=[g.id for g
-                                                             in user.groups.all()])
+        shared_users=user) | models.Q(shared_groups__in=user.groups.all())
     return folder.children.filter(lookup)
 
 
@@ -52,8 +51,7 @@ def get_folder_files_queryset(folder, user=None):
         return folder.chris_files.all()
 
     lookup = models.Q(owner=user) | models.Q(public=True) | models.Q(
-        shared_users=user) | models.Q(shared_groups__pk__in=[g.id for g
-                                                             in user.groups.all()])
+        shared_users=user) | models.Q(shared_groups__in=user.groups.all())
     return folder.chris_files.filter(lookup)
 
 
@@ -68,6 +66,5 @@ def get_folder_link_files_queryset(folder, user=None):
         return folder.chris_link_files.all()
 
     lookup = models.Q(owner=user) | models.Q(public=True) | models.Q(
-        shared_users=user) | models.Q(shared_groups__pk__in=[g.id for g
-                                                             in user.groups.all()])
+        shared_users=user) | models.Q(shared_groups__in=user.groups.all())
     return folder.chris_link_files.filter(lookup)