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

Apply code review changes

Klaus Zanders828235958104
diff --git a/modules/meeting/app/mailers/meeting_mailer.rb b/modules/meeting/app/mailers/meeting_mailer.rb
index da367d61f6a..fbbb75f5d2a 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_single_occurence(meeting: meeting, **args)
+ .generate_single_occurrence(meeting: meeting, **args)
else
::Meetings::ICalService
.new(user:, meeting:)
diff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rb
index 226b937b083..7120637f111 100644
--- a/modules/meeting/app/services/meetings/icalendar_builder.rb
+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb
@@ -85,10 +85,10 @@ module Meetings
end
# Add single events for all occurrences
- add_instantiated_occurences(recurring_meeting: recurring_meeting)
+ add_instantiated_occurrences(recurring_meeting: recurring_meeting)
end
- def add_single_recurring_occurence(scheduled_meeting:) # rubocop:disable Metrics/AbcSize
+ def add_single_recurring_occurrence(scheduled_meeting:) # rubocop:disable Metrics/AbcSize
recurring_meeting = scheduled_meeting.recurring_meeting
meeting = scheduled_meeting.meeting
@@ -181,10 +181,10 @@ module Meetings
@url_helpers ||= OpenProject::StaticRouting::StaticUrlHelpers.new
end
- # Methods for recurrence meetings
- def add_instantiated_occurences(recurring_meeting:)
+ # Methods for recurring meetings
+ def add_instantiated_occurrences(recurring_meeting:)
upcoming_instantiated_schedules(recurring_meeting).find_each do |scheduled_meeting|
- add_single_recurring_occurence(scheduled_meeting:)
+ add_single_recurring_occurrence(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 acd9527d8d2..b214f79af22 100644
--- a/modules/meeting/app/services/recurring_meetings/ical_service.rb
+++ b/modules/meeting/app/services/recurring_meetings/ical_service.rb
@@ -54,17 +54,17 @@ module RecurringMeetings
ServiceResult.failure(message: e.message)
end
- def generate_single_occurence(meeting:, cancelled: false)
+ def generate_single_occurrence(meeting:, cancelled: false) # rubocop:disable Metrics/AbcSize
User.execute_as(user) do
calendar = Meetings::IcalendarBuilder.new(timezone: Time.zone || Time.zone_default)
- calendar.add_single_recurring_occurence(scheduled_meeting: meeting.scheduled_meeting)
+ calendar.add_single_recurring_occurrence(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)
+ 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