「近日開催のイベント」で、当日の開催時間を過ぎたイベントは非表示にする

app/models/event.rb

@@ -44,6 +44,8 @@ class Event < ApplicationRecord
   scope :wip, -> { where(wip: true) }
   scope :related_to, ->(user) { user.job_seeker ? all : where.not(job_hunting: true) }
   scope :scheduled_on, ->(date) { where(start_at: date.midnight...(date + 1.day).midnight) }
+  scope :not_ended, -> { where('end_at > ?', Time.current) }
+  scope :scheduled_on_without_ended, ->(date) { scheduled_on(date).not_ended }
 
   def opening?
     Time.current.between?(open_start_at, open_end_at)

app/models/regular_event.rb

@@ -58,6 +58,7 @@ class RegularEvent < ApplicationRecord # rubocop:disable Metrics/ClassLength
   scope :participated_by, ->(user) { where(id: all.filter { |e| e.participated_by?(user) }.map(&:id)) }
   scope :organizer_event, ->(user) { where(id: user.organizers.map(&:regular_event_id)) }
   scope :scheduled_on, ->(date) { holding.filter { |event| event.scheduled_on?(date) } }
+  scope :scheduled_on_without_ended, ->(date) { holding.filter { |event| event.scheduled_on?(date) && event.not_ended? } }
 
   belongs_to :user
   has_many :organizers, dependent: :destroy
@@ -77,6 +78,10 @@ def scheduled_on?(date)
     all_scheduled_dates.include?(date)
   end
 
+  def not_ended?
+    Time.current.strftime('%H:%M') < end_at.strftime('%H:%M')
+  end
+
   def next_event_date
     event_dates =
       hold_national_holiday ? upcoming_scheduled_dates : upcoming_scheduled_dates.reject { |d| HolidayJp.holiday?(d) }

app/models/upcoming_event.rb

@@ -86,7 +86,7 @@ def date_key_to_date_class(date_key)
 
     def original_events_scheduled_on(date)
       [Event, RegularEvent].map do |model|
-        model.public_send(:scheduled_on, date)
+        model.public_send(:scheduled_on_without_ended, date)
       end.flatten
     end
   end

test/fixtures/events.yml

@@ -191,3 +191,25 @@ event34:
   open_start_at: 2024-02-26 10:00
   open_end_at: 2024-03-26 09:00
   user: kimura
+
+event35:
+  title: "2024/12/1(日)9:00〜12:00開催の特別イベント"
+  description: "本日開催でまだ終了時刻を迎えていない特別イベントの表示テスト用"
+  location: "FJORDオフィス"
+  capacity: 40
+  start_at: <%= Time.zone.local(2024, 12, 1, 9, 0, 0) %>
+  end_at: <%= Time.zone.local(2024, 12, 1, 12, 0, 0) %>
+  open_start_at: <%= Time.zone.local(2024, 11, 1, 9, 0, 0) %>
+  open_end_at: <%= Time.zone.local(2024, 12, 1, 9, 0, 0) %>
+  user: kimura
+
+event36:
+  title: "2024/12/1(日)6:00〜7:00開催の特別イベント"
+  description: "本日開催で終了時刻を過ぎた特別イベントの表示テスト用"
+  location: "FJORDオフィス"
+  capacity: 40
+  start_at: <%= Time.zone.local(2024, 12, 1, 6, 0, 0) %>
+  end_at: <%= Time.zone.local(2024, 12, 1, 7, 0, 0) %>
+  open_start_at: <%= Time.zone.local(2024, 11, 1, 6, 0, 0) %>
+  open_end_at: <%= Time.zone.local(2024, 12, 1, 6, 0, 0) %>
+  user: kimura

test/fixtures/regular_event_repeat_rules.yml

@@ -99,3 +99,13 @@ regular_event_repeat_rule37:
   frequency: 1
   day_of_the_week: 6
   regular_event: regular_event33
+
+regular_event_repeat_rule38:
+  frequency: 0
+  day_of_the_week: 0
+  regular_event: regular_event36
+
+regular_event_repeat_rule39:
+  frequency: 0
+  day_of_the_week: 0
+  regular_event: regular_event37

test/fixtures/regular_events.yml

@@ -187,3 +187,23 @@ regular_event35:
   user: komagata
   category: 0
   published_at: "2023-08-01 00:00:00"
+
+regular_event36:
+  title: 本日開催でまだ終了時刻を迎えていない定期イベント
+  description: 本日開催でまだ終了時刻を迎えていない定期イベントの表示テスト用
+  finished: false
+  hold_national_holiday: false
+  start_at: <%= Time.zone.local(2024, 12, 1, 9, 0, 0) %>
+  end_at: <%= Time.zone.local(2024, 12, 1, 12, 0, 0) %>
+  user: komagata
+  published_at: "2024-12-01 00:00:00"
+
+regular_event37:
+  title: 本日開催で終了時刻を過ぎた定期イベント
+  description: 本日開催で終了時刻を過ぎた定期イベントの表示テスト用
+  finished: false
+  hold_national_holiday: false
+  start_at: <%= Time.zone.local(2024, 12, 1, 9, 0, 0) %>
+  end_at: <%= Time.zone.local(2024, 12, 1, 10, 0, 0) %>
+  user: komagata
+  published_at: "2024-12-01 00:00:00"

test/models/event_test.rb

@@ -4,7 +4,7 @@
 
 class EventTest < ActiveSupport::TestCase
   test '.scheduled_on(date)' do
-    travel_to Time.zone.local(2017, 4, 3, 10, 0, 0) do
+    travel_to Time.zone.local(2017, 4, 3, 8, 0, 0) do
       today_date = Time.zone.today
       today_events_count = 2
       today_events = Event.scheduled_on(today_date)
@@ -135,4 +135,20 @@ class EventTest < ActiveSupport::TestCase
     assert 994_018_171, ids
     assert 205_042_674, ids
   end
+
+  test 'Events in progress today should be displayed' do
+    travel_to Time.zone.local(2024, 12, 1, 10, 0, 0) do
+      today_date = Time.zone.today
+      events = Event.scheduled_on_without_ended(today_date)
+      assert_includes events, events(:event35)
+    end
+  end
+
+  test 'Events that have already ended today should not be displayed' do
+    travel_to Time.zone.local(2024, 12, 1, 10, 0, 0) do
+      today_date = Time.zone.today
+      events = Event.scheduled_on_without_ended(today_date)
+      assert_not_includes events, events(:event36)
+    end
+  end
 end

test/models/regular_event_test.rb

@@ -154,4 +154,20 @@ class RegularEventTest < ActiveSupport::TestCase
       assert_equal 157, participated_regular_events.count
     end
   end
+
+  test 'Regular event in progress today should be displayed' do
+    travel_to Time.zone.local(2024, 12, 1, 10, 0, 0) do
+      today_date = Time.zone.today
+      regular_event = RegularEvent.scheduled_on_without_ended(today_date)
+      assert_includes regular_event, regular_events(:regular_event36)
+    end
+  end
+
+  test 'Regular event that have already ended today should not be displayed' do
+    travel_to Time.zone.local(2024, 12, 1, 10, 0, 0) do
+      today_date = Time.zone.today
+      regular_event = RegularEvent.scheduled_on_without_ended(today_date)
+      assert_not_includes regular_event, regular_events(:regular_event37)
+    end
+  end
 end

test/models/upcoming_event_test.rb

@@ -10,7 +10,7 @@ class UpcomingEventTest < ActiveSupport::TestCase
 
   # not testing '.build_group' because this method is used in '.upcoming_events_grpups'.
   test '.upcoming_events_groups' do
-    travel_to Time.zone.local(2017, 4, 3, 10, 0, 0) do
+    travel_to Time.zone.local(2017, 4, 3, 8, 0, 0) do
       today_events = [
         events(:event27),
         events(:event33),

test/system/events_test.rb

@@ -532,7 +532,7 @@ class EventsTest < ApplicationSystemTestCase
     today_events_count = 5
     tomorrow_events_count = 2
     day_after_tomorrow_events_count = 4
-    travel_to Time.zone.local(2017, 4, 3, 10, 0, 0) do
+    travel_to Time.zone.local(2017, 4, 3, 8, 0, 0) do
       visit_with_auth events_path, 'komagata'
       within('.upcoming_events_groups') do
         assert_text '近日開催のイベント'

test/system/home_test.rb

@@ -217,7 +217,7 @@ class HomeTest < ApplicationSystemTestCase
   end
 
   test 'show all regular events and special events on dashbord' do
-    travel_to Time.zone.local(2017, 4, 3, 10, 0, 0) do
+    travel_to Time.zone.local(2017, 4, 3, 8, 0, 0) do
       visit_with_auth '/', 'kimura'
       today_event_label = find('.card-list__label', text: '今日開催')
       tomorrow_event_label = find('.card-list__label', text: '明日開催')

test/system/regular_events_test.rb

@@ -196,7 +196,7 @@ class RegularEventsTest < ApplicationSystemTestCase
 
   test 'show listing not finished regular events' do
     visit_with_auth regular_events_path(target: 'not_finished'), 'kimura'
-    assert_selector '.card-list.a-card .card-list-item', count: 17
+    assert_selector '.card-list.a-card .card-list-item', count: 19
   end
 
   test 'show listing all regular events' do
@@ -369,7 +369,7 @@ class RegularEventsTest < ApplicationSystemTestCase
     today_events_count = 5
     tomorrow_events_count = 2
     day_after_tomorrow_events_count = 4
-    travel_to Time.zone.local(2017, 4, 3, 10, 0, 0) do
+    travel_to Time.zone.local(2017, 4, 3, 8, 0, 0) do
       visit_with_auth events_path, 'komagata'
       within('.upcoming_events_groups') do
         assert_text '近日開催のイベント'