summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMałgorzata Ksionek <mksionek@gitlab.com>2019-07-08 10:26:02 +0200
committerMałgorzata Ksionek <mksionek@gitlab.com>2019-07-09 12:16:38 +0200
commitf6423fa468e267d27594c3a0190bc9d2166d0e9c (patch)
tree008bf07f12dcacedadf490c4fffc40cb3a32449c
parent08cf6fccfdac197e6ef10b12a5a9015e7f453ed2 (diff)
downloadgitlab-ce-f6423fa468e267d27594c3a0190bc9d2166d0e9c.tar.gz
Add code review remarks
-rw-r--r--app/models/cycle_analytics/base.rb14
-rw-r--r--app/models/cycle_analytics/project_level.rb2
-rw-r--r--lib/gitlab/cycle_analytics/usage_data.rb2
-rw-r--r--spec/models/cycle_analytics/project_level_spec.rb4
4 files changed, 8 insertions, 14 deletions
diff --git a/app/models/cycle_analytics/base.rb b/app/models/cycle_analytics/base.rb
index 240be10c1f9..d7b28cd1b67 100644
--- a/app/models/cycle_analytics/base.rb
+++ b/app/models/cycle_analytics/base.rb
@@ -4,14 +4,16 @@ module CycleAnalytics
class Base
STAGES = %i[issue plan code test review staging production].freeze
- def all_medians_per_stage
+ def all_medians_by_stage
STAGES.each_with_object({}) do |stage_name, medians_per_stage|
medians_per_stage[stage_name] = self[stage_name].median
end
end
def stats
- @stats ||= stats_per_stage
+ @stats ||= STAGES.map do |stage_name|
+ self[stage_name].as_json
+ end
end
def no_stats?
@@ -21,13 +23,5 @@ module CycleAnalytics
def [](stage_name)
Gitlab::CycleAnalytics::Stage[stage_name].new(project: @project, options: @options)
end
-
- private
-
- def stats_per_stage
- STAGES.map do |stage_name|
- self[stage_name].as_json
- end
- end
end
end
diff --git a/app/models/cycle_analytics/project_level.rb b/app/models/cycle_analytics/project_level.rb
index 93c4b64ba3e..b0812d40ffa 100644
--- a/app/models/cycle_analytics/project_level.rb
+++ b/app/models/cycle_analytics/project_level.rb
@@ -2,7 +2,7 @@
module CycleAnalytics
class ProjectLevel < Base
- def initialize(project:, options:)
+ def initialize(project, options:)
@project = project
@options = options
end
diff --git a/lib/gitlab/cycle_analytics/usage_data.rb b/lib/gitlab/cycle_analytics/usage_data.rb
index 0ff2d34ea44..40b19f6d6e6 100644
--- a/lib/gitlab/cycle_analytics/usage_data.rb
+++ b/lib/gitlab/cycle_analytics/usage_data.rb
@@ -32,7 +32,7 @@ module Gitlab
def medians_per_stage
projects.each_with_object({}) do |project, hsh|
- ::CycleAnalytics::ProjectLevel.new(project: project, options: options).all_medians_per_stage.each do |stage_name, median|
+ ::CycleAnalytics::ProjectLevel.new(project: project, options: options).all_medians_by_stage.each do |stage_name, median|
hsh[stage_name] ||= []
hsh[stage_name] << median
end
diff --git a/spec/models/cycle_analytics/project_level_spec.rb b/spec/models/cycle_analytics/project_level_spec.rb
index 196306fd52a..1b175c89997 100644
--- a/spec/models/cycle_analytics/project_level_spec.rb
+++ b/spec/models/cycle_analytics/project_level_spec.rb
@@ -13,7 +13,7 @@ describe CycleAnalytics::ProjectLevel do
subject { described_class.new(project: project, options: { from: from_date }) }
- describe '#all_medians_per_stage' do
+ describe '#all_medians_by_stage' do
before do
allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue])
@@ -26,7 +26,7 @@ describe CycleAnalytics::ProjectLevel do
hsh[stage_name] = subject[stage_name].median.presence
end
- expect(subject.all_medians_per_stage).to eq(values)
+ expect(subject.all_medians_by_stage).to eq(values)
end
end
end