Add code review remarks

Add cr remarks

Improve specs according to the review

Fix schema

Add cr remarks

Fix naming

Add cr remarks

7 files changed, 24 insertions, 21 deletions

diff --git a/lib/gitlab/cycle_analytics/base_event_fetcher.rb b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
index 0f5186e06e7..07ae430c45e 100644
--- a/lib/gitlab/cycle_analytics/base_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
@@ -4,7 +4,7 @@ module Gitlab
   module CycleAnalytics
     class BaseEventFetcher
       include BaseQuery
-      include BaseDataExtraction
+      include GroupProjectsProvider
 
       attr_reader :projections, :query, :stage, :order, :options
 
diff --git a/lib/gitlab/cycle_analytics/base_stage.rb b/lib/gitlab/cycle_analytics/base_stage.rb
index e641bed704b..1cd54238bb4 100644
--- a/lib/gitlab/cycle_analytics/base_stage.rb
+++ b/lib/gitlab/cycle_analytics/base_stage.rb
@@ -4,7 +4,7 @@ module Gitlab
   module CycleAnalytics
     class BaseStage
       include BaseQuery
-      include BaseDataExtraction
+      include GroupProjectsProvider
 
       attr_reader :options
 
diff --git a/lib/gitlab/cycle_analytics/base_data_extraction.rb b/lib/gitlab/cycle_analytics/group_projects_provider.rb
index deadf47f146..1287a48daaa 100644
--- a/lib/gitlab/cycle_analytics/base_data_extraction.rb
+++ b/lib/gitlab/cycle_analytics/group_projects_provider.rb
@@ -2,11 +2,9 @@
 
 module Gitlab
   module CycleAnalytics
-    module BaseDataExtraction
-      private
-
+    module GroupProjectsProvider
       def projects
-        group ? extract_projects(options) : [project]
+        group ? projects_for_group : [project]
       end
 
       def group
@@ -17,7 +15,9 @@ module Gitlab
         @project ||= options.fetch(:project, nil)
       end
 
-      def extract_projects(options)
+      private
+
+      def projects_for_group
         projects = Project.inside_path(group.full_path)
         projects = projects.where(id: options[:projects]) if options[:projects]
         projects
diff --git a/lib/gitlab/cycle_analytics/group_stage_summary.rb b/lib/gitlab/cycle_analytics/group_stage_summary.rb
index f867d511f65..a1fc941495d 100644
--- a/lib/gitlab/cycle_analytics/group_stage_summary.rb
+++ b/lib/gitlab/cycle_analytics/group_stage_summary.rb
@@ -3,16 +3,18 @@
 module Gitlab
   module CycleAnalytics
     class GroupStageSummary
-      def initialize(group, from:, current_user:, options:)
+      attr_reader :group, :from, :current_user, :options
+
+      def initialize(group, options:)
         @group = group
-        @from = from
-        @current_user = current_user
+        @from = options[:from]
+        @current_user = options[:current_user]
         @options = options
       end
 
       def data
-        [serialize(Summary::Group::Issue.new(group: @group, from: @from, current_user: @current_user, options: @options)),
-         serialize(Summary::Group::Deploy.new(group: @group, from: @from, options: @options))]
+        [serialize(Summary::Group::Issue.new(group: group, from: from, current_user: current_user, options: options)),
+         serialize(Summary::Group::Deploy.new(group: group, from: from, options: options))]
       end
 
       private
diff --git a/lib/gitlab/cycle_analytics/summary/group/base.rb b/lib/gitlab/cycle_analytics/summary/group/base.rb
index d147879ace4..48d8164bde1 100644
--- a/lib/gitlab/cycle_analytics/summary/group/base.rb
+++ b/lib/gitlab/cycle_analytics/summary/group/base.rb
@@ -5,6 +5,8 @@ module Gitlab
     module Summary
       module Group
         class Base
+          attr_reader :group, :from, :options
+
           def initialize(group:, from:, options:)
             @group = group
             @from = from
diff --git a/lib/gitlab/cycle_analytics/summary/group/deploy.rb b/lib/gitlab/cycle_analytics/summary/group/deploy.rb
index ec0b23e770d..1476a5fceb8 100644
--- a/lib/gitlab/cycle_analytics/summary/group/deploy.rb
+++ b/lib/gitlab/cycle_analytics/summary/group/deploy.rb
@@ -5,6 +5,8 @@ module Gitlab
     module Summary
       module Group
         class Deploy < Group::Base
+          include GroupProjectsProvider
+
           def title
             n_('Deploy', 'Deploys', value)
           end
@@ -17,15 +19,10 @@ module Gitlab
 
           def find_deployments
             deployments = Deployment.joins(:project)
-              .where(projects: { id: projects })
-              .where("deployments.created_at > ?", @from)
-            deployments = deployments.where(projects: { id: @options[:projects] }) if @options[:projects]
+              .where(projects: { id: projects.ids })
+              .where("deployments.created_at > ?", from)
             deployments.success.count
           end
-
-          def projects
-            Project.inside_path(@group.full_path).ids
-          end
         end
       end
     end
diff --git a/lib/gitlab/cycle_analytics/summary/group/issue.rb b/lib/gitlab/cycle_analytics/summary/group/issue.rb
index 5df508efa78..9daae8531d8 100644
--- a/lib/gitlab/cycle_analytics/summary/group/issue.rb
+++ b/lib/gitlab/cycle_analytics/summary/group/issue.rb
@@ -5,6 +5,8 @@ module Gitlab
     module Summary
       module Group
         class Issue < Group::Base
+          attr_reader :group, :from, :current_user, :options
+
           def initialize(group:, from:, current_user:, options:)
             @group = group
             @from = from
@@ -23,8 +25,8 @@ module Gitlab
           private
 
           def find_issues
-            issues = IssuesFinder.new(@current_user, group_id: @group.id, include_subgroups: true, created_after: @from).execute
-            issues = issues.where(projects: { id: @options[:projects] }) if @options[:projects]
+            issues = IssuesFinder.new(current_user, group_id: group.id, include_subgroups: true, created_after: from).execute
+            issues = issues.where(projects: { id: options[:projects] }) if options[:projects]
             issues.count
           end
         end