diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-01 18:06:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-01 18:06:21 +0300 |
commit | ded8ee5a09a1a02209adf179ac7d6e456703726a (patch) | |
tree | c56a789ac38644cb2982f3c2a8277f1e540f5913 /lib/gitlab/cycle_analytics | |
parent | deed6022efe0149d88c57ef1df736c83465643f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/cycle_analytics')
4 files changed, 19 insertions, 12 deletions
diff --git a/lib/gitlab/cycle_analytics/group_stage_summary.rb b/lib/gitlab/cycle_analytics/group_stage_summary.rb index a1fc941495d..26eaaf7df83 100644 --- a/lib/gitlab/cycle_analytics/group_stage_summary.rb +++ b/lib/gitlab/cycle_analytics/group_stage_summary.rb @@ -3,18 +3,17 @@ module Gitlab module CycleAnalytics class GroupStageSummary - attr_reader :group, :from, :current_user, :options + attr_reader :group, :current_user, :options def initialize(group, options:) @group = group - @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, current_user: current_user, options: options)), + serialize(Summary::Group::Deploy.new(group: group, 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 48d8164bde1..f1d20d5aefa 100644 --- a/lib/gitlab/cycle_analytics/summary/group/base.rb +++ b/lib/gitlab/cycle_analytics/summary/group/base.rb @@ -5,11 +5,10 @@ module Gitlab module Summary module Group class Base - attr_reader :group, :from, :options + attr_reader :group, :options - def initialize(group:, from:, options:) + def initialize(group:, options:) @group = group - @from = from @options = options end diff --git a/lib/gitlab/cycle_analytics/summary/group/deploy.rb b/lib/gitlab/cycle_analytics/summary/group/deploy.rb index 78d677cf558..11a9152cf0c 100644 --- a/lib/gitlab/cycle_analytics/summary/group/deploy.rb +++ b/lib/gitlab/cycle_analytics/summary/group/deploy.rb @@ -20,7 +20,8 @@ module Gitlab def find_deployments deployments = Deployment.joins(:project).merge(Project.inside_path(group.full_path)) deployments = deployments.where(projects: { id: options[:projects] }) if options[:projects] - deployments = deployments.where("deployments.created_at > ?", from) + deployments = deployments.where("deployments.created_at > ?", options[:from]) + deployments = deployments.where("deployments.created_at < ?", options[:to]) if options[:to] deployments.success.count end end diff --git a/lib/gitlab/cycle_analytics/summary/group/issue.rb b/lib/gitlab/cycle_analytics/summary/group/issue.rb index 9daae8531d8..4d5ee1d43ca 100644 --- a/lib/gitlab/cycle_analytics/summary/group/issue.rb +++ b/lib/gitlab/cycle_analytics/summary/group/issue.rb @@ -5,11 +5,10 @@ module Gitlab module Summary module Group class Issue < Group::Base - attr_reader :group, :from, :current_user, :options + attr_reader :group, :current_user, :options - def initialize(group:, from:, current_user:, options:) + def initialize(group:, current_user:, options:) @group = group - @from = from @current_user = current_user @options = options end @@ -25,10 +24,19 @@ module Gitlab private def find_issues - issues = IssuesFinder.new(current_user, group_id: group.id, include_subgroups: true, created_after: from).execute + issues = IssuesFinder.new(current_user, finder_params).execute issues = issues.where(projects: { id: options[:projects] }) if options[:projects] issues.count end + + def finder_params + { + group_id: group.id, + include_subgroups: true, + created_after: options[:from], + created_before: options[:to] + }.compact + end end end end |