Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Only load EXDATEs for cancelled events, not all

Klaus Zandersa82ab6849994
diff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rb
index e4d60247059..15c06becb7a 100644
--- a/modules/meeting/app/services/meetings/icalendar_builder.rb
+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb
@@ -173,11 +173,11 @@ module Meetings
def preload_for_recurring_meetings(recurring_meetings:)
@excluded_dates_cache = ScheduledMeeting
+ .cancelled
.where(recurring_meeting: recurring_meetings)
.group(:recurring_meeting_id)
.pluck(:recurring_meeting_id, "array_agg(start_time)")
.to_h
- .transform_values { |dates| dates.map { |date| ical_datetime(date) } }
@instantiated_occurrences_cache = ScheduledMeeting
.where(recurring_meeting: recurring_meetings)
@@ -297,8 +297,7 @@ module Meetings
.scheduled_meetings
.cancelled
.pluck(:start_time)
- .map { ical_datetime(it, timezone: recurring_meeting.time_zone) }
- end
+ end.map { ical_datetime(it, timezone: recurring_meeting.time_zone) }
end
def upcoming_instantiated_schedules(recurring_meeting)
diff --git a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
index 4c3205da88f..a45db87cfc2 100644
--- a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
+++ b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
@@ -252,6 +252,39 @@ RSpec.describe Meetings::IcalendarBuilder,
meeting.scheduled_meeting
end
+ context "when using the cache" do
+ subject(:builder) { described_class.new(timezone:) }
+
+ before do
+ builder.preload_for_recurring_meetings(recurring_meetings: [recurring_meeting])
+ end
+
+ it "preloads the correct caches" do
+ builder.add_series_event(recurring_meeting:)
+
+ expect(builder.instance_variable_get(:@excluded_dates_cache)).to eq(
+ recurring_meeting.id => [second_occurrence.start_time]
+ )
+
+ expect(builder.instance_variable_get(:@instantiated_occurrences_cache)).to eq(
+ recurring_meeting.id => [third_occurence]
+ )
+
+ expect(builder.instance_variable_get(:@series_cache_loaded)).to be true
+ end
+
+ it "puts the correct EXDATEs in the generated event (REGRESSION: #68068)" do
+ builder.add_series_event(recurring_meeting:)
+
+ parsed_calendar = Icalendar::Calendar.parse(builder.to_ical).first
+ event = parsed_calendar.events.find { |e| e.uid == recurring_meeting.uid }
+
+ expect(event.exdate).not_to be_empty
+ exdate_values = event.exdate.map(&:value)
+ expect(exdate_values).to include(second_occurrence.start_time)
+ end
+ end
+
context "when current user needs to take action" do
subject(:builder) { described_class.new(timezone:, user: user1) }