From 4199530c77145431be66185719d0067802f09710 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Wed, 31 Mar 2021 08:34:04 +0800 Subject: [PATCH] [fix] Fix event_schedule#happening_now? --- app/models/event_schedule.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb index 0a50b31f..036a89f2 100644 --- a/app/models/event_schedule.rb +++ b/app/models/event_schedule.rb @@ -55,13 +55,14 @@ class EventSchedule < ApplicationRecord # True within `threshold` before and after the event. # def happening_now?(threshold = 30.minutes) - return false if end_time < Time.now - # TODO: Save start_time with local timezone info when making an event schedule in_tz_start = start_time.in_time_zone(timezone) in_tz_end = end_time.in_time_zone(timezone) in_tz_start -= in_tz_start.utc_offset in_tz_end -= in_tz_end.utc_offset + + return false if in_tz_end < Time.now + begin_range = Time.now - threshold end_range = Time.now + threshold event_time_range = in_tz_start..in_tz_end