From c08d9c22569d1c9e7c7737e183969593394133d9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 3 Apr 2020 15:09:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/ci/daily_report_result_service.rb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'app/services/ci') diff --git a/app/services/ci/daily_report_result_service.rb b/app/services/ci/daily_report_result_service.rb index 79b5015c076..b774a806203 100644 --- a/app/services/ci/daily_report_result_service.rb +++ b/app/services/ci/daily_report_result_service.rb @@ -19,12 +19,21 @@ module Ci last_pipeline_id: pipeline.id } - pipeline.builds.with_coverage.map do |build| + aggregate(pipeline.builds.with_coverage).map do |group_name, group| base_attrs.merge( - title: build.group_name, - value: build.coverage + title: group_name, + value: average_coverage(group) ) end end + + def aggregate(builds) + builds.group_by(&:group_name) + end + + def average_coverage(group) + total_coverage = group.reduce(0.0) { |sum, build| sum + build.coverage } + (total_coverage / group.size).round(2) + end end end -- cgit v1.2.1