Merge pull request #2586 from mroderick/fix/nil-group-by

fix: handle nil paginated in fetch_upcoming_events and fetch_past_events

Author: mroderick

app/controllers/events_controller.rb

@@ -82,7 +82,10 @@ def fetch_upcoming_events
     events << Event.upcoming.includes(:venue, :sponsors, :sponsorships, :permissions).all
 
     sorted = events.compact.flatten.sort_by(&:date_and_time)
+    return [{}, nil] if sorted.empty?
+
     pagy, paginated = pagy(sorted, items: 20)
+    paginated ||= []
 
     grouped = paginated.group_by(&:date)
     decorated = grouped.transform_values { |items| EventPresenter.decorate_collection(items) }
@@ -101,7 +104,10 @@ def fetch_past_events
     events << Event.past.includes(:venue, :sponsors, :sponsorships, :permissions).all
 
     sorted = events.compact.flatten.sort_by(&:date_and_time).reverse
+    return [{}, nil] if sorted.empty?
+
     pagy, paginated = pagy(sorted, items: 20)
+    paginated ||= []
 
     grouped = paginated.group_by(&:date)
     decorated = grouped.transform_values { |items| EventPresenter.decorate_collection(items) }

spec/controllers/events_controller_spec.rb

@@ -0,0 +1,17 @@
+RSpec.describe EventsController do
+  describe '#fetch_upcoming_events' do
+    context 'when no events exist' do
+      it 'returns empty hash and nil pagy' do
+        expect(controller.send(:fetch_upcoming_events)).to eq([{}, nil])
+      end
+    end
+  end
+
+  describe '#fetch_past_events' do
+    context 'when no events exist' do
+      it 'returns empty hash and nil pagy' do
+        expect(controller.send(:fetch_past_events)).to eq([{}, nil])
+      end
+    end
+  end
+end