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

CalendarWrapper -> IcalendarBuilder

Klaus Zandersf878352dbf67
diff --git a/modules/meeting/app/services/meetings/ical_service.rb b/modules/meeting/app/services/meetings/ical_service.rb
index 177e86728be..fb93492ea81 100644
--- a/modules/meeting/app/services/meetings/ical_service.rb
+++ b/modules/meeting/app/services/meetings/ical_service.rb
@@ -40,7 +40,7 @@ module Meetings
def call(cancelled: false)
User.execute_as(user) do
- calendar = Meetings::CalendarWrapper.new(timezone: Time.zone || Time.zone_default)
+ calendar = Meetings::IcalendarBuilder.new(timezone: Time.zone || Time.zone_default)
calendar.add_single_meeting_event(meeting:, cancelled:)
calendar.update_calendar_status(cancelled:)
diff --git a/modules/meeting/app/services/meetings/calendar_wrapper.rb b/modules/meeting/app/services/meetings/icalendar_builder.rb
similarity index 99%
rename from modules/meeting/app/services/meetings/calendar_wrapper.rb
rename to modules/meeting/app/services/meetings/icalendar_builder.rb
index b36141f6708..226b937b083 100644
--- a/modules/meeting/app/services/meetings/calendar_wrapper.rb
+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb
@@ -31,7 +31,7 @@ require "icalendar"
require "icalendar/tzinfo"
module Meetings
- class CalendarWrapper
+ class IcalendarBuilder
attr_reader :timezone, :calendar, :calendar_timezones
def initialize(timezone:)
diff --git a/modules/meeting/app/services/recurring_meetings/ical_service.rb b/modules/meeting/app/services/recurring_meetings/ical_service.rb
index f75c805645a..acd9527d8d2 100644
--- a/modules/meeting/app/services/recurring_meetings/ical_service.rb
+++ b/modules/meeting/app/services/recurring_meetings/ical_service.rb
@@ -42,7 +42,7 @@ module RecurringMeetings
def generate_series(cancelled: false) # rubocop:disable Metrics/AbcSize
User.execute_as(user) do
- calendar = Meetings::CalendarWrapper.new(timezone: Time.zone || Time.zone_default)
+ calendar = Meetings::IcalendarBuilder.new(timezone: Time.zone || Time.zone_default)
calendar.add_series_event(recurring_meeting: series, cancelled:)
calendar.update_calendar_status(cancelled:)
@@ -56,7 +56,7 @@ module RecurringMeetings
def generate_single_occurence(meeting:, cancelled: false)
User.execute_as(user) do
- calendar = Meetings::CalendarWrapper.new(timezone: Time.zone || Time.zone_default)
+ calendar = Meetings::IcalendarBuilder.new(timezone: Time.zone || Time.zone_default)
calendar.add_single_recurring_occurence(scheduled_meeting: meeting.scheduled_meeting)
calendar.update_calendar_status(cancelled:)
diff --git a/modules/meeting/spec/services/meetings/ical_service_spec.rb b/modules/meeting/spec/services/meetings/ical_service_spec.rb
index a3a873d9cc7..d4f59cbc445 100644
--- a/modules/meeting/spec/services/meetings/ical_service_spec.rb
+++ b/modules/meeting/spec/services/meetings/ical_service_spec.rb
@@ -68,7 +68,7 @@ RSpec.describe Meetings::ICalService, type: :model do # rubocop:disable RSpec/Sp
subject { service.call }
before do
- allow(Meetings::CalendarWrapper).to receive(:new).and_raise StandardError.new("Oh noes")
+ allow(Meetings::IcalendarBuilder).to receive(:new).and_raise StandardError.new("Oh noes")
end
it "returns a failure" do