references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-14 03:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

speedup relation candidates api

Browse Source
This commit is contained in:
Jens Ulferts
2017-10-05 18:23:15 +02:00
parent 69f824836c
commit 047e972653
3 changed files with 121 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/api/v3/work_packages/work_package_collection_eager_loading.rb
+101
View File
@@ -0,0 +1,101 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2017 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See doc/COPYRIGHT.rdoc for more details.
#++
module API
module V3
module WorkPackages
module WorkPackageCollectionEagerLoading
def full_work_packages(ids_in_order)
wps = add_eager_loading(WorkPackage.where(id: ids_in_order), current_user).to_a
eager_load_ancestry(wps, ids_in_order)
eager_load_user_custom_values(wps)
eager_load_version_custom_values(wps)
eager_load_list_custom_values(wps)
wps.sort_by { |wp| ids_in_order.index(wp.id) }
end
def add_eager_loading(scope, current_user)
scope
.includes(element_decorator.to_eager_load)
.include_spent_hours(current_user)
.select('work_packages.*')
.distinct
end
def eager_load_ancestry(work_packages, ids_in_order)
grouped = WorkPackage.aggregate_ancestors(ids_in_order, current_user)
work_packages.each do |wp|
wp.work_package_ancestors = grouped[wp.id] || []
end
end
def eager_load_user_custom_values(work_packages)
eager_load_custom_values work_packages, 'user', User.includes(:preference)
end
def eager_load_version_custom_values(work_packages)
eager_load_custom_values work_packages, 'version', Version
end
def eager_load_list_custom_values(work_packages)
eager_load_custom_values work_packages, 'list', CustomOption
end
def eager_load_custom_values(work_packages, field_format, scope)
cvs = custom_values_of(work_packages, field_format)
ids_of_values = cvs.map(&:value).select { |v| v =~ /\A\d+\z/ }
values_by_id = scope.find(ids_of_values).group_by(&:id)
cvs.each do |cv|
next unless values_by_id[cv.value.to_i]
cv.value = values_by_id[cv.value.to_i].first
end
end
def custom_values_of(work_packages, field_format)
cvs = []
work_packages.each do |wp|
wp.custom_values.each do |cv|
cvs << cv if cv.custom_field.field_format == field_format && cv.value.present?
end
end
cvs
end
end
end
end
end
lib/api/v3/work_packages/work_package_collection_representer.rb
+11 -69
View File
@@ -32,6 +32,7 @@ module API
module V3
module WorkPackages
class WorkPackageCollectionRepresenter < ::API::Decorators::OffsetPaginatedCollection
include ::API::V3::WorkPackages::WorkPackageCollectionEagerLoading
element_decorator ::API::V3::WorkPackages::WorkPackageRepresenter
def initialize(models,
@@ -73,34 +74,38 @@ module API
end
link :sumsSchema do
next unless total_sums || groups && groups.any?(&:has_sums?)
{
href: api_v3_paths.work_package_sums_schema
} if total_sums || groups && groups.any?(&:has_sums?)
}
end
link :createWorkPackage do
next unless current_user_allowed_to_add_work_packages?
{
href: api_v3_paths.create_work_package_form,
method: :post
} if current_user_allowed_to_add_work_packages?
}
end
link :createWorkPackageImmediate do
next unless current_user_allowed_to_add_work_packages?
{
href: api_v3_paths.work_packages,
method: :post
} if current_user_allowed_to_add_work_packages?
}
end
link :schemas do
next if represented.empty?
{
href: schemas_path
} if represented.any?
}
end
link :customFields do
if project.present? &&
(current_user.try(:admin?) || current_user_allowed_to(:edit_project, context: project))
(current_user.try(:admin?) || current_user_allowed_to(:edit_project, context: project))
{
href: settings_project_path(project.identifier, tab: 'custom_fields'),
type: 'text/html',
@@ -114,7 +119,7 @@ module API
end
collection :elements,
getter: -> (*) {
getter: ->(*) {
generated_classes = ::Hash.new do |hash, work_package|
hit = hash.values.find do |klass|
klass.customizable.type_id == work_package.type_id &&
@@ -178,73 +183,10 @@ module API
.uniq
end
def add_eager_loading(scope, current_user)
scope
.includes(element_decorator.to_eager_load)
.include_spent_hours(current_user)
.select('work_packages.*')
end
def paged_models(models)
models.page(@page).per_page(@per_page).pluck(:id)
end
def full_work_packages(ids_in_order)
wps = add_eager_loading(WorkPackage.where(id: ids_in_order), current_user).to_a
eager_load_ancestry(wps, ids_in_order)
eager_load_user_custom_values(wps)
eager_load_version_custom_values(wps)
eager_load_list_custom_values(wps)
wps.sort_by { |wp| ids_in_order.index(wp.id) }
end
def eager_load_ancestry(work_packages, ids_in_order)
grouped = WorkPackage.aggregate_ancestors(ids_in_order, current_user)
work_packages.each do |wp|
wp.work_package_ancestors = grouped[wp.id] || []
end
end
def eager_load_user_custom_values(work_packages)
eager_load_custom_values work_packages, 'user', User.includes(:preference)
end
def eager_load_version_custom_values(work_packages)
eager_load_custom_values work_packages, 'version', Version
end
def eager_load_list_custom_values(work_packages)
eager_load_custom_values work_packages, 'list', CustomOption
end
def eager_load_custom_values(work_packages, field_format, scope)
cvs = custom_values_of(work_packages, field_format)
ids_of_values = cvs.map(&:value).select { |v| v =~ /\A\d+\z/ }
values_by_id = scope.find(ids_of_values).group_by(&:id)
cvs.each do |cv|
next unless values_by_id[cv.value.to_i]
cv.value = values_by_id[cv.value.to_i].first
end
end
def custom_values_of(work_packages, field_format)
cvs = []
work_packages.each do |wp|
wp.custom_values.each do |cv|
cvs << cv if cv.custom_field.field_format == field_format && cv.value.present?
end
end
cvs
end
def _type
'WorkPackageCollection'
end
lib/api/v3/work_packages/work_package_list_representer.rb
+9 -5
View File
@@ -1,4 +1,5 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
@@ -27,16 +28,19 @@
# See doc/COPYRIGHT.rdoc for more details.
#++
require 'roar/decorator'
require 'roar/json'
require 'roar/json/collection'
require 'roar/json/hal'
module API
module V3
module WorkPackages
class WorkPackageListRepresenter < ::API::Decorators::UnpaginatedCollection
include ::API::V3::WorkPackages::WorkPackageCollectionEagerLoading
element_decorator ::API::V3::WorkPackages::WorkPackageRepresenter
def initialize(models, self_link, current_user:)
super
@represented = full_work_packages(represented)
end
end
end
end