From 871457f65bbf5afd40ef9f9daf5a7ca3b70cea4e Mon Sep 17 00:00:00 2001
From: Jimmy <jimmyxu1997@berkeley.edu>
Date: Wed, 17 Mar 2021 21:02:35 +0800
Subject: [PATCH] [feat] Use existing #happening_now method; respond to both
 html and json requests

---
 app/controllers/conferences_controller.rb       | 5 -----
 app/controllers/schedules_controller.rb         | 5 +++++
 app/models/conference.rb                        | 4 ----
 config/routes.rb                                | 2 --
 spec/controllers/conferences_controller_spec.rb | 1 -
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index fc257b96..02d869f4 100644
--- a/app/controllers/conferences_controller.rb
+++ b/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
diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb
index 230cda2f..ae8a011a 100644
--- a/app/controllers/schedules_controller.rb
+++ b/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
diff --git a/app/models/conference.rb b/app/models/conference.rb
index 8eca5854..e9a0fa23 100644
--- a/app/models/conference.rb
+++ b/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
diff --git a/config/routes.rb b/config/routes.rb
index c1389d7a..e2332ce2 100644
--- a/config/routes.rb
+++ b/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
diff --git a/spec/controllers/conferences_controller_spec.rb b/spec/controllers/conferences_controller_spec.rb
index c9a17d14..f6c81de4 100644
--- a/spec/controllers/conferences_controller_spec.rb
+++ b/spec/controllers/conferences_controller_spec.rb
@@ -48,5 +48,4 @@ describe ConferencesController do
       expect(response.response_code).to eq(200)
     end
   end
-
 end