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
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Add preloading for calendar when generating an iCal for all meetings
Klaus Zanders1eefa0c4f614
diff --git a/modules/meeting/app/services/all_meetings/ical_service.rb b/modules/meeting/app/services/all_meetings/ical_service.rbindex 91e6b8b511c..4c536aecfa6 100644--- a/modules/meeting/app/services/all_meetings/ical_service.rb+++ b/modules/meeting/app/services/all_meetings/ical_service.rb@@ -46,8 +46,8 @@ module AllMeetingscalendar.add_single_meeting_event(meeting:, cancelled: false)end- # This generates a lot of subqueries.- # TODO: Optimize this to avoid subqueries.+ calendar.preload_for_recurring_meetings(recurring_meetings: recurring_meetings)+recurring_meetings.each do |recurring_meeting|calendar.add_series_event(recurring_meeting:, cancelled: false)enddiff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rbindex 7120637f111..5184e3c77e4 100644--- a/modules/meeting/app/services/meetings/icalendar_builder.rb+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb@@ -38,6 +38,9 @@ module Meetings@timezone = timezone@calendar = build_icalendar@calendar_timezones = Set.new+ @excluded_dates_cache = {}+ @instantiated_occurrences_cache = {}+ @series_cache_loaded = falseenddef add_single_meeting_event(meeting:, cancelled: false) # rubocop:disable Metrics/AbcSize@@ -130,8 +133,30 @@ module Meetingscalendar.to_icalend+ def preload_for_recurring_meetings(recurring_meetings:)+ @excluded_dates_cache = ScheduledMeeting+ .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)+ .not_cancelled+ .instantiated+ .includes(meeting: [:project], recurring_meeting: [:project])+ .index_by(&:recurring_meeting_id)++ @series_cache_loaded = true+ end+private+ def series_cache_loaded?+ @series_cache_loaded+ end+def build_icalendar::Icalendar::Calendar.new.tap do |calendar|calendar.prodid = "-//OpenProject GmbH//#{OpenProject::VERSION}//Meeting//EN"@@ -189,19 +214,27 @@ module Meetingsenddef set_excluded_recurrence_dates(event:, recurring_meeting:)- event.exdate = recurring_meeting- .scheduled_meetings- .cancelled- .pluck(:start_time)- .map { ical_datetime(it) }+ event.exdate = if series_cache_loaded?+ @excluded_dates_cache[recurring_meeting.id] || []+ else+ recurring_meeting+ .scheduled_meetings+ .cancelled+ .pluck(:start_time)+ .map { ical_datetime(it) }+ endenddef upcoming_instantiated_schedules(recurring_meeting)- recurring_meeting- .scheduled_meetings- .not_cancelled- .instantiated- .includes(meeting: [:project], recurring_meeting: [:project])+ if series_cache_loaded?+ @instantiated_occurrences_cache[recurring_meeting.id] || []+ else+ recurring_meeting+ .scheduled_meetings+ .not_cancelled+ .instantiated+ .includes(meeting: [:project], recurring_meeting: [:project])+ endendendend