diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/serializers/ci | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/serializers/ci')
4 files changed, 45 insertions, 3 deletions
diff --git a/app/serializers/ci/dag_job_entity.rb b/app/serializers/ci/dag_job_entity.rb index b4947319ed1..ed4d4505152 100644 --- a/app/serializers/ci/dag_job_entity.rb +++ b/app/serializers/ci/dag_job_entity.rb @@ -3,6 +3,7 @@ module Ci class DagJobEntity < Grape::Entity expose :name + expose :scheduling_type expose :needs, if: -> (job, _) { job.scheduling_type_dag? } do |job| job.needs.pluck(:name) # rubocop: disable CodeReuse/ActiveRecord diff --git a/app/serializers/ci/dag_pipeline_entity.rb b/app/serializers/ci/dag_pipeline_entity.rb index b615dd2b194..51aa487ec29 100644 --- a/app/serializers/ci/dag_pipeline_entity.rb +++ b/app/serializers/ci/dag_pipeline_entity.rb @@ -2,12 +2,12 @@ module Ci class DagPipelineEntity < Grape::Entity - expose :ordered_stages_with_preloads, as: :stages, using: Ci::DagStageEntity + expose :stages_with_preloads, as: :stages, using: Ci::DagStageEntity private - def ordered_stages_with_preloads - object.ordered_stages.preload(preloaded_relations) # rubocop: disable CodeReuse/ActiveRecord + def stages_with_preloads + object.stages.preload(preloaded_relations) # rubocop: disable CodeReuse/ActiveRecord end def preloaded_relations diff --git a/app/serializers/ci/daily_build_group_report_result_entity.rb b/app/serializers/ci/daily_build_group_report_result_entity.rb new file mode 100644 index 00000000000..e4118db9b1f --- /dev/null +++ b/app/serializers/ci/daily_build_group_report_result_entity.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Ci + class DailyBuildGroupReportResultEntity < Grape::Entity + expose :date + + ::Ci::DailyBuildGroupReportResult::PARAM_TYPES.each do |type| + expose type, if: lambda { |report_result, options| options[:param_type] == type } do |report_result, options| + report_result.data[options[:param_type]] + end + end + end +end diff --git a/app/serializers/ci/daily_build_group_report_result_serializer.rb b/app/serializers/ci/daily_build_group_report_result_serializer.rb new file mode 100644 index 00000000000..fdc693d01b2 --- /dev/null +++ b/app/serializers/ci/daily_build_group_report_result_serializer.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Ci + class DailyBuildGroupReportResultSerializer < BaseSerializer + entity ::Ci::DailyBuildGroupReportResultEntity + + def represent(resource, opts = {}) + group(resource).map do |group_name, data| + { + group_name: group_name, + data: super(data, opts) + } + end + end + + private + + def group(resource) + collect(resource).group_by(&:group_name) + end + + def collect(resource) + return resource if resource.respond_to?(:group_by) + + [resource] + end + end +end |