diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2016-09-13 21:43:25 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-09-16 14:38:59 -0500 |
commit | a147b43dcce7da64512efed392041c37ef45851c (patch) | |
tree | 65bc121dbcc8e5c7fe3d3add1dbbcbc00859a407 /lib/gitlab/contributions_calendar.rb | |
parent | 1c2aa4f879bdcbfca6c2dd5e52ec486f9995801b (diff) | |
download | gitlab-ce-a147b43dcce7da64512efed392041c37ef45851c.tar.gz |
Replace contributions calendar timezone payload with dates
Diffstat (limited to 'lib/gitlab/contributions_calendar.rb')
-rw-r--r-- | lib/gitlab/contributions_calendar.rb | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb index bd681f03173..b164f5a2eea 100644 --- a/lib/gitlab/contributions_calendar.rb +++ b/lib/gitlab/contributions_calendar.rb @@ -1,16 +1,16 @@ module Gitlab class ContributionsCalendar - attr_reader :timestamps, :projects, :user + attr_reader :activity_dates, :projects, :user def initialize(projects, user) @projects = projects @user = user end - def timestamps - return @timestamps if @timestamps.present? + def activity_dates + return @activity_dates if @activity_dates.present? - @timestamps = {} + @activity_dates = {} date_from = 1.year.ago events = Event.reorder(nil).contributions.where(author_id: user.id). @@ -19,18 +19,17 @@ module Gitlab select('date(created_at) as date, count(id) as total_amount'). map(&:attributes) - dates = (1.year.ago.to_date..Date.today).to_a + activity_dates = (1.year.ago.to_date..Date.today).to_a - dates.each do |date| - date_id = date.to_time.to_i.to_s + activity_dates.each do |date| day_events = events.find { |day_events| day_events["date"] == date } if day_events - @timestamps[date_id] = day_events["total_amount"] + @activity_dates[date] = day_events["total_amount"] end end - @timestamps + @activity_dates end def events_by_date(date) |