gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now?

Browse source
This commit is contained in:
Jimmy 2021-03-31 07:45:26 +08:00
parent bfc39fdbe4
commit 0ede07dfaa
3 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/models/event_schedule.rb
View file

@ -57,8 +57,15 @@ class EventSchedule < ApplicationRecord
def happening_now?(threshold = 30.minutes)
return false if end_time < Time.now
event_time_range = start_time..end_time
now_range = (Time.now - threshold)..(Time.now + threshold)
# 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
begin_range = Time.now - threshold
end_range = Time.now + threshold
event_time_range = in_tz_start..in_tz_end
now_range = begin_range..end_range
event_time_range.overlaps?(now_range)
end