diff --git a/app/helpers/conference_helper.rb b/app/helpers/conference_helper.rb index 16a8cbb6..29db24d4 100644 --- a/app/helpers/conference_helper.rb +++ b/app/helpers/conference_helper.rb @@ -79,17 +79,13 @@ module ConferenceHelper end def get_happening_now_events_schedules(conference) - events_schedules = conference.program.selected_event_schedules( - includes: [:room, { event: %i[track event_type speakers submitter] }] - ).select(&:happening_now?) + events_schedules = filter_events_schedules(conference, :happening_now?) events_schedules ||= [] events_schedules end def get_happening_next_events_schedules(conference) - events_schedules = conference.program.selected_event_schedules( - includes: [:room, { event: %i[track event_type speakers submitter] }] - ).select(&:happening_later?) + events_schedules = filter_events_schedules(conference, :happening_later?) if events_schedules.empty? return [] @@ -101,4 +97,12 @@ module ConferenceHelper events_schedules end + + private + + def filter_events_schedules(conference, filter) + conference.program.selected_event_schedules( + includes: [:room, { event: %i[track event_type speakers submitter] }] + ).select(&filter) + end end