diff options
Diffstat (limited to 'lib/api/projects_relation_builder.rb')
| -rw-r--r-- | lib/api/projects_relation_builder.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/lib/api/projects_relation_builder.rb b/lib/api/projects_relation_builder.rb index aabecb43653..35f555e16b5 100644 --- a/lib/api/projects_relation_builder.rb +++ b/lib/api/projects_relation_builder.rb @@ -14,6 +14,7 @@ module API Preloaders::UserMaxAccessLevelInProjectsPreloader.new(projects_relation, options[:current_user]).execute if options[:current_user] Preloaders::SingleHierarchyProjectGroupPlansPreloader.new(projects_relation).execute if options[:single_hierarchy] + preload_groups(projects_relation) if options[:with] == Entities::Project projects_relation end @@ -40,6 +41,25 @@ module API def repositories_for_preload(projects_relation) projects_relation.map(&:repository) end + + # For all projects except those in a user namespace, the `namespace` + # and `group` are identical. Preload the group when it's not a user namespace. + def preload_groups(projects_relation) + return unless Feature.enabled?(:group_projects_api_preload_groups) + + group_projects = projects_for_group_preload(projects_relation) + groups = group_projects.map(&:namespace) + + Preloaders::GroupRootAncestorPreloader.new(groups).execute + + group_projects.each do |project| + project.group = project.namespace + end + end + + def projects_for_group_preload(projects_relation) + projects_relation.select { |project| project.namespace.type == Group.sti_name } + end end end end |