Fix plan stage query

Fix plan stage query and the way it is displayed

9 files changed, 204 insertions, 11 deletions

diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb
index 48edc764a8e..4108a0f370d 100644
--- a/spec/features/cycle_analytics_spec.rb
+++ b/spec/features/cycle_analytics_spec.rb
@@ -58,7 +58,7 @@ describe 'Cycle Analytics', :js do
         expect_issue_to_be_present
 
         click_stage('Plan')
-        expect(find('.stage-events')).to have_content(mr.commits.last.title)
+        expect_issue_to_be_present
 
         click_stage('Code')
         expect_merge_request_to_be_present
diff --git a/spec/lib/gitlab/cycle_analytics/code_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/code_stage_spec.rb
index e8fc67acf05..c738cc49c1f 100644
--- a/spec/lib/gitlab/cycle_analytics/code_stage_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/code_stage_spec.rb
@@ -4,5 +4,41 @@ require 'lib/gitlab/cycle_analytics/shared_stage_spec'
 describe Gitlab::CycleAnalytics::CodeStage do
   let(:stage_name) { :code }
 
+  let(:project) { create(:project) }
+  let!(:issue_1) { create(:issue, project: project, created_at: 90.minutes.ago) }
+  let!(:issue_2) { create(:issue, project: project, created_at: 60.minutes.ago) }
+  let!(:issue_3) { create(:issue, project: project, created_at: 60.minutes.ago) }
+  let!(:mr_1) { create(:merge_request, source_project: project, created_at: 15.minutes.ago) }
+  let!(:mr_2) { create(:merge_request, source_project: project, created_at: 10.minutes.ago, source_branch: 'A') }
+  let!(:mr_3) { create(:merge_request, source_project: project, created_at: 10.minutes.ago, source_branch: 'B') }
+  let(:stage) { described_class.new(project: project, options: { from: 2.days.ago, current_user: project.creator }) }
+
+  before do
+    issue_1.metrics.update!(first_associated_with_milestone_at: 60.minutes.ago, first_mentioned_in_commit_at: 45.minutes.ago)
+    issue_2.metrics.update!(first_added_to_board_at: 60.minutes.ago, first_mentioned_in_commit_at: 40.minutes.ago)
+    issue_3.metrics.update!(first_added_to_board_at: 60.minutes.ago, first_mentioned_in_commit_at: 40.minutes.ago)
+    create(:merge_requests_closing_issues, merge_request: mr_1, issue: issue_1)
+    create(:merge_requests_closing_issues, merge_request: mr_2, issue: issue_2)
+  end
+
   it_behaves_like 'base stage'
+
+  describe '#median' do
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    it 'counts median from issues with metrics' do
+      expect(stage.median).to eq(ISSUES_MEDIAN)
+    end
+  end
+
+  describe '#events' do
+    it 'exposes merge requests that closes issues' do
+      result = stage.events
+
+      expect(result.count).to eq(2)
+      expect(result.map { |event| event[:title] }).to contain_exactly(mr_1.title, mr_2.title)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/cycle_analytics/events_spec.rb b/spec/lib/gitlab/cycle_analytics/events_spec.rb
index 397dd4e5d2c..f8b103c0fab 100644
--- a/spec/lib/gitlab/cycle_analytics/events_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/events_spec.rb
@@ -53,20 +53,28 @@ describe 'cycle analytics events' do
   describe '#plan_events' do
     let(:stage) { :plan }
 
-    it 'has a title' do
-      expect(events.first[:title]).not_to be_nil
+    before do
+      create_commit_referencing_issue(context)
     end
 
-    it 'has a sha short ID' do
-      expect(events.first[:short_sha]).not_to be_nil
+    it 'has the total time' do
+      expect(events.first[:total_time]).not_to be_empty
+    end
+
+    it 'has a title' do
+      expect(events.first[:title]).to eq(context.title)
     end
 
     it 'has the URL' do
-      expect(events.first[:commit_url]).not_to be_nil
+      expect(events.first[:url]).not_to be_nil
     end
 
-    it 'has the total time' do
-      expect(events.first[:total_time]).not_to be_empty
+    it 'has an iid' do
+      expect(events.first[:iid]).to eq(context.iid.to_s)
+    end
+
+    it 'has a created_at timestamp' do
+      expect(events.first[:created_at]).to end_with('ago')
     end
 
     it "has the author's URL" do
@@ -78,12 +86,13 @@ describe 'cycle analytics events' do
     end
 
     it "has the author's name" do
-      expect(events.first[:author][:name]).not_to be_nil
+      expect(events.first[:author][:name]).to eq(context.author.name)
     end
   end
 
   describe '#code_events' do
     let(:stage) { :code }
+    let!(:merge_request) { MergeRequest.first }
 
     before do
       create_commit_referencing_issue(context)
@@ -122,6 +131,7 @@ describe 'cycle analytics events' do
     let(:stage) { :test }
 
     let(:merge_request) { MergeRequest.first }
+    let!(:context) { create(:issue, project: project, created_at: 2.days.ago) }
 
     let!(:pipeline) do
       create(:ci_pipeline,
@@ -137,6 +147,7 @@ describe 'cycle analytics events' do
 
       pipeline.run!
       pipeline.succeed!
+      merge_merge_requests_closing_issue(user, project, context)
     end
 
     it 'has the name' do
@@ -180,6 +191,10 @@ describe 'cycle analytics events' do
     let(:stage) { :review }
     let!(:context) { create(:issue, project: project, created_at: 2.days.ago) }
 
+    before do
+      merge_merge_requests_closing_issue(user, project, context)
+    end
+
     it 'has the total time' do
       expect(events.first[:total_time]).not_to be_empty
     end
diff --git a/spec/lib/gitlab/cycle_analytics/issue_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/issue_stage_spec.rb
index 3127f01989d..3b6af9cbaed 100644
--- a/spec/lib/gitlab/cycle_analytics/issue_stage_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/issue_stage_spec.rb
@@ -3,6 +3,37 @@ require 'lib/gitlab/cycle_analytics/shared_stage_spec'
 
 describe Gitlab::CycleAnalytics::IssueStage do
   let(:stage_name) { :issue }
+  let(:project) { create(:project) }
+  let!(:issue_1) { create(:issue, project: project, created_at: 90.minutes.ago) }
+  let!(:issue_2) { create(:issue, project: project, created_at: 60.minutes.ago) }
+  let!(:issue_3) { create(:issue, project: project, created_at: 30.minutes.ago) }
+  let!(:issue_without_milestone) { create(:issue, project: project, created_at: 1.minute.ago) }
+  let(:stage) { described_class.new(project: project, options: { from: 2.days.ago, current_user: project.creator }) }
+
+  before do
+    issue_1.metrics.update!(first_associated_with_milestone_at: 60.minutes.ago )
+    issue_2.metrics.update!(first_added_to_board_at: 30.minutes.ago)
+    issue_3.metrics.update!(first_added_to_board_at: 15.minutes.ago)
+  end
 
   it_behaves_like 'base stage'
+
+  describe '#median' do
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    it 'counts median from issues with metrics' do
+      expect(stage.median).to eq(ISSUES_MEDIAN)
+    end
+  end
+
+  describe '#events' do
+    it 'exposes issues with metrics' do
+      result = stage.events
+
+      expect(result.count).to eq(3)
+      expect(result.map { |event| event[:title] }).to contain_exactly(issue_1.title, issue_2.title, issue_3.title)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/cycle_analytics/plan_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/plan_stage_spec.rb
index 4c715921ad6..506a8160412 100644
--- a/spec/lib/gitlab/cycle_analytics/plan_stage_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/plan_stage_spec.rb
@@ -3,6 +3,37 @@ require 'lib/gitlab/cycle_analytics/shared_stage_spec'
 
 describe Gitlab::CycleAnalytics::PlanStage do
   let(:stage_name) { :plan }
+  let(:project) { create(:project) }
+  let!(:issue_1) { create(:issue, project: project, created_at: 90.minutes.ago) }
+  let!(:issue_2) { create(:issue, project: project, created_at: 60.minutes.ago) }
+  let!(:issue_3) { create(:issue, project: project, created_at: 30.minutes.ago) }
+  let!(:issue_without_milestone) { create(:issue, project: project, created_at: 1.minute.ago) }
+  let(:stage) { described_class.new(project: project, options: { from: 2.days.ago, current_user: project.creator }) }
+
+  before do
+    issue_1.metrics.update!(first_associated_with_milestone_at: 60.minutes.ago, first_mentioned_in_commit_at: 10.minutes.ago)
+    issue_2.metrics.update!(first_added_to_board_at: 30.minutes.ago, first_mentioned_in_commit_at: 20.minutes.ago)
+    issue_3.metrics.update!(first_added_to_board_at: 15.minutes.ago)
+  end
 
   it_behaves_like 'base stage'
+
+  describe '#median' do
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    it 'counts median from issues with metrics' do
+      expect(stage.median).to eq(ISSUES_MEDIAN)
+    end
+  end
+
+  describe '#events' do
+    it 'exposes issues with metrics' do
+      result = stage.events
+
+      expect(result.count).to eq(2)
+      expect(result.map { |event| event[:title] }).to contain_exactly(issue_1.title, issue_2.title)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/cycle_analytics/review_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/review_stage_spec.rb
index 1412c8dfa08..f072a9644e8 100644
--- a/spec/lib/gitlab/cycle_analytics/review_stage_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/review_stage_spec.rb
@@ -3,6 +3,43 @@ require 'lib/gitlab/cycle_analytics/shared_stage_spec'
 
 describe Gitlab::CycleAnalytics::ReviewStage do
   let(:stage_name) { :review }
+  let(:project) { create(:project) }
+  let!(:issue_1) { create(:issue, project: project, created_at: 90.minutes.ago) }
+  let!(:issue_2) { create(:issue, project: project, created_at: 60.minutes.ago) }
+  let!(:issue_3) { create(:issue, project: project, created_at: 60.minutes.ago) }
+  let!(:mr_1) { create(:merge_request, :closed, source_project: project, created_at: 60.minutes.ago) }
+  let!(:mr_2) { create(:merge_request, :closed, source_project: project, created_at: 40.minutes.ago, source_branch: 'A') }
+  let!(:mr_3) { create(:merge_request, source_project: project, created_at: 10.minutes.ago, source_branch: 'B') }
+  let!(:mr_4) { create(:merge_request, source_project: project, created_at: 10.minutes.ago, source_branch: 'C') }
+  let(:stage) { described_class.new(project: project, options: { from: 2.days.ago, current_user: project.creator }) }
+
+  before do
+    mr_1.metrics.update!(merged_at: 30.minutes.ago)
+    mr_2.metrics.update!(merged_at: 10.minutes.ago)
+
+    create(:merge_requests_closing_issues, merge_request: mr_1, issue: issue_1)
+    create(:merge_requests_closing_issues, merge_request: mr_2, issue: issue_2)
+    create(:merge_requests_closing_issues, merge_request: mr_3, issue: issue_3)
+  end
 
   it_behaves_like 'base stage'
+
+  describe '#median' do
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    it 'counts median from issues with metrics' do
+      expect(stage.median).to eq(ISSUES_MEDIAN)
+    end
+  end
+
+  describe '#events' do
+    it 'exposes merge requests that close issues' do
+      result = stage.events
+
+      expect(result.count).to eq(2)
+      expect(result.map { |event| event[:title] }).to contain_exactly(mr_1.title, mr_2.title)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb
index 08425acbfc8..1a4b572cc11 100644
--- a/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 shared_examples 'base stage' do
+  ISSUES_MEDIAN = 30.minutes.to_i
+
   let(:stage) { described_class.new(project: double, options: {}) }
 
   before do
diff --git a/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb
index 8154b3ac701..17d5fbb9733 100644
--- a/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb
@@ -4,5 +4,46 @@ require 'lib/gitlab/cycle_analytics/shared_stage_spec'
 describe Gitlab::CycleAnalytics::StagingStage do
   let(:stage_name) { :staging }
 
+  let(:project) { create(:project) }
+  let!(:issue_1) { create(:issue, project: project, created_at: 90.minutes.ago) }
+  let!(:issue_2) { create(:issue, project: project, created_at: 60.minutes.ago) }
+  let!(:issue_3) { create(:issue, project: project, created_at: 60.minutes.ago) }
+  let!(:mr_1) { create(:merge_request, :closed, source_project: project, created_at: 60.minutes.ago) }
+  let!(:mr_2) { create(:merge_request, :closed, source_project: project, created_at: 40.minutes.ago, source_branch: 'A') }
+  let!(:mr_3) { create(:merge_request, source_project: project, created_at: 10.minutes.ago, source_branch: 'B') }
+  let(:build_1) { create(:ci_build, project: project) }
+  let(:build_2) { create(:ci_build, project: project) }
+
+  let(:stage) { described_class.new(project: project, options: { from: 2.days.ago, current_user: project.creator }) }
+
+  before do
+    mr_1.metrics.update!(merged_at: 80.minutes.ago, first_deployed_to_production_at: 50.minutes.ago, pipeline_id: build_1.commit_id)
+    mr_2.metrics.update!(merged_at: 60.minutes.ago, first_deployed_to_production_at: 30.minutes.ago, pipeline_id: build_2.commit_id)
+    mr_3.metrics.update!(merged_at: 10.minutes.ago, first_deployed_to_production_at: 3.days.ago, pipeline_id: create(:ci_build, project: project).commit_id)
+
+    create(:merge_requests_closing_issues, merge_request: mr_1, issue: issue_1)
+    create(:merge_requests_closing_issues, merge_request: mr_2, issue: issue_2)
+    create(:merge_requests_closing_issues, merge_request: mr_3, issue: issue_3)
+  end
+
   it_behaves_like 'base stage'
+
+  describe '#median' do
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    it 'counts median from issues with metrics' do
+      expect(stage.median).to eq(ISSUES_MEDIAN)
+    end
+  end
+
+  describe '#events' do
+    it 'exposes builds connected to merge request' do
+      result = stage.events
+
+      expect(result.count).to eq(2)
+      expect(result.map { |event| event[:name] }).to contain_exactly(build_1.name, build_2.name)
+    end
+  end
 end
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb
index 49412b628b3..25390f8a23e 100644
--- a/spec/requests/projects/cycle_analytics_events_spec.rb
+++ b/spec/requests/projects/cycle_analytics_events_spec.rb
@@ -32,10 +32,10 @@ describe 'cycle analytics events' do
     it 'lists the plan events' do
       get project_cycle_analytics_plan_path(project, format: :json)
 
-      first_mr_short_sha = project.merge_requests.sort_by_attribute(:created_asc).first.commits.first.short_id
+      first_issue_iid = project.issues.sort_by_attribute(:created_desc).pluck(:iid).first.to_s
 
       expect(json_response['events']).not_to be_empty
-      expect(json_response['events'].first['short_sha']).to eq(first_mr_short_sha)
+      expect(json_response['events'].first['iid']).to eq(first_issue_iid)
     end
 
     it 'lists the code events' do