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

set PARTSTAT=ACCEPTED until we do proper RSVP handling

Klaus Zanders60ccc5436da9
diff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rb
index b31c46f2770..460d9abc8d4 100644
--- a/modules/meeting/app/services/meetings/icalendar_builder.rb
+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb
@@ -171,7 +171,7 @@ module Meetings
{
"CN" => user.name,
"EMAIL" => user.mail,
- "PARTSTAT" => "NEEDS-ACTION",
+ "PARTSTAT" => "ACCEPTED", # until we handle RSVPs properly, we assume participants have accepted
"RSVP" => "TRUE",
"CUTYPE" => "INDIVIDUAL",
"ROLE" => "REQ-PARTICIPANT"
diff --git a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
index f40029ea18e..325d525760a 100644
--- a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
+++ b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
@@ -31,6 +31,54 @@ RSpec.describe Meetings::IcalendarBuilder,
expect(parsed_calendar.ip_method).to eq("REQUEST")
end
+ it "sets PARTSTAT to ACCEPTED for all attendees" do
+ builder.add_single_meeting_event(meeting:)
+ builder.update_calendar_status(cancelled: false)
+
+ event = parsed_calendar.events.first
+ expect(event.attendee).not_to be_empty
+
+ event.attendee.each do |attendee|
+ expect(attendee.ical_params["partstat"]).to eq(["ACCEPTED"])
+ expect(attendee.ical_params["rsvp"]).to eq(["TRUE"])
+ expect(attendee.ical_params["cutype"]).to eq(["INDIVIDUAL"])
+ expect(attendee.ical_params["role"]).to eq(["REQ-PARTICIPANT"])
+ end
+ end
+
+ context "with multiple participants" do
+ let(:user1) { create(:user, firstname: "John", lastname: "Doe", mail: "[email protected]") }
+ let(:user2) { create(:user, firstname: "Jane", lastname: "Smith", mail: "[email protected]") }
+ let(:meeting_with_participants) do
+ meeting = create(:meeting, start_time: Time.zone.parse("2025-08-30 10:00"))
+ create(:meeting_participant, meeting:, user: user1)
+ create(:meeting_participant, meeting:, user: user2)
+ meeting
+ end
+
+ it "sets PARTSTAT to ACCEPTED for all multiple attendees" do
+ builder.add_single_meeting_event(meeting: meeting_with_participants)
+ builder.update_calendar_status(cancelled: false)
+
+ event = parsed_calendar.events.first
+ expect(event.attendee.count).to eq(2)
+
+ # Find attendees by email
+ john_attendee = event.attendee.find { |a| a.to_s.include?("[email protected]") }
+ jane_attendee = event.attendee.find { |a| a.to_s.include?("[email protected]") }
+
+ expect(john_attendee).to be_present
+ expect(jane_attendee).to be_present
+
+ [john_attendee, jane_attendee].each do |attendee|
+ expect(attendee.ical_params["partstat"]).to eq(["ACCEPTED"])
+ expect(attendee.ical_params["rsvp"]).to eq(["TRUE"])
+ expect(attendee.ical_params["cutype"]).to eq(["INDIVIDUAL"])
+ expect(attendee.ical_params["role"]).to eq(["REQ-PARTICIPANT"])
+ end
+ end
+ end
+
it "sets status CANCELLED when cancelled" do
builder.add_single_meeting_event(meeting:, cancelled: true)
builder.update_calendar_status(cancelled: true)
@@ -41,15 +89,23 @@ RSpec.describe Meetings::IcalendarBuilder,
end
context "with recurring meeting series" do
+ let(:project) { create(:project) }
+ let(:user1) { create(:user, firstname: "John", lastname: "Doe", member_with_permissions: { project => [:view_meetings] }) }
+ let(:user2) { create(:user, firstname: "John", lastname: "Doe", member_with_permissions: { project => [:view_meetings] }) }
+
let(:recurring_meeting) do
create(:recurring_meeting,
start_time: Time.zone.parse("2025-08-25 09:00"),
iterations: 10,
+ project: project,
end_after: :iterations,
- time_zone: timezone.tzinfo.name)
+ time_zone: timezone.tzinfo.name).tap do |recurring_meeting|
+ create(:meeting_participant, :invitee, meeting: recurring_meeting.template, user: user1)
+ create(:meeting_participant, :invitee, meeting: recurring_meeting.template, user: user2)
+ end
end
- let!(:cancelled_schedule) do
+ let!(:second_occurrence) do
# Cancel second occurrence
create(:scheduled_meeting,
:cancelled,
@@ -57,27 +113,23 @@ RSpec.describe Meetings::IcalendarBuilder,
start_time: recurring_meeting.start_time + 1.week)
end
- let!(:instantiated_schedule) do
+ let!(:third_occurence) 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
- )
+ result = RecurringMeetings::InitOccurrenceService
+ .new(user: User.system, recurring_meeting:)
+ .call(start_time: base_start)
- meeting = create(:meeting,
- recurring_meeting:,
- start_time: base_start + 10.minutes,
- project: recurring_meeting.project)
+ meeting = result.result
- scheduled.update!(meeting:)
- scheduled
+ # Reschedule meeting to be 10 minutes later. It should still have the correct recurrence
+ meeting.update(start_time: base_start + 10.minutes)
+
+ meeting.scheduled_meeting
end
it "adds master event with RRULE and EXDATE plus override events" do
@@ -95,15 +147,42 @@ RSpec.describe Meetings::IcalendarBuilder,
# 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))
+ expect(exdates).to include(second_occurrence.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))
+ expect(ov.recurrence_id.value).to eq(third_occurence.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)
+ expect(ov.dtstart.to_time.min).to eq(third_occurence.meeting.start_time.min)
+ expect(ov.dtstart.to_time.min).not_to eq(third_occurence.start_time.min)
+ expect(ov.sequence.to_i).to eq(third_occurence.meeting.lock_version)
+ end
+
+ it "sets PARTSTAT to ACCEPTED for all attendees in recurring meeting series" 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? }
+
+ # Check master event attendees
+ expect(master.attendee).not_to be_empty
+ master.attendee.each do |attendee|
+ expect(attendee.ical_params["partstat"]).to eq(["ACCEPTED"])
+ expect(attendee.ical_params["rsvp"]).to eq(["TRUE"])
+ expect(attendee.ical_params["cutype"]).to eq(["INDIVIDUAL"])
+ expect(attendee.ical_params["role"]).to eq(["REQ-PARTICIPANT"])
+ end
+
+ # Check override event attendees
+ overrides.each do |override_event|
+ expect(override_event.attendee).not_to be_empty
+ override_event.attendee.each do |attendee|
+ expect(attendee.ical_params["partstat"]).to eq(["ACCEPTED"])
+ expect(attendee.ical_params["rsvp"]).to eq(["TRUE"])
+ expect(attendee.ical_params["cutype"]).to eq(["INDIVIDUAL"])
+ expect(attendee.ical_params["role"]).to eq(["REQ-PARTICIPANT"])
+ end
+ end
end
end