diff options
| author | Francisco Lopez <fjlopez@gitlab.com> | 2017-11-27 14:24:33 +0300 |
|---|---|---|
| committer | Francisco Lopez <fjlopez@gitlab.com> | 2017-12-01 20:32:12 +0300 |
| commit | 58c5b463ff75618a557d067c16f49ef581cda85c (patch) | |
| tree | 6de7fc1cb446b6120e8eb6c777912904b77efffd /lib/api/groups.rb | |
| parent | c85f9c5b1d320f7a6f75e3d08bbafd2fb20d3f58 (diff) | |
Refactored /projects and /user/:user_id/projects endpoints
Diffstat (limited to 'lib/api/groups.rb')
| -rw-r--r-- | lib/api/groups.rb | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index 83c7898150a..b81f07a1770 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -55,19 +55,8 @@ module API def find_group_projects(params) group = find_group!(params[:id]) projects = GroupProjectsFinder.new(group: group, current_user: current_user, params: project_finder_params).execute - projects = projects.preload(:project_feature, :route, :group) - .preload(namespace: [:route, :owner], - tags: :taggings, - project_group_links: :group, - fork_network: :root_project, - forked_project_link: :forked_from_project, - forked_from_project: [:route, :forks, namespace: :route, tags: :taggings]) projects = reorder_projects(projects) - projects = paginate(projects) - projects_with_forks = projects + projects.map(&:forked_from_project).compact - ::Projects::BatchForksCountService.new(projects_with_forks).refresh_cache - ::Projects::BatchOpenIssuesCountService.new(projects).refresh_cache - projects + paginate(projects) end def present_groups(params, groups) @@ -190,7 +179,8 @@ module API get ":id/projects" do projects = find_group_projects(params) entity = params[:simple] ? Entities::BasicProjectDetails : Entities::Project - present projects, with: entity, current_user: current_user + + present entity.prepare_relation(projects), with: entity, current_user: current_user end desc 'Get a list of subgroups in this group.' do |