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

Better naming to avoid using current_user in calendar builder

Klaus Zandersd0955ee44839
diff --git a/modules/meeting/app/services/all_meetings/ical_service.rb b/modules/meeting/app/services/all_meetings/ical_service.rb
index 6f456beb3ed..bdeb0fe3d89 100644
--- a/modules/meeting/app/services/all_meetings/ical_service.rb
+++ b/modules/meeting/app/services/all_meetings/ical_service.rb
@@ -46,7 +46,7 @@ module AllMeetings
end
calendar.preload_for_recurring_meetings(recurring_meetings: recurring_meetings)
- calendar.mark_current_user_having_accepted_all_invitations!
+ calendar.treat_participations_from_user_as_accepted!
recurring_meetings.each do |recurring_meeting|
calendar.add_series_event(recurring_meeting:, cancelled: false)
diff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rb
index cba5e39140b..706b8f4a1e8 100644
--- a/modules/meeting/app/services/meetings/icalendar_builder.rb
+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb
@@ -32,10 +32,10 @@ require "icalendar/tzinfo"
module Meetings
class IcalendarBuilder
- attr_reader :timezone, :calendar, :all_times, :tzid, :current_user
+ attr_reader :timezone, :calendar, :all_times, :tzid, :calendar_generated_for_user
def initialize(timezone:, user: User.current)
- @current_user = user
+ @calendar_generated_for_user = user
@timezone = timezone
@tzid = timezone.tzinfo.canonical_identifier
@calendar = build_icalendar
@@ -46,7 +46,7 @@ module Meetings
@action_needed_from_user_as_attendee = true
end
- def mark_current_user_having_accepted_all_invitations!
+ def treat_participations_from_user_as_accepted!
@action_needed_from_user_as_attendee = false
end
@@ -189,7 +189,7 @@ module Meetings
end
def attendee_participation_status(user)
- if current_user == user && @action_needed_from_user_as_attendee
+ if calendar_generated_for_user == user && @action_needed_from_user_as_attendee
"NEEDS-ACTION"
else
"ACCEPTED" # until we handle RSVPs properly, we assume participants have accepted
@@ -197,7 +197,7 @@ module Meetings
end
def attendee_rsvp_needed?(user)
- current_user == user && @action_needed_from_user_as_attendee
+ calendar_generated_for_user == user && @action_needed_from_user_as_attendee
end
def ical_datetime(time)
diff --git a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
index c41699eb1c3..ee3c827265c 100644
--- a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
+++ b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Meetings::IcalendarBuilder,
context "when current user has accepted all invitations" do
subject(:builder) do
- described_class.new(timezone:, user: meeting.author).tap(&:mark_current_user_having_accepted_all_invitations!)
+ described_class.new(timezone:, user: meeting.author).tap(&:treat_participations_from_user_as_accepted!)
end
let(:parsed_calendar) { Icalendar::Calendar.parse(builder.to_ical).first }
@@ -121,7 +121,7 @@ RSpec.describe Meetings::IcalendarBuilder,
context "when current user has accepted all invitations" do
subject(:builder) do
- described_class.new(timezone:, user: user1).tap(&:mark_current_user_having_accepted_all_invitations!)
+ described_class.new(timezone:, user: user1).tap(&:treat_participations_from_user_as_accepted!)
end
let(:parsed_calendar) { Icalendar::Calendar.parse(builder.to_ical).first }
@@ -239,7 +239,7 @@ RSpec.describe Meetings::IcalendarBuilder,
context "when current user has accepted all invitations" do
subject(:builder) do
- described_class.new(timezone:, user: user1).tap(&:mark_current_user_having_accepted_all_invitations!)
+ described_class.new(timezone:, user: user1).tap(&:treat_participations_from_user_as_accepted!)
end
let(:parsed_calendar) { Icalendar::Calendar.parse(builder.to_ical).first }