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

fix generation of a singe occurence

Klaus Zanders1532d548d322
diff --git a/modules/meeting/app/mailers/meeting_mailer.rb b/modules/meeting/app/mailers/meeting_mailer.rb
index ded258c9c69..da367d61f6a 100644
--- a/modules/meeting/app/mailers/meeting_mailer.rb
+++ b/modules/meeting/app/mailers/meeting_mailer.rb
@@ -129,7 +129,7 @@ class MeetingMailer < UserMailer
elsif meeting.recurring?
::RecurringMeetings::ICalService
.new(user:, series: meeting.recurring_meeting)
- .generate_occurrence(meeting, **args)
+ .generate_single_occurence(meeting: meeting, **args)
else
::Meetings::ICalService
.new(user:, meeting:)
diff --git a/modules/meeting/app/services/meetings/calendar_wrapper.rb b/modules/meeting/app/services/meetings/calendar_wrapper.rb
index e5145e8c05e..b36141f6708 100644
--- a/modules/meeting/app/services/meetings/calendar_wrapper.rb
+++ b/modules/meeting/app/services/meetings/calendar_wrapper.rb
@@ -88,6 +88,32 @@ module Meetings
add_instantiated_occurences(recurring_meeting: recurring_meeting)
end
+ def add_single_recurring_occurence(scheduled_meeting:) # rubocop:disable Metrics/AbcSize
+ recurring_meeting = scheduled_meeting.recurring_meeting
+ meeting = scheduled_meeting.meeting
+
+ calendar.event do |e|
+ e.uid = recurring_meeting.uid
+ e.summary = "[#{recurring_meeting.project.name}] #{recurring_meeting.title}"
+ e.description = "[#{recurring_meeting.project.name}] #{I18n.t(:label_meeting_series)}: #{recurring_meeting.title}"
+ e.organizer = ical_organizer
+
+ e.recurrence_id = ical_datetime(scheduled_meeting.start_time)
+ e.dtstart = ical_datetime(meeting.start_time)
+ e.dtend = ical_datetime(meeting.end_time)
+ e.url = url_helpers.project_meeting_url(meeting.project, meeting)
+ e.location = meeting.location.presence
+ e.sequence = meeting.lock_version
+
+ add_attendees(event: e, meeting: meeting)
+ e.status = if scheduled_meeting.cancelled?
+ "CANCELLED"
+ else
+ "CONFIRMED"
+ end
+ end
+ end
+
def update_calendar_status(cancelled:)
if cancelled
calendar.cancel
@@ -158,33 +184,7 @@ module Meetings
# Methods for recurrence meetings
def add_instantiated_occurences(recurring_meeting:)
upcoming_instantiated_schedules(recurring_meeting).find_each do |scheduled_meeting|
- add_occurence(scheduled_meeting:)
- end
- end
-
- def add_occurence(scheduled_meeting:) # rubocop:disable Metrics/AbcSize
- recurring_meeting = scheduled_meeting.recurring_meeting
- meeting = scheduled_meeting.meeting
-
- calendar.event do |e|
- e.uid = recurring_meeting.uid
- e.summary = "[#{recurring_meeting.project.name}] #{recurring_meeting.title}"
- e.description = "[#{recurring_meeting.project.name}] #{I18n.t(:label_meeting_series)}: #{recurring_meeting.title}"
- e.organizer = ical_organizer
-
- e.recurrence_id = ical_datetime(scheduled_meeting.start_time)
- e.dtstart = ical_datetime(meeting.start_time)
- e.dtend = ical_datetime(meeting.end_time)
- e.url = url_helpers.project_meeting_url(meeting.project, meeting)
- e.location = meeting.location.presence
- e.sequence = meeting.lock_version
-
- add_attendees(event: e, meeting: meeting)
- e.status = if scheduled_meeting.cancelled?
- "CANCELLED"
- else
- "CONFIRMED"
- end
+ add_single_recurring_occurence(scheduled_meeting:)
end
end
diff --git a/modules/meeting/app/services/recurring_meetings/ical_service.rb b/modules/meeting/app/services/recurring_meetings/ical_service.rb
index ee38ccc642d..f75c805645a 100644
--- a/modules/meeting/app/services/recurring_meetings/ical_service.rb
+++ b/modules/meeting/app/services/recurring_meetings/ical_service.rb
@@ -53,5 +53,18 @@ module RecurringMeetings
Rails.logger.error("Failed to generate ICS for meeting series #{series.id}: #{e.message}")
ServiceResult.failure(message: e.message)
end
+
+ def generate_single_occurence(meeting:, cancelled: false)
+ User.execute_as(user) do
+ calendar = Meetings::CalendarWrapper.new(timezone: Time.zone || Time.zone_default)
+ calendar.add_single_recurring_occurence(scheduled_meeting: meeting.scheduled_meeting)
+ calendar.update_calendar_status(cancelled:)
+
+ ServiceResult.success(result: calendar.to_ical)
+ end
+ # rescue StandardError => e
+ # Rails.logger.error("Failed to generate ICS for meeting series #{series.id}: #{e.message}")
+ # ServiceResult.failure(message: e.message)
+ end
end
end