Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 3 deletions

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