[feat] Use existing #happening_now method; respond to both html and json requests

app/controllers/conferences_controller.rb

@@ -112,11 +112,6 @@ class ConferencesController < ApplicationController
     end
   end
 
-  def live_events
-    conference = Conference.find_by(short_title: params[:conference_id])
-    render json: conference.find_live_events.to_json
-  end
-
   private
 
   def conference_finder_conditions

app/controllers/schedules_controller.rb

@@ -72,6 +72,11 @@ class SchedulesController < ApplicationController
     ).select(&:happening_now?)
     @events_schedules = [] unless @events_schedules
     @current_time = Time.now.in_time_zone(@conference.timezone)
+
+    respond_to do |format|
+      format.html
+      format.json { render json: @events_schedules.to_json }
+    end
   end
 
   def app

app/models/conference.rb

@@ -784,10 +784,6 @@ class Conference < ApplicationRecord
     end_date < Time.current
   end
 
-  def find_live_events
-    program.events.select(&:happening_now?)
-  end
-
   private
 
   # Returns a different html colour for every i and consecutive colors are

config/routes.rb

@@ -154,8 +154,6 @@ Osem::Application.routes.draw do
     end
   end
   resources :conferences, only: [:index, :show] do
-    get 'live_events', to: 'conferences#live_events'
-
     resources :booths do
       member do
         patch :withdraw

spec/controllers/conferences_controller_spec.rb

@@ -48,5 +48,4 @@ describe ConferencesController do
       expect(response.response_code).to eq(200)
     end
   end
-
 end