Add latest changes from gitlab-org/gitlab@master

1 files changed, 30 insertions, 51 deletions

diff --git a/lib/gitlab/ci/charts.rb b/lib/gitlab/ci/charts.rb
index 3fbfdffe277..25fb9c0ca97 100644
--- a/lib/gitlab/ci/charts.rb
+++ b/lib/gitlab/ci/charts.rb
@@ -3,38 +3,8 @@
 module Gitlab
   module Ci
     module Charts
-      module DailyInterval
-        # rubocop: disable CodeReuse/ActiveRecord
-        def grouped_count(query)
-          query
-            .group("DATE(#{::Ci::Pipeline.table_name}.created_at)")
-            .count(:created_at)
-            .transform_keys { |date| date.strftime(@format) } # rubocop:disable Gitlab/ModuleWithInstanceVariables
-        end
-        # rubocop: enable CodeReuse/ActiveRecord
-
-        def interval_step
-          @interval_step ||= 1.day
-        end
-      end
-
-      module MonthlyInterval
-        # rubocop: disable CodeReuse/ActiveRecord
-        def grouped_count(query)
-          query
-            .group("to_char(#{::Ci::Pipeline.table_name}.created_at, '01 Month YYYY')")
-            .count(:created_at)
-            .transform_keys(&:squish)
-        end
-        # rubocop: enable CodeReuse/ActiveRecord
-
-        def interval_step
-          @interval_step ||= 1.month
-        end
-      end
-
       class Chart
-        attr_reader :labels, :total, :success, :project, :pipeline_times
+        attr_reader :from, :to, :labels, :total, :success, :project, :pipeline_times
 
         def initialize(project)
           @labels = []
@@ -46,48 +16,59 @@ module Gitlab
           collect
         end
 
+        private
+
+        attr_reader :interval
+
         # rubocop: disable CodeReuse/ActiveRecord
         def collect
           query = project.all_pipelines
-            .where("? > #{::Ci::Pipeline.table_name}.created_at AND #{::Ci::Pipeline.table_name}.created_at > ?", @to, @from) # rubocop:disable GitlabSecurity/SqlInjection
+            .where(::Ci::Pipeline.arel_table['created_at'].gteq(@from))
+            .where(::Ci::Pipeline.arel_table['created_at'].lteq(@to))
 
           totals_count  = grouped_count(query)
           success_count = grouped_count(query.success)
 
           current = @from
-          while current < @to
-            label = current.strftime(@format)
-
-            @labels  << label
-            @total   << (totals_count[label] || 0)
-            @success << (success_count[label] || 0)
+          while current <= @to
+            @labels  << current.strftime(@format)
+            @total   << (totals_count[current] || 0)
+            @success << (success_count[current] || 0)
 
             current += interval_step
           end
         end
         # rubocop: enable CodeReuse/ActiveRecord
+
+        # rubocop: disable CodeReuse/ActiveRecord
+        def grouped_count(query)
+          query
+            .group("date_trunc('#{interval}', #{::Ci::Pipeline.table_name}.created_at)")
+            .count(:created_at)
+        end
+        # rubocop: enable CodeReuse/ActiveRecord
+
+        def interval_step
+          @interval_step ||= 1.public_send(interval) # rubocop: disable GitlabSecurity/PublicSend
+        end
       end
 
       class YearChart < Chart
-        include MonthlyInterval
-        attr_reader :to, :from
-
         def initialize(*)
           @to     = Date.today.end_of_month.end_of_day
-          @from   = @to.years_ago(1).beginning_of_month.beginning_of_day
-          @format = '%d %B %Y'
+          @from   = (@to - 1.year).beginning_of_month.beginning_of_day
+          @interval = :month
+          @format = '%B %Y'
 
           super
         end
       end
 
       class MonthChart < Chart
-        include DailyInterval
-        attr_reader :to, :from
-
         def initialize(*)
           @to     = Date.today.end_of_day
-          @from   = 1.month.ago.beginning_of_day
+          @from   = (@to - 1.month).beginning_of_day
+          @interval = :day
           @format = '%d %B'
 
           super
@@ -95,12 +76,10 @@ module Gitlab
       end
 
       class WeekChart < Chart
-        include DailyInterval
-        attr_reader :to, :from
-
         def initialize(*)
           @to     = Date.today.end_of_day
-          @from   = 1.week.ago.beginning_of_day
+          @from   = (@to - 1.week).beginning_of_day
+          @interval = :day
           @format = '%d %B'
 
           super