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

Fix meeting seeding after backlog

Oliver Günther32f2a431dfa0
diff --git a/modules/meeting/app/components/meeting_sections/backlogs/container_component.rb b/modules/meeting/app/components/meeting_sections/backlogs/container_component.rb
index 254942ef053..ace1fc7a950 100644
--- a/modules/meeting/app/components/meeting_sections/backlogs/container_component.rb
+++ b/modules/meeting/app/components/meeting_sections/backlogs/container_component.rb
@@ -45,7 +45,7 @@ module MeetingSections
private
def show?
end
def wrapper_data_attributes
diff --git a/modules/meeting/app/seeders/meetings/demo_data/meeting_series_seeder.rb b/modules/meeting/app/seeders/meetings/demo_data/meeting_series_seeder.rb
index 8a6ad74d00a..776284ce078 100644
--- a/modules/meeting/app/seeders/meetings/demo_data/meeting_series_seeder.rb
+++ b/modules/meeting/app/seeders/meetings/demo_data/meeting_series_seeder.rb
@@ -48,17 +48,30 @@ module Meetings
def create_model!(model_data)
series = super
create_meeting_template!(series, model_data)
- RecurringMeetings::InitNextOccurrenceJob.perform_later(series, series.first_occurrence)
+
+ # Schedule the first occurrence of the series
+ # after the meeting agenda items have been seeded
+ RecurringMeetings::InitNextOccurrenceJob
+ .set(wait_until: 1.minute.from_now)
+ .perform_later(series, series.first_occurrence)
end
def create_meeting_template!(series, model_data)
- template = Meeting.new(template_attributes(model_data))
- template.template = true
- template.recurring_meeting = series
+ params = template_attributes(model_data)
+ params[:template] = true
+ params[:recurring_meeting] = series
+
+ user = seed_data.find_reference(model_data["author"])
+ call = Meetings::CreateService
+ .new(user:)
+ .call(params)
+
+ call.on_failure do |error|
+ raise "Failed to seed meeting template for series #{series.id}: #{error.message}"
+ end
- template.save!
reference = :"#{model_data['reference']}_template"
- seed_data.store_reference(reference, template)
+ seed_data.store_reference(reference, call.result)
end
def model_attributes(meeting_data)
diff --git a/modules/meeting/spec/seeders/demo_data/project_seeder_spec.rb b/modules/meeting/spec/seeders/demo_data/project_seeder_spec.rb
index ca9b455b18b..b18a0d2506d 100644
--- a/modules/meeting/spec/seeders/demo_data/project_seeder_spec.rb
+++ b/modules/meeting/spec/seeders/demo_data/project_seeder_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe DemoData::ProjectSeeder do
subject(:project_seeder) { described_class.new(seed_data.lookup("projects.my-project")) }
let(:work_package) { create(:work_package) }
- let(:user) { create(:user) }
+ let(:user) { create(:admin) }
let(:seed_data) do
data = basic_seed_data.merge(
Source::SeedData.new(