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

Add manual handling for timezones and add specs

Klaus Zandersb047ac8a08c7
diff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rb
index 16929c0aabc..b366d4669ee 100644
--- a/modules/meeting/app/services/meetings/icalendar_builder.rb
+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb
@@ -32,12 +32,13 @@ require "icalendar/tzinfo"
module Meetings
class IcalendarBuilder
- attr_reader :timezone, :calendar, :calendar_timezones
+ attr_reader :timezone, :calendar, :all_times, :tzid
def initialize(timezone:)
@timezone = timezone
+ @tzid = timezone.tzinfo.canonical_identifier
@calendar = build_icalendar
- @calendar_timezones = Set.new
+ @all_times = []
@excluded_dates_cache = {}
@instantiated_occurrences_cache = {}
@series_cache_loaded = false
@@ -126,10 +127,7 @@ module Meetings
end
def to_ical
- calendar_timezones.each do |ical_tzinfo|
- calendar.add_timezone(ical_tzinfo)
- end
-
+ calendar.add_timezone(build_single_vtimezone)
calendar.to_ical
end
@@ -163,10 +161,6 @@ module Meetings
end
end
- def add_timezone_definition(time)
- calendar_timezones << timezone.tzinfo.ical_timezone(time)
- end
-
def add_attendees(event:, meeting:)
meeting.participants.includes(:user).find_each do |participant|
user = participant.user
@@ -188,16 +182,36 @@ module Meetings
end
end
- def tzid
- @tzid ||= timezone.tzinfo.canonical_identifier
- end
-
def ical_datetime(time)
time_in_time_zone = time.in_time_zone(timezone)
- add_timezone_definition(time_in_time_zone)
+ all_times << time_in_time_zone
Icalendar::Values::DateTime.new time_in_time_zone, "tzid" => tzid
end
+ def format_ical_offset(offset_seconds)
+ hours = offset_seconds / 3600
+ minutes = (offset_seconds.abs / 60) % 60
+ sprintf("%<hours>+03d%<minutes>02d", hours:, minutes:)
+ end
+
+ # Helper to build a VTZIMEZONE with all relevant transitions
+ def build_single_vtimezone # rubocop:disable Metrics/AbcSize
+ tz = Icalendar::Timezone.new
+ tz.tzid = tzid
+
+ transitions = timezone.tzinfo.transitions_up_to(all_times.max, all_times.min)
+ transitions.each do |tr|
+ comp = tr.offset.dst? ? Icalendar::Timezone::Daylight.new : Icalendar::Timezone::Standard.new
+ comp.dtstart = tr.at.utc.strftime("%Y%m%dT%H%M%SZ")
+ comp.tzoffsetfrom = format_ical_offset(tr.previous_offset.utc_total_offset)
+ comp.tzoffsetto = format_ical_offset(tr.offset.utc_total_offset)
+ comp.tzname = tr.offset.abbreviation.to_s
+ tz.add_component(comp)
+ end
+
+ tz
+ end
+
def ical_organizer
Icalendar::Values::CalAddress.new("mailto:#{Setting.mail_from}", cn: Setting.app_title)
end
diff --git a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
new file mode 100644
index 00000000000..10b87fd79b0
--- /dev/null
+++ b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Meetings::IcalendarBuilder,
+ with_settings: { mail_from: "[email protected]", app_title: "OpenProject Testing" } do
+ subject(:builder) { described_class.new(timezone:) }
+
+ let(:parsed_calendar) { Icalendar::Calendar.parse(builder.to_ical).first }
+
+ let(:timezone) { ActiveSupport::TimeZone["Europe/Berlin"] }
+
+ context "with a single meeting" do
+ let(:meeting) { create(:meeting, :author_participates, start_time: Time.zone.parse("2025-08-30 10:00")) }
+
+ it "adds basic event data" do
+ builder.add_single_meeting_event(meeting:)
+ builder.update_calendar_status(cancelled: false)
+
+ event = parsed_calendar.events.first
+ expect(event.summary).to include(meeting.title)
+ expect(event.description).to include(I18n.t(:label_meeting))
+ expect(event.uid).to eq(meeting.uid)
+ # Organizer
+ expect(event.organizer.to_s).to include("mailto:[email protected]")
+ # Attendees (author participates)
+ expect(event.attendee.first.to_s).to include("mailto:#{meeting.author.mail}")
+ # Timezone parameter
+ expect(event.dtstart.ical_params["tzid"]).to eq([timezone.tzinfo.canonical_identifier])
+ # Method defaults to REQUEST when not cancelled
+ expect(parsed_calendar.ip_method).to eq("REQUEST")
+ end
+
+ it "sets status CANCELLED when cancelled" do
+ builder.add_single_meeting_event(meeting:, cancelled: true)
+ builder.update_calendar_status(cancelled: true)
+ event = parsed_calendar.events.first
+ expect(event.status).to eq("CANCELLED")
+ expect(parsed_calendar.ip_method).to eq("CANCEL")
+ end
+ end
+
+ context "with recurring meeting series" do
+ let(:recurring_meeting) do
+ create(:recurring_meeting,
+ start_time: Time.zone.parse("2025-08-25 09:00"),
+ iterations: 10,
+ end_after: :iterations,
+ time_zone: timezone.tzinfo.name)
+ end
+
+ let!(:cancelled_schedule) do
+ # Cancel second occurrence
+ create(:scheduled_meeting,
+ :cancelled,
+ recurring_meeting:,
+ start_time: recurring_meeting.start_time + 1.week)
+ end
+
+ let!(:instantiated_schedule) do
+ # Third occurrence instantiated and moved by +10 minutes
+ base_start = recurring_meeting.start_time + 2.weeks
+ create(:scheduled_meeting,
+ recurring_meeting:,
+ start_time: base_start)
+
+ # Create with meeting that has different start time
+ scheduled = ScheduledMeeting.create!(
+ recurring_meeting:,
+ start_time: base_start,
+ cancelled: false
+ )
+
+ meeting = create(:meeting,
+ recurring_meeting:,
+ start_time: base_start + 10.minutes,
+ project: recurring_meeting.project)
+
+ scheduled.update!(meeting:)
+ scheduled
+ end
+
+ it "adds master event with RRULE and EXDATE plus override events" do
+ builder.add_series_event(recurring_meeting:)
+
+ master = parsed_calendar.events.find { |e| e.rrule.present? && e.recurrence_id.blank? }
+ overrides = parsed_calendar.events.select { |e| e.recurrence_id.present? }
+
+ expect(master).to be_present
+ expect(master.uid).to eq(recurring_meeting.uid)
+
+ rrule = master.rrule.first
+ expect(rrule.frequency).to eq("WEEKLY")
+ expect(rrule.count).to eq(10)
+
+ # EXDATE contains cancelled schedule start (original scheduled time, not moved time)
+ exdates = Array(master.exdate).flat_map { |ex| Array(ex) }.map(&:value)
+ expect(exdates).to include(cancelled_schedule.start_time.in_time_zone(timezone))
+ # One override for instantiated schedule
+ expect(overrides.size).to eq(1)
+ ov = overrides.first
+ expect(ov.recurrence_id.value).to eq(instantiated_schedule.start_time.in_time_zone(timezone))
+ # Override start reflects moved meeting start time (+10m)
+ expect(ov.dtstart.to_time.min).to eq(instantiated_schedule.meeting.start_time.min)
+ expect(ov.dtstart.to_time.min).not_to eq(instantiated_schedule.start_time.min)
+ expect(ov.sequence.to_i).to eq(instantiated_schedule.meeting.lock_version)
+ end
+ end
+
+ context "for timezone component" do
+ let(:meeting) { create(:meeting, start_time: Time.zone.parse("2025-10-01 10:00")) }
+
+ it "includes a VTIMEZONE with TZID" do
+ builder.add_single_meeting_event(meeting:)
+ expect(parsed_calendar.timezones.size).to eq(1)
+ tz = parsed_calendar.timezones.first
+ expect(tz.tzid).to eq(timezone.tzinfo.canonical_identifier)
+ end
+ end
+
+ context "for timezone transitions across multiple years" do
+ # We pick dates spread over multiple DST changes
+ let!(:meetings) do
+ [
+ Time.zone.parse("2025-03-30 10:00"), # Around spring DST change
+ Time.zone.parse("2026-01-15 11:00"),
+ Time.zone.parse("2026-07-15 09:30"), # Summer time
+ Time.zone.parse("2027-02-10 14:00"),
+ Time.zone.parse("2027-10-30 10:00") # Around autumn DST change
+ ].map do |ts|
+ create(:meeting, :author_participates, start_time: ts, duration: 1.0)
+ end
+ end
+
+ it "emits exactly one VTIMEZONE block" do
+ meetings.each { |m| builder.add_single_meeting_event(meeting: m) }
+ expect(parsed_calendar.timezones.size).to eq(1)
+ end
+
+ it "contains multiple STANDARD and/or DAYLIGHT components (DST transitions)" do
+ meetings.each { |m| builder.add_single_meeting_event(meeting: m) }
+ ics = builder.to_ical
+ vtimezone_block = ics[/BEGIN:VTIMEZONE.*?END:VTIMEZONE/m]
+ expect(vtimezone_block).to be_present
+ standard_count = vtimezone_block.scan("BEGIN:STANDARD").size
+ daylight_count = vtimezone_block.scan("BEGIN:DAYLIGHT").size
+ expect(standard_count).to eq(2)
+ expect(daylight_count).to eq(2)
+ end
+ end
+end