From 879510bc8c630e6fa71aad73cabf5de549a44612 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Tue, 16 Mar 2021 22:10:37 +0800 Subject: [PATCH] [feat] Endpoint implementation done --- app/controllers/conferences_controller.rb | 5 +---- app/models/conference.rb | 6 +++--- app/models/event.rb | 2 +- config/routes.rb | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index 682f0858..84358357 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -114,10 +114,7 @@ class ConferencesController < ApplicationController def live_events conference = Conference.find_by(short_title: params[:conference_id]) - temp = conference.find_live_events - p "TESTTEST" - p temp.size() - p temp.to_json() + conference.find_live_events.to_json end private diff --git a/app/models/conference.rb b/app/models/conference.rb index 0b9aeded..ef64bf29 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -786,9 +786,9 @@ class Conference < ApplicationRecord def find_live_events live_events = [] - for event in program.events - if event.is_live? - live_events.append(event) + program.events.each do |event| + if event.live? + live_events.append(event) end end live_events diff --git a/app/models/event.rb b/app/models/event.rb index c418b77c..6297b566 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -338,7 +338,7 @@ class Event < ApplicationRecord end def is_live? - time() >= Time.now && Time.now <= time() + event_type.length + time >= Time.now && Time.now <= time + event_type.length end private diff --git a/config/routes.rb b/config/routes.rb index fdbd73b7..c1389d7a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -155,7 +155,7 @@ Osem::Application.routes.draw do end resources :conferences, only: [:index, :show] do get 'live_events', to: 'conferences#live_events' - + resources :booths do member do patch :withdraw