Rename files

Rename files from stageBaseQuery to stageHelper as in production stage.

17 files changed, 17 insertions, 27 deletions

diff --git a/lib/gitlab/cycle_analytics/code_event_fetcher.rb b/lib/gitlab/cycle_analytics/code_event_fetcher.rb
index 3292614e4a4..6c348f1862d 100644
--- a/lib/gitlab/cycle_analytics/code_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/code_event_fetcher.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module CycleAnalytics
     class CodeEventFetcher < BaseEventFetcher
-      include CodeBaseQuery
+      include CodeHelper
 
       def initialize(*args)
         @projections = [mr_table[:title],
diff --git a/lib/gitlab/cycle_analytics/code_base_query.rb b/lib/gitlab/cycle_analytics/code_helper.rb
index 5fe057f8943..8f28bdd2502 100644
--- a/lib/gitlab/cycle_analytics/code_base_query.rb
+++ b/lib/gitlab/cycle_analytics/code_helper.rb
@@ -2,7 +2,7 @@
 
 module Gitlab
   module CycleAnalytics
-    module CodeBaseQuery
+    module CodeHelper
       def stage_query(project_ids)
         super(project_ids).where(mr_table[:created_at].gteq(issue_metrics_table[:first_mentioned_in_commit_at]))
       end
diff --git a/lib/gitlab/cycle_analytics/code_stage.rb b/lib/gitlab/cycle_analytics/code_stage.rb
index b6bd08255a9..89a6430221c 100644
--- a/lib/gitlab/cycle_analytics/code_stage.rb
+++ b/lib/gitlab/cycle_analytics/code_stage.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module CycleAnalytics
     class CodeStage < BaseStage
-      include CodeBaseQuery
+      include CodeHelper
 
       def start_time_attrs
         @start_time_attrs ||= issue_metrics_table[:first_mentioned_in_commit_at]
diff --git a/lib/gitlab/cycle_analytics/issue_event_fetcher.rb b/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
index b829d1bfc36..8a870f2e2a3 100644
--- a/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module CycleAnalytics
     class IssueEventFetcher < BaseEventFetcher
-      include IssueBaseQuery
+      include IssueHelper
 
       def initialize(*args)
         @projections = [issue_table[:title],
diff --git a/lib/gitlab/cycle_analytics/issue_base_query.rb b/lib/gitlab/cycle_analytics/issue_helper.rb
index 6dd72bbd7f0..c9266341378 100644
--- a/lib/gitlab/cycle_analytics/issue_base_query.rb
+++ b/lib/gitlab/cycle_analytics/issue_helper.rb
@@ -2,7 +2,7 @@
 
 module Gitlab
   module CycleAnalytics
-    module IssueBaseQuery
+    module IssueHelper
       def stage_query(project_ids)
         query = issue_table.join(issue_metrics_table).on(issue_table[:id].eq(issue_metrics_table[:issue_id]))
           .project(issue_table[:project_id].as("project_id"))
diff --git a/lib/gitlab/cycle_analytics/issue_stage.rb b/lib/gitlab/cycle_analytics/issue_stage.rb
index eb66c0cd7e9..738cb3eba03 100644
--- a/lib/gitlab/cycle_analytics/issue_stage.rb
+++ b/lib/gitlab/cycle_analytics/issue_stage.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module CycleAnalytics
     class IssueStage < BaseStage
-      include IssueBaseQuery
+      include IssueHelper
 
       def start_time_attrs
         @start_time_attrs ||= issue_table[:created_at]
diff --git a/lib/gitlab/cycle_analytics/plan_event_fetcher.rb b/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
index c50ba863768..d924f956dcd 100644
--- a/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module CycleAnalytics
     class PlanEventFetcher < BaseEventFetcher
-      include PlanBaseQuery
+      include PlanHelper
 
       def initialize(*args)
         @projections = [issue_table[:title],
diff --git a/lib/gitlab/cycle_analytics/plan_base_query.rb b/lib/gitlab/cycle_analytics/plan_helper.rb
index d8c11ba4c30..30fc2ce6d40 100644
--- a/lib/gitlab/cycle_analytics/plan_base_query.rb
+++ b/lib/gitlab/cycle_analytics/plan_helper.rb
@@ -2,7 +2,7 @@
 
 module Gitlab
   module CycleAnalytics
-    module PlanBaseQuery
+    module PlanHelper
       def stage_query(project_ids)
         query = issue_table.join(issue_metrics_table).on(issue_table[:id].eq(issue_metrics_table[:issue_id]))
           .project(issue_table[:project_id].as("project_id"))
diff --git a/lib/gitlab/cycle_analytics/plan_stage.rb b/lib/gitlab/cycle_analytics/plan_stage.rb
index b0f4d060235..0b27d114f52 100644
--- a/lib/gitlab/cycle_analytics/plan_stage.rb
+++ b/lib/gitlab/cycle_analytics/plan_stage.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module CycleAnalytics
     class PlanStage < BaseStage
-      include PlanBaseQuery
+      include PlanHelper
 
       def start_time_attrs
         @start_time_attrs ||= [issue_metrics_table[:first_associated_with_milestone_at],
diff --git a/lib/gitlab/cycle_analytics/production_event_fetcher.rb b/lib/gitlab/cycle_analytics/production_event_fetcher.rb
index e12d5f883a7..6bcbe0412a9 100644
--- a/lib/gitlab/cycle_analytics/production_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/production_event_fetcher.rb
@@ -3,6 +3,8 @@
 module Gitlab
   module CycleAnalytics
     class ProductionEventFetcher < BaseEventFetcher
+      include ProductionHelper
+
       def initialize(*args)
         @projections = [issue_table[:title],
                         issue_table[:iid],
diff --git a/lib/gitlab/cycle_analytics/review_event_fetcher.rb b/lib/gitlab/cycle_analytics/review_event_fetcher.rb
index 153683dfe0b..318546eb9a8 100644
--- a/lib/gitlab/cycle_analytics/review_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/review_event_fetcher.rb
@@ -3,7 +3,8 @@
 module Gitlab
   module CycleAnalytics
     class ReviewEventFetcher < BaseEventFetcher
-      include ReviewBaseQuery
+      include ReviewHelper
+
 
       def initialize(*args)
         @projections = [mr_table[:title],
diff --git a/lib/gitlab/cycle_analytics/review_base_query.rb b/lib/gitlab/cycle_analytics/review_helper.rb
index eb22540dce0..c53249652b5 100644
--- a/lib/gitlab/cycle_analytics/review_base_query.rb
+++ b/lib/gitlab/cycle_analytics/review_helper.rb
@@ -2,7 +2,7 @@
 
 module Gitlab
   module CycleAnalytics
-    module ReviewBaseQuery
+    module ReviewHelper
       def stage_query(project_ids)
         super(project_ids).where(mr_metrics_table[:merged_at].not_eq(nil))
       end
diff --git a/lib/gitlab/cycle_analytics/review_stage.rb b/lib/gitlab/cycle_analytics/review_stage.rb
index 38f7288b229..e9df8cd5a05 100644
--- a/lib/gitlab/cycle_analytics/review_stage.rb
+++ b/lib/gitlab/cycle_analytics/review_stage.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module CycleAnalytics
     class ReviewStage < BaseStage
-      include ReviewBaseQuery
+      include ReviewHelper
 
       def start_time_attrs
         @start_time_attrs ||= mr_table[:created_at]
diff --git a/lib/gitlab/cycle_analytics/staging_base_query.rb b/lib/gitlab/cycle_analytics/staging_base_query.rb
deleted file mode 100644
index 49e0ecf11b7..00000000000
--- a/lib/gitlab/cycle_analytics/staging_base_query.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module CycleAnalytics
-    module StagingBaseQuery
-      def stage_query(project_ids)
-        super(project_ids).where(mr_metrics_table[:first_deployed_to_production_at].not_eq(nil))
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/cycle_analytics/staging_event_fetcher.rb b/lib/gitlab/cycle_analytics/staging_event_fetcher.rb
index 7f55b660e0b..4bd58b74515 100644
--- a/lib/gitlab/cycle_analytics/staging_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/staging_event_fetcher.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module CycleAnalytics
     class StagingEventFetcher < BaseEventFetcher
-      include StagingBaseQuery
+      include ProductionHelperexit
 
       def initialize(*args)
         @projections = [build_table[:id]]
diff --git a/lib/gitlab/cycle_analytics/staging_stage.rb b/lib/gitlab/cycle_analytics/staging_stage.rb
index 10c49e4fb40..e03627c6cd1 100644
--- a/lib/gitlab/cycle_analytics/staging_stage.rb
+++ b/lib/gitlab/cycle_analytics/staging_stage.rb
@@ -4,7 +4,6 @@ module Gitlab
   module CycleAnalytics
     class StagingStage < BaseStage
       include ProductionHelper
-      include StagingBaseQuery
 
       def start_time_attrs
         @start_time_attrs ||= mr_metrics_table[:merged_at]
diff --git a/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb
index e4233d44dec..e53426efee9 100644
--- a/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb
@@ -19,9 +19,8 @@ describe Gitlab::CycleAnalytics::StagingStage do
   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)
+    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(:ci_build, project: project)
     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)