Add current month past events to full calendar

app/controllers/events_controller.rb

@@ -21,10 +21,10 @@ def show
 
   def index
     @projects = Project.active
-    @events = Event.upcoming_events(specified_project)
     respond_to do |format|
-      format.html { @events }
-      format.json { @events }
+      format.html { @events = Event.upcoming_events(specified_project) }
+      format.json { @events = Event.upcoming_events(specified_project)
+                    @scrums = EventInstance.this_month_until_now }
     end
   end
 

app/models/event_instance.rb

@@ -75,6 +75,13 @@ def channels_for_event
     event.slack_channel_codes
   end
 
+  def self.this_month_until_now
+    beginning_of_month = Date.current.at_beginning_of_month
+    EventInstance
+    .where('created_at BETWEEN ? AND ?', beginning_of_month, DateTime.current)
+    .order(created_at: :desc)
+  end
+
   private
 
   def manually_updated_event_not_finished?

app/views/events/index.json.jbuilder

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
-
+date_format = '%Y-%m-%dT%H:%M:%S'
+json.array! @scrums do |scrum|
+  json.title scrum.title
+  json.start scrum.created_at.strftime(date_format)
+  end_time = scrum.created_at + 1800
+  json.end end_time.strftime(date_format)
+end
 json.array! @events do |event|
-  # date_format = event.all_day_event? ? '%Y-%m-%d' : '%Y-%m-%dT%H:%M:%S'
-  date_format = '%Y-%m-%dT%H:%M:%S'
   json.title event[:event].name
   json.start event[:time].strftime(date_format)
   end_time = event[:time] + event[:event].duration * 60