New associations and models: schedule versioning

For the schedule versioning in the admin interface (having multiple possible shcedules) we need to change some models and associations. It has also been create a rake:move_events_attributes task to migrate the data.

User Interface addapted to make use of the introduced associations and models

app/controllers/admin/events_controller.rb

@@ -191,7 +191,7 @@ module Admin
                                     # Set also in proposals controller
                                     :title, :subtitle, :event_type_id, :abstract, :description, :require_registration, :difficulty_level_id,
                                     # Set only in admin/events controller
-                                    :track_id, :state, :language, :start_time, :is_highlight, :max_attendees,
+                                    :track_id, :state, :language, :is_highlight, :max_attendees,
                                     # Not used anymore?
                                     :proposal_additional_speakers, :user, :users_attributes)
     end

app/controllers/api/v1/events_controller.rb

@@ -5,7 +5,7 @@ module Api
       respond_to :json
 
       def index
-        events = Event.includes(:track, :room, :event_type, event_users: :user)
+        events = Event.includes(:track, :event_type, event_users: :user)
 
         if @conference
           events = events.where(program: @conference.program)

app/models/event.rb

@@ -16,9 +16,9 @@ class Event < ActiveRecord::Base
 
   has_many :events_registrations
   has_many :registrations, through: :events_registrations
+  has_many :event_schedules, dependent: :destroy
 
   belongs_to :track
-  belongs_to :room
   belongs_to :difficulty_level
   belongs_to :program
 
@@ -71,11 +71,19 @@ class Event < ActiveRecord::Base
   end
 
   ##
-  # Checkes if the event has a start_time and a room
+  # Checkes if the event has a start_time and a room for the selected schedule if there is any
   # ====Returns
   # * +true+ or +false+
   def scheduled?
-    room.present? && start_time.present?
+    selected_event_schedule.try(:start_time).present? && selected_event_schedule.try(:room).present?
+  end
+
+  ##
+  # Checkes if the event has a start_time and a room for the selected one if there is any.
+  # ====Returns
+  # * +true+ or +false+
+  def unscheduled?
+    state == 'confirmed' && (!selected_event_schedule.try(:start_time).present? || !selected_event_schedule.try(:room).present?)
   end
 
   def registration_possible?
@@ -132,7 +140,7 @@ class Event < ActiveRecord::Base
   def as_json(options)
     json = super(options)
 
-    json[:room_guid] = room.try(:guid)
+    json[:room_guid] = scheduled_room.try(:guid)
     json[:track_color] = track.try(:color) || '#FFFFFF'
     json[:length] = event_type.try(:length) || EventType::LENGTH_STEP
 
@@ -245,7 +253,21 @@ class Event < ActiveRecord::Base
   # Returns end of the event
   #
   def end_time
-    self.start_time + self.event_type.length.minutes
+    self.scheduled_start_time + self.event_type.length.minutes
+  end
+
+  ##
+  # Returns the room in which the event is scheduled
+  #
+  def scheduled_room
+    selected_event_schedule.try(:room)
+  end
+
+  ##
+  # Returns the start time at which this event is scheduled
+  #
+  def scheduled_start_time
+    selected_event_schedule.try(:start_time)
   end
 
   ##
@@ -257,11 +279,16 @@ class Event < ActiveRecord::Base
 
   private
 
+  # returns the event_schedule for this event and for the selected_schedule
+  def selected_event_schedule
+    event_schedules.find_by(schedule_id: program.try(:selected_schedule))
+  end
+
   ##
   # Do not allow, for the event, more attendees than the size of the room
   def max_attendees_no_more_than_room_size
-    return unless room && max_attendees_changed?
-    errors.add(:max_attendees, "cannot be more than the room's capacity (#{room.size})") if max_attendees && (max_attendees > room.size)
+    return unless scheduled_room && max_attendees_changed?
+    errors.add(:max_attendees, "cannot be more than the room's capacity (#{scheduled_room.size})") if max_attendees && (max_attendees > scheduled_room.size)
   end
 
   def abstract_limit

app/models/event_schedule.rb

@@ -0,0 +1,5 @@
+class EventSchedule < ActiveRecord::Base
+  belongs_to :schedule
+  belongs_to :event
+  belongs_to :room
+end

app/models/program.rb

@@ -7,6 +7,7 @@ class Program < ActiveRecord::Base
   has_many :event_types, dependent: :destroy
   has_many :tracks, dependent: :destroy
   has_many :difficulty_levels, dependent: :destroy
+  has_many :schedules, dependent: :destroy
   has_many :events, dependent: :destroy do
     def require_registration
       where(require_registration: true, state: :confirmed)
@@ -26,12 +27,12 @@ class Program < ActiveRecord::Base
       where(state: :confirmed)
     end
 
-    def scheduled
-      where.not(start_time: nil).where.not(room: nil).order(start_time: :asc)
+    def scheduled(schedule_id)
+      joins(:event_schedules).where('event_schedules.schedule_id = ? AND event_schedules.start_time IS NOT NULL AND event_schedules.room_id IS NOT NULL', schedule_id)
     end
 
     def unscheduled
-      confirmed.where('start_time IS NULL OR room_id IS NULL')
+      select(&:unscheduled?)
     end
 
     def highlights

app/models/room.rb

@@ -1,6 +1,6 @@
 class Room < ActiveRecord::Base
   belongs_to :venue
-  has_many :events, dependent: :nullify
+  has_many :event_schedules, dependent: :nullify
 
   before_create :generate_guid
 

app/models/schedule.rb

@@ -0,0 +1,4 @@
+class Schedule < ActiveRecord::Base
+  belongs_to :program
+  has_many :event_schedules, dependent: :destroy
+end

app/serializers/conference_serializer.rb

@@ -22,23 +22,23 @@ class ConferenceSerializer < ActiveModel::Serializer
 
   def rooms
     if object.venue
-      object.venue.rooms.includes(:events).map do |room| { id: room.id,
-                                                           size: room.size,
-                                                           events: room.events.map do |event| { guid: event.title,
-                                                                                                title:  event.title,
-                                                                                                subtitle: event.subtitle,
-                                                                                                abstract: event.abstract,
-                                                                                                description: event.description,
-                                                                                                is_highlight: event.is_highlight,
-                                                                                                require_registration:  event.require_registration,
-                                                                                                start_time: event.start_time,
-                                                                                                event_type_id: event.event_type.id,
-                                                                                                difficulty_level_id: event.difficulty_level_id,
-                                                                                                track_id: event.track_id,
-                                                                                                speaker_names: event.speaker_names
+      object.venue.rooms.map do |room| { id: room.id,
+                                         size: room.size,
+                                         events: room.event_schedules.map do |event_schedule| { guid: event_schedule.event.title,
+                                                                                                title:  event_schedule.event.title,
+                                                                                                subtitle: event_schedule.event.subtitle,
+                                                                                                abstract: event_schedule.event.abstract,
+                                                                                                description: event_schedule.event.description,
+                                                                                                is_highlight: event_schedule.event.is_highlight,
+                                                                                                require_registration:  event_schedule.event.require_registration,
+                                                                                                start_time: event_schedule.start_time,
+                                                                                                event_type_id: event_schedule.event.event_type.id,
+                                                                                                difficulty_level_id: event_schedule.event.difficulty_level_id,
+                                                                                                track_id: event_schedule.event.track_id,
+                                                                                                speaker_names: event_schedule.event.speaker_names
                                                                                               }
-                                                                   end
-                                                         }
+                                                 end
+                                       }
       end
     else
       []

app/serializers/event_schedule_serializer.rb

@@ -0,0 +1,14 @@
+class EventScheduleSerializer < ActiveModel::Serializer
+  include ActionView::Helpers::TextHelper
+
+  attributes :date, :room
+
+  def date
+    t = object.start_time
+    t.blank? ? '' : %( #{I18n.l t, format: :short}#{t.formatted_offset(false)} )
+  end
+
+  def room
+    object.room.try(:guid)
+  end
+end

app/serializers/event_serializer.rb

@@ -1,11 +1,11 @@
 class EventSerializer < ActiveModel::Serializer
   include ActionView::Helpers::TextHelper
 
-  attributes :guid, :title, :length, :date, :language, :abstract, :speaker_ids, :type, :room, :track
+  attributes :guid, :title, :length, :scheduled_date, :language, :abstract, :speaker_ids, :type, :scheduled_room, :track
 
-  def date
-    t = object.start_time
-    t.blank? ? '' : %{ #{I18n.l t, format: :short}#{t.formatted_offset(false)} }
+  def scheduled_date
+    t = object.scheduled_start_time
+    t.blank? ? '' : %( #{I18n.l t, format: :short}#{t.formatted_offset(false)} )
   end
 
   def speaker_ids
@@ -17,8 +17,8 @@ class EventSerializer < ActiveModel::Serializer
     object.event_type.try(:title)
   end
 
-  def room
-    object.room.try(:guid)
+  def scheduled_room
+    object.scheduled_room.try(:guid)
   end
 
   def track

app/views/admin/events/_proposal.html.haml

@@ -106,18 +106,18 @@
           %td
             = @event.language
 
-      - unless @event.room.nil?
+      - unless @event.scheduled_room.nil?
         %tr
           %td
             %b Room
           %td
-            = @event.room.name
-      - unless @event.start_time.nil?
+            = @event.scheduled_room.name
+      - unless @event.scheduled_start_time.nil?
         %tr
           %td
             %b Scheduled time
           %td
-            = @event.start_time
+            = @event.scheduled_start_time
       %tr
         %td
           %b Submitter

app/views/admin/events/registrations.html.haml

@@ -11,7 +11,7 @@
         for
         = @event.title
 
-    - if @event.room && (@event_registrations.length > @event.room.size)
+    - if @event.scheduled_room && (@event_registrations.length > @event.scheduled_room.size)
       %b Attention:
       You have more registrations than the capacity of the room!
 

app/views/admin/tracks/show.html.haml

@@ -27,5 +27,4 @@
             %td
               = event.state
             %td
-              = event.start_time
-
+              = event.scheduled_start_time

app/views/conference/schedule.xml.haml

@@ -19,7 +19,7 @@
                 %date= event.start_time.iso8601
                 %start= event.start_time.strftime('%H:%M')
                 %duration= length_timestamp(event.event_type.length)
-                %room= event.room.name
+                %room= event.scheduled_room.name
                 %type= event.event_type.name
                 %language= ISO_639.find_by_english_name(event.language).third if event.language
                 %slug= "#{event.id} #{event.title}".parameterize

app/views/conference_registrations/_registration_info.html.haml

@@ -11,7 +11,7 @@
         .text-muted
           = registered_text(event)
           - if event.scheduled?
-            (Scheduled on: #{event.start_time.to_date})
+            (Scheduled on: #{event.scheduled_start_time.to_date})
       %br
 
 

app/views/proposal/_proposal_form.html.haml

@@ -49,7 +49,7 @@
 
     = f.inputs 'Enable pre-registration' do
       = f.input :require_registration, label: 'Require participants to register to your event'
-      - message = @event.room ? "Value must be between 1 and #{@event.room.size}" : 'Check room capacity after scheduling.'
+      - message = @event.scheduled_room ? "Value must be between 1 and #{@event.scheduled_room.size}" : 'Check room capacity after scheduling.'
       = f.input :max_attendees, hint: 'The maximum number of participants. ' + message
 
     - if current_user.has_any_role? :admin, { name: :organizer, resource: @conference }, { name: :cfp, resource: @conference }

app/views/proposal/show.html.haml

@@ -67,15 +67,15 @@
         %dl#proposal-info
           .col-md-12
             %dt Date:
-            %dd= @event.start_time.strftime("%Y %B %e %H:%M") if @event.start_time
+            %dd= @event.scheduled_start_time.strftime("%Y %B %e %H:%M") if @event.scheduled_start_time.present?
           .col-md-12
             %dt Duration:
             %dd= show_time(@event.event_type.length)
           .col-md-12
             %dt Room:
             %dd
-              - if @event.room
-                = @event.room.name
+              - if @event.scheduled_room
+                = @event.scheduled_room.name
           .col-md-12
             %dt Conference:
             %dd= @event.program.conference.title