A platform for community discussion. Free, open, simple.
FIX: Upcoming Events filter count (#38769)
Bannon Tannered1938a69105
diff --git a/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb b/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rbindex 249a449fcb7..ec78d0d5f43 100644--- a/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb+++ b/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb@@ -193,6 +193,7 @@ module DiscoursePostEvent:category_id,:include_subcategories,:include_interested,+ :include_ongoing,:limit,:attending_user,:before,diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjsindex 8ad79ee6233..3563384de37 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs@@ -21,6 +21,7 @@ export default class CategoryCalendar extends Component {const params = {after: info.startStr,before: info.endStr,+ include_ongoing: true,category_id: this.category.id,include_subcategories: true,};diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjsindex 575d8fa7a77..331b46060ce 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjs@@ -54,6 +54,7 @@ export default class UpcomingEventsCalendar extends Component {const events = await this.discoursePostEventService.fetchEvents({after: info.startStr,before: info.endStr,+ include_ongoing: true,attending_user: this.args.mine ? this.currentUser?.username : null,});diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjsindex 867d1e4698b..3db43c4eda8 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs@@ -104,8 +104,8 @@ export default class UpcomingEventsList extends Component {const data = {limit: this.count,before: moment().add(this.upcomingDays, "days").toISOString(),- // this enables showing ongoing multi-day events that started in the past but haven't ended yet- after: moment().subtract(30, "days").toISOString(),+ after: moment().toISOString(),+ include_ongoing: true,};if (this.includeSubcategories) {diff --git a/plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb b/plugins/discourse-calendar/lib/discourse_post_event/event_finder.rbindex b23a36fdf29..1faee14f562 100644--- a/plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb+++ b/plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb@@ -28,13 +28,13 @@ module DiscoursePostEvent.merge(topics.or(pms)).joins(latest_event_date_join).select(- "discourse_post_event_events.*, latest_event_dates.starts_at, latest_event_dates.finished_at",+ "discourse_post_event_events.*, latest_event_dates.starts_at, latest_event_dates.ends_at, latest_event_dates.finished_at",).where("(discourse_post_event_events.recurrence IS NOT NULL) OR (latest_event_dates.starts_at IS NOT NULL) OR (discourse_post_event_events.original_starts_at IS NOT NULL)",).group(- "discourse_post_event_events.id, latest_event_dates.starts_at, latest_event_dates.finished_at",+ "discourse_post_event_events.id, latest_event_dates.starts_at, latest_event_dates.ends_at, latest_event_dates.finished_at",)end@@ -44,6 +44,7 @@ module DiscoursePostEventSELECT DISTINCT ON (event_id)event_id,starts_at,+ ends_at,finished_atFROM discourse_calendar_post_event_datesORDER BY event_id, #{DiscoursePostEvent::EventDate.current_ordering_sql}@@ -103,9 +104,11 @@ module DiscoursePostEventbefore_date = params[:before] == "now" ? Time.current : params[:before]&.to_datetimeafter_date = params[:after] == "now" ? Time.current : params[:after]&.to_datetime+ include_ongoing = params[:include_ongoing].present?recurring_scope = build_recurring_date_scope(after_date, before_date)- non_recurring_scope = build_non_recurring_date_scope(after_date, before_date)+ non_recurring_scope =+ build_non_recurring_date_scope(after_date, before_date, include_ongoing:)# Apply the combined scope using OR logicevents.merge(recurring_scope.or(non_recurring_scope))@@ -134,9 +137,20 @@ module DiscoursePostEventscopeend- def self.build_non_recurring_date_scope(after_date, before_date)+ def self.build_non_recurring_date_scope(after_date, before_date, include_ongoing: false)scope = DiscoursePostEvent::Event.where(recurrence: nil)- scope = scope.where("latest_event_dates.starts_at >= ?", after_date) if after_date+ if after_date+ if include_ongoing+ scope =+ scope.where(+ "latest_event_dates.starts_at >= ? OR (latest_event_dates.ends_at IS NOT NULL AND latest_event_dates.ends_at >= ?)",+ after_date,+ after_date,+ )+ else+ scope = scope.where("latest_event_dates.starts_at >= ?", after_date)+ end+ endscope = scope.where("latest_event_dates.starts_at < ?", before_date) if before_datescopeenddiff --git a/plugins/discourse-calendar/spec/lib/discourse_post_event/event_finder_spec.rb b/plugins/discourse-calendar/spec/lib/discourse_post_event/event_finder_spec.rbindex 5800a5b6648..f5eb6840625 100644--- a/plugins/discourse-calendar/spec/lib/discourse_post_event/event_finder_spec.rb+++ b/plugins/discourse-calendar/spec/lib/discourse_post_event/event_finder_spec.rb@@ -233,6 +233,78 @@ describe DiscoursePostEvent::EventFinder doendend+ describe "with include_ongoing" do+ fab!(:past_event) do+ Fabricate(:event, original_starts_at: 2.hours.ago, original_ends_at: 1.hour.ago)+ end+ fab!(:ongoing_event) do+ Fabricate(:event, original_starts_at: 2.hours.ago, original_ends_at: 2.hours.from_now)+ end+ fab!(:future_event) do+ Fabricate(:event, original_starts_at: 2.hours.from_now, original_ends_at: 3.hours.from_now)+ end++ it "includes events that started in the past but have not ended yet" do+ results = finder.search(current_user, { after: "now", include_ongoing: "true" })+ expect(results).not_to include(past_event)+ expect(results).to include(ongoing_event)+ expect(results).to include(future_event)+ end++ it "does not include ongoing events without the flag" do+ results = finder.search(current_user, { after: "now" })+ expect(results).not_to include(past_event)+ expect(results).not_to include(ongoing_event)+ expect(results).to include(future_event)+ end++ it "includes multi-month spanning events when viewing later months" do+ freeze_time DateTime.parse("2025-06-15 12:00")++ spanning_event =+ Fabricate(+ :event,+ original_starts_at: Time.parse("2025-03-01 09:00"),+ original_ends_at: Time.parse("2025-12-01 17:00"),+ )++ results =+ finder.search(+ current_user,+ {+ after: Time.parse("2025-06-01 00:00").to_s,+ before: Time.parse("2025-07-01 00:00").to_s,+ include_ongoing: "true",+ },+ )++ expect(results).to include(spanning_event)+ end++ it "does not include multi-month spanning events that have already ended" do+ freeze_time DateTime.parse("2025-06-15 12:00")++ ended_spanning_event =+ Fabricate(+ :event,+ original_starts_at: Time.parse("2025-01-01 09:00"),+ original_ends_at: Time.parse("2025-05-01 17:00"),+ )++ results =+ finder.search(+ current_user,+ {+ after: Time.parse("2025-06-01 00:00").to_s,+ before: Time.parse("2025-07-01 00:00").to_s,+ include_ongoing: "true",+ },+ )++ expect(results).not_to include(ended_spanning_event)+ end+ end+describe "expired events" dolet!(:expired_event) doFabricate(:event, original_starts_at: 2.hours.ago, original_ends_at: 1.hour.ago)