Download as
Browse Code »

Commit b1dbabdec30d8e03afb0155b9494cfe2ef351352

Authored by Dmitriy Zaporozhets
1 parent 2c482097
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Improve query of authorized_projects. Cache results for authorized_groups, autho… 

…rized_projects methods
Showing 1 changed file with 9 additions and 4 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @b1dbabd
... ... @@ -88,6 +88,7 @@ class User < ActiveRecord::Base
88 88 has_many :assigned_issues, dependent: :destroy, foreign_key: :assignee_id, class_name: "Issue"
89 89 has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest"
90 90  
  91 + has_many :groups_projects, through: :groups, source: :projects
91 92 has_many :personal_projects, through: :namespace, source: :projects
92 93 has_many :projects, through: :users_projects
93 94 has_many :master_projects, through: :users_projects, source: :project,
... ... @@ -233,15 +234,19 @@ class User < ActiveRecord::Base
233 234  
234 235 # Groups user has access to
235 236 def authorized_groups
236   - @group_ids ||= (groups.pluck(:id) + own_groups.pluck(:id) + authorized_projects.pluck(:namespace_id))
237   - Group.where(id: @group_ids)
  237 + @authorized_groups ||= begin
  238 + group_ids = (groups.pluck(:id) + own_groups.pluck(:id) + authorized_projects.pluck(:namespace_id))
  239 + Group.where(id: group_ids)
  240 + end
238 241 end
239 242  
240 243  
241 244 # Projects user has access to
242 245 def authorized_projects
243   - @project_ids ||= (owned_projects.pluck(:id) + groups.map(&:projects).flatten.map(&:id) + projects.pluck(:id)).uniq
244   - Project.where(id: @project_ids)
  246 + @authorized_projects ||= begin
  247 + project_ids = (owned_projects.pluck(:id) + groups_projects.pluck(:id) + projects.pluck(:id)).uniq
  248 + Project.where(id: project_ids).includes(:namespace)
  249 + end
245 250 end
246 251  
247 252 # Team membership in authorized projects
... ...