From 034313cccbfa4ceeda9dc27269f3a0052d6f7b90 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Wed, 17 Mar 2021 07:34:42 +0800 Subject: [PATCH] [fix] live_events return json; use the provided happening_now? function --- app/controllers/conferences_controller.rb | 2 +- app/models/conference.rb | 8 +------- app/models/event.rb | 4 ---- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index 84358357..fc257b96 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -114,7 +114,7 @@ class ConferencesController < ApplicationController def live_events conference = Conference.find_by(short_title: params[:conference_id]) - conference.find_live_events.to_json + render json: conference.find_live_events.to_json end private diff --git a/app/models/conference.rb b/app/models/conference.rb index ef64bf29..8eca5854 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -785,13 +785,7 @@ class Conference < ApplicationRecord end def find_live_events - live_events = [] - program.events.each do |event| - if event.live? - live_events.append(event) - end - end - live_events + program.events.select(&:happening_now?) end private diff --git a/app/models/event.rb b/app/models/event.rb index c17553d8..ba04ba20 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -337,10 +337,6 @@ class Event < ApplicationRecord time <=> other.time end - def live? - time >= Time.now && Time.now <= time + event_type.length - end - private ##