Merge pull request #5204 from rubyforgood/5193-event-filters

5193: Fix eventable filter to be across all time

Author: cielf

app/controllers/events_controller.rb

@@ -3,15 +3,14 @@ def index
     setup_date_range_picker
 
     @events = Event.for_organization(current_organization)
-      .during(helpers.selected_range)
       .includes(:eventable, :user)
     @events = if params[:eventable_id]
       @events.where(eventable_id: params[:eventable_id],
         eventable_type: params[:eventable_type])
     else
       @events.class_filter(filter_params)
     end
-    if params.dig(:filters, :date_range).present?
+    if params.dig(:filters, :date_range).present? || params[:eventable_id].blank?
       @events = @events.during(helpers.selected_range)
     end
     @items = current_organization.items.sort_by(&:name)

spec/requests/events_requests_spec.rb

@@ -195,9 +195,9 @@
         let(:params) {
           {
             format: "html",
-            filters: {filters: {
+            filters: {
               date_range: date_range_picker_params(3.days.ago, Time.zone.tomorrow)
-            }}
+            }
           }
         }
 
@@ -219,9 +219,12 @@
         end
         let(:params) { {format: "html", eventable_id: donation.id, eventable_type: "Donation"} }
         before do
-          DonationEvent.publish(donation)
-          donation.line_items.first.quantity = 33
-          DonationEvent.publish(donation) # an update
+          # should not be affected by the date range
+          travel(-1.year) do
+            DonationEvent.publish(donation)
+            donation.line_items.first.quantity = 33
+            DonationEvent.publish(donation) # an update
+          end
         end
 
         it "should only show events from that eventable" do