jro_apps/redmine Commit - r15742:98f8a17851d5

Speeds up Project.allowed_to_condition for users who belong to hundreds of projects....

Jean-Philippe Lang -

r15742:98f8a17851d5

parent child

Context file:

r15742:98f8a17851d5

Collapse all files

app/models/project.rb +3 -3

                        statement_by_role[role] = s
                      end
                    end
-                   user.projects_by_role.each do |role, projects|
-                     if role.allowed_to?(permission) && projects.any?
-                       statement_by_role[role] = "#{Project.table_name}.id IN (#{projects.collect(&:id).join(',')})"
+                   user.project_ids_by_role.each do |role, project_ids|
+                     if role.allowed_to?(permission) && project_ids.any?
+                       statement_by_role[role] = "#{Project.table_name}.id IN (#{project_ids.join(',')})"
                      end
                    end
                    if statement_by_role.empty?

app/models/user.rb +37 -18

                def reload(*args)
                  @name = nil
                  @projects_by_role = nil
+                 @project_ids_by_role = nil
                  @membership_by_project_id = nil
                  @notified_projects_ids = nil
                  @notified_projects_ids_changed = false
                end
                # Returns a hash of user's projects grouped by roles
+               # TODO: No longer used, should be deprecated
                def projects_by_role
                  return @projects_by_role if @projects_by_role
-                 hash = Hash.new([])
+                 result = Hash.new([])
+                 project_ids_by_role.each do |role, ids|
+                   result[role] = Project.where(:id => ids).to_a
+                 end
+                 @projects_by_role = result
+               end
+               # Returns a hash of project ids grouped by roles.
+               # Includes the projects that the user is a member of and the projects
+               # that grant custom permissions to the builtin groups.
+               def project_ids_by_role
+                 return @project_ids_by_role if @project_ids_by_role
                  group_class = anonymous? ? GroupAnonymous : GroupNonMember
-                 members = Member.joins(:project, :principal).
+                 group_id = group_class.pluck(:id).first
+                 members = Member.joins(:project, :member_roles).
                    where("#{Project.table_name}.status <> 9").
-                   where("#{Member.table_name}.user_id = ? OR (#{Project.table_name}.is_public = ? AND #{Principal.table_name}.type = ?)", self.id, true, group_class.name).
-                   preload(:project, :roles).
-                   to_a
-                 members.reject! {|member| member.user_id != id && project_ids.include?(member.project_id)}
-                 members.each do |member|
-                   if member.project
-                     member.roles.each do |role|
-                       hash[role] = [] unless hash.key?(role)
-                       hash[role] << member.project
-                     end
-                   end
-                 end
+                   where("#{Member.table_name}.user_id = ? OR (#{Project.table_name}.is_public = ? AND #{Member.table_name}.user_id = ?)", self.id, true, group_id).
+                   pluck(:user_id, :role_id, :project_id)
+                 hash = {}
+                 members.each do |user_id, role_id, project_id|
+                   # Ignore the roles of the builtin group if the user is a member of the project
+                   next if user_id != id && project_ids.include?(project_id)
-                 hash.each do |role, projects|
-                   projects.uniq!
+                   hash[role_id] ||= []
+                   hash[role_id] << project_id
                  end
-                 @projects_by_role = hash
+                 result = Hash.new([])
+                 if hash.present?
+                   roles = Role.where(:id => hash.keys).to_a
+                   hash.each do |role_id, proj_ids|
+                     role = roles.detect {|r| r.id == role_id}
+                     if role
+                       result[role] = proj_ids.uniq
+                     end
+                   end
+                 end
+                 @project_ids_by_role = result
                end
                # Returns the ids of visible projects

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages