move Agile::Backlogs to Backlogs

ulferts · ulferts · commit 8bab981054fa · 2026-04-24T16:57:14.000+02:00
diff --git a/modules/backlogs/app/components/backlogs/backlogs_component.html.erb b/modules/backlogs/app/components/backlogs/backlogs_component.html.erb
@@ -53,15 +53,15 @@ See COPYRIGHT and LICENSE files for more details.
         head.with_actions do
           render Primer::Beta::Button.new(
             tag: :a,
-            label: Agile::BacklogBucket.human_model_name,
+            label: BacklogBucket.human_model_name,
             href: new_dialog_project_backlogs_backlog_buckets_path(project),
             data: {
               controller: "async-dialog",
               test_selector: "op-backlog-buckets--new-backlog-bucket-button"
             }
           ) do |button|
             button.with_leading_visual_icon(icon: :plus)
-            Agile::BacklogBucket.human_model_name
+            BacklogBucket.human_model_name
           end
         end
       elsif allow_sprint_creation?(project)
diff --git a/modules/backlogs/app/contracts/backlog_buckets/base_contract.rb b/modules/backlogs/app/contracts/backlog_buckets/base_contract.rb
@@ -32,7 +32,7 @@ class BacklogBuckets::BaseContract < ModelContract
   validate :user_authorized
 
   def self.model
-    Agile::BacklogBucket
+    BacklogBucket
   end
 
   attribute :name
diff --git a/modules/backlogs/app/controllers/backlogs/backlog_buckets_controller.rb b/modules/backlogs/app/controllers/backlogs/backlog_buckets_controller.rb
@@ -36,7 +36,7 @@ class BacklogBucketsController < BaseController
     before_action :find_backlog_bucket, only: %i[edit_dialog update destroy]
 
     def new_dialog
-      backlog_bucket = Agile::BacklogBucket.new(project: @project)
+      backlog_bucket = BacklogBucket.new(project: @project)
 
       respond_with_dialog Backlogs::NewBacklogBucketDialogComponent.new(backlog_bucket:)
     end
@@ -104,7 +104,7 @@ def check_feature_flag
     end
 
     def find_backlog_bucket
-      @backlog_bucket = Agile::BacklogBucket.where(project: @project).find(params[:id])
+      @backlog_bucket = BacklogBucket.where(project: @project).find(params[:id])
     end
 
     def backlog_bucket_params
diff --git a/modules/backlogs/app/controllers/backlogs/backlog_controller.rb b/modules/backlogs/app/controllers/backlogs/backlog_controller.rb
@@ -65,7 +65,7 @@ def split_view_base_route
 
     def load_backlogs
       if OpenProject::FeatureDecisions.backlog_buckets_active?
-        @backlog_buckets = Agile::BacklogBucket.for_project(@project)
+        @backlog_buckets = BacklogBucket.for_project(@project)
       end
 
       @sprints = Sprint.for_project(@project)
diff --git a/modules/backlogs/app/controllers/backlogs/inbox_controller.rb b/modules/backlogs/app/controllers/backlogs/inbox_controller.rb
@@ -95,7 +95,7 @@ def load_work_package
     def replace_inbox_component_via_turbo_stream
       inbox_work_packages = WorkPackage.backlogs_inbox_for(project: @project)
       backlog_buckets = if OpenProject::FeatureDecisions.backlog_buckets_active?
-                          Agile::BacklogBucket.for_project(@project)
+                          BacklogBucket.for_project(@project)
                         end
 
       replace_via_turbo_stream(
diff --git a/modules/backlogs/app/controllers/backlogs/work_packages_controller.rb b/modules/backlogs/app/controllers/backlogs/work_packages_controller.rb
@@ -127,7 +127,7 @@ def moved_to_inbox
       )
       inbox_work_packages = WorkPackage.backlogs_inbox_for(project: @project)
       backlog_buckets = if OpenProject::FeatureDecisions.backlog_buckets_active?
-                          Agile::BacklogBucket.for_project(@project)
+                          BacklogBucket.for_project(@project)
                         end
 
       replace_via_turbo_stream(
diff --git a/modules/backlogs/app/models/backlog_bucket.rb b/modules/backlogs/app/models/backlog_bucket.rb
@@ -28,7 +28,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-class Agile::BacklogBucket < ApplicationRecord
+class BacklogBucket < ApplicationRecord
   self.table_name = "backlog_buckets"
 
   belongs_to :project
diff --git a/modules/backlogs/app/services/backlog_buckets/create_service.rb b/modules/backlogs/app/services/backlog_buckets/create_service.rb
@@ -30,6 +30,6 @@
 
 class BacklogBuckets::CreateService < BaseServices::Create
   def instance_class
-    Agile::BacklogBucket
+    BacklogBucket
   end
 end
diff --git a/modules/backlogs/app/services/backlog_buckets/update_service.rb b/modules/backlogs/app/services/backlog_buckets/update_service.rb
@@ -30,6 +30,6 @@
 
 class BacklogBuckets::UpdateService < BaseServices::Update
   def instance_class
-    Agile::BacklogBucket
+    BacklogBucket
   end
 end
diff --git a/modules/backlogs/lib/open_project/backlogs/patches/project_patch.rb b/modules/backlogs/lib/open_project/backlogs/patches/project_patch.rb
@@ -34,8 +34,8 @@ module OpenProject::Backlogs::Patches::ProjectPatch
 
   included do
     has_and_belongs_to_many :done_statuses, join_table: :done_statuses_for_project, class_name: "::Status"
-    has_many :backlog_buckets, class_name: "Agile::BacklogBucket", dependent: :destroy
-    has_many :sprints, class_name: "Sprint", dependent: :destroy
+    has_many :sprints, dependent: :destroy
+    has_many :backlog_buckets, dependent: :destroy
   end
 
   def backlogs_enabled?
diff --git a/modules/backlogs/lib/open_project/backlogs/patches/work_package_patch.rb b/modules/backlogs/lib/open_project/backlogs/patches/work_package_patch.rb
@@ -43,8 +43,8 @@ module OpenProject::Backlogs::Patches::WorkPackagePatch
                                              less_than: 10_000,
                                              if: -> { backlogs_enabled? }
 
-    belongs_to :backlog_bucket, class_name: "Agile::BacklogBucket", optional: true
     belongs_to :sprint, optional: true
+    belongs_to :backlog_bucket, optional: true
 
     include OpenProject::Backlogs::List
 
diff --git a/modules/backlogs/spec/contracts/backlog_buckets/create_contract_spec.rb b/modules/backlogs/spec/contracts/backlog_buckets/create_contract_spec.rb
@@ -35,6 +35,6 @@
   include_context "as backlog bucket contract"
 
   let(:backlog_bucket) do
-    Agile::BacklogBucket.new(name:, project:)
+    BacklogBucket.new(name:, project:)
   end
 end
diff --git a/modules/backlogs/spec/factories/backlog_bucket_factory.rb b/modules/backlogs/spec/factories/backlog_bucket_factory.rb
@@ -29,7 +29,7 @@
 #++
 
 FactoryBot.define do
-  factory :backlog_bucket, class: "Agile::BacklogBucket" do
+  factory :backlog_bucket do
     sequence(:name) { |n| "#{n} #{'idea'.pluralize(n)} for another name for a bucket list" }
     project
   end
diff --git a/modules/backlogs/spec/features/backlog_buckets/create_spec.rb b/modules/backlogs/spec/features/backlog_buckets/create_spec.rb
@@ -61,7 +61,7 @@
     expect_and_dismiss_flash type: :success, exact_message: "Successful creation."
     backlogs_page.expect_bucket_names_in_order("Discovery work")
 
-    bucket = Agile::BacklogBucket.find_by!(project:, name: "Discovery work")
+    bucket = BacklogBucket.find_by!(project:, name: "Discovery work")
     expect(bucket.work_packages).to be_empty
   end
 
@@ -77,7 +77,7 @@
       expect(page).to have_field "Name", validation_error: "can't be blank"
     end
 
-    expect(Agile::BacklogBucket.where(project:)).to be_empty
+    expect(BacklogBucket.where(project:)).to be_empty
   end
 
   context "without the :create_sprints permission" do
diff --git a/modules/backlogs/spec/features/backlog_buckets/delete_spec.rb b/modules/backlogs/spec/features/backlog_buckets/delete_spec.rb
@@ -67,7 +67,7 @@
 
     backlogs_page.expect_work_packages_in_backlog_inbox_in_order(work_packages: [bucket_wp1, bucket_wp2])
 
-    expect(Agile::BacklogBucket.where(id: bucket.id)).to be_empty
+    expect(BacklogBucket.where(id: bucket.id)).to be_empty
     expect(bucket_wp1.reload.backlog_bucket_id).to be_nil
     expect(bucket_wp2.reload.backlog_bucket_id).to be_nil
   end
diff --git a/modules/backlogs/spec/models/backlog_bucket_spec.rb b/modules/backlogs/spec/models/backlog_bucket_spec.rb
@@ -30,7 +30,7 @@
 
 require "rails_helper"
 
-RSpec.describe Agile::BacklogBucket do
+RSpec.describe BacklogBucket do
   shared_let(:project) { create(:project) }
 
   subject(:backlog_bucket) do
diff --git a/modules/backlogs/spec/models/project_spec.rb b/modules/backlogs/spec/models/project_spec.rb
@@ -32,7 +32,7 @@
 
 RSpec.describe Project do
   describe "associations" do
-    it { is_expected.to have_many(:backlog_buckets).class_name("Agile::BacklogBucket").dependent(:destroy) }
     it { is_expected.to have_many(:sprints).class_name("Sprint").dependent(:destroy) }
+    it { is_expected.to have_many(:backlog_buckets).class_name("BacklogBucket").dependent(:destroy) }
   end
 end
diff --git a/modules/backlogs/spec/models/work_package_spec.rb b/modules/backlogs/spec/models/work_package_spec.rb
@@ -32,7 +32,7 @@
 
 RSpec.describe WorkPackage do
   describe "associations" do
-    it { is_expected.to belong_to(:backlog_bucket).class_name("Agile::BacklogBucket").optional(true) }
+    it { is_expected.to belong_to(:backlog_bucket).class_name("BacklogBucket").optional(true) }
     it { is_expected.to belong_to(:sprint).class_name("Sprint").optional(true) }
   end
 
diff --git a/modules/backlogs/spec/services/backlog_buckets/create_service_spec.rb b/modules/backlogs/spec/services/backlog_buckets/create_service_spec.rb
@@ -33,7 +33,7 @@
 
 RSpec.describe BacklogBuckets::CreateService, type: :model do
   it_behaves_like "BaseServices create service" do
-    let(:model_class) { Agile::BacklogBucket }
+    let(:model_class) { BacklogBucket }
     let(:factory) { :backlog_bucket }
   end
 end
diff --git a/modules/backlogs/spec/services/backlog_buckets/set_attributes_service_spec.rb b/modules/backlogs/spec/services/backlog_buckets/set_attributes_service_spec.rb
@@ -57,7 +57,7 @@
                         contract_options: {})
   end
   let(:project) { create(:project) }
-  let(:backlog_bucket) { Agile::BacklogBucket.new }
+  let(:backlog_bucket) { BacklogBucket.new }
   let(:params) { { project: } }
 
   subject(:service_call) { instance.call(params) }
diff --git a/modules/backlogs/spec/services/backlog_buckets/update_service_spec.rb b/modules/backlogs/spec/services/backlog_buckets/update_service_spec.rb
@@ -33,7 +33,7 @@
 
 RSpec.describe BacklogBuckets::UpdateService, type: :model do
   it_behaves_like "BaseServices update service" do
-    let(:model_class) { Agile::BacklogBucket }
+    let(:model_class) { BacklogBucket }
     let(:factory) { :backlog_bucket }
   end
 end
diff --git a/modules/backlogs/spec/support/pages/backlog.rb b/modules/backlogs/spec/support/pages/backlog.rb
@@ -367,19 +367,19 @@ def expect_work_packages_in_backlog_inbox_in_order(work_packages: [])
 
     def open_create_backlog_bucket_dialog
       within_owner_backlogs do
-        click_on accessible_name: Agile::BacklogBucket.human_model_name
+        click_on accessible_name: BacklogBucket.human_model_name
       end
     end
 
     def expect_new_backlog_bucket_button
       within_owner_backlogs do
-        expect(page).to have_link(Agile::BacklogBucket.human_model_name, exact: true)
+        expect(page).to have_link(BacklogBucket.human_model_name, exact: true)
       end
     end
 
     def expect_no_new_backlog_bucket_button
       within_owner_backlogs do
-        expect(page).to have_no_link(Agile::BacklogBucket.human_model_name, exact: true)
+        expect(page).to have_no_link(BacklogBucket.human_model_name, exact: true)
       end
     end
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ def moved_to_inbox`
`127`	`127`	`)`
`128`	`128`	`inbox_work_packages = WorkPackage.backlogs_inbox_for(project: @project)`
`129`	`129`	`backlog_buckets = if OpenProject::FeatureDecisions.backlog_buckets_active?`
`130`		`- Agile::BacklogBucket.for_project(@project)`
	`130`	`+ BacklogBucket.for_project(@project)`
`131`	`131`	`end`
`132`	`132`
`133`	`133`	`replace_via_turbo_stream(`