diff --git a/app/controllers/admin/settings/work_packages_identifier_controller.rb b/app/controllers/admin/settings/work_packages_identifier_controller.rb index a7ec6be52941..0f3575cb5b25 100644 --- a/app/controllers/admin/settings/work_packages_identifier_controller.rb +++ b/app/controllers/admin/settings/work_packages_identifier_controller.rb @@ -79,7 +79,7 @@ def switch_to_classic .call(work_packages_identifier: Setting::WorkPackageIdentifier::CLASSIC) call.on_success do unless ProjectIdentifiers::IdentifierAutofix.job_in_progress? - ProjectIdentifiers::RevertInstanceToClassicIdsJob.perform_later + ProjectIdentifiers::ConvertInstanceToClassicIdsJob.perform_later end redirect_to action: "show" end diff --git a/app/services/project_identifiers/revert_project_to_classic_service.rb b/app/services/project_identifiers/convert_project_to_classic_service.rb similarity index 98% rename from app/services/project_identifiers/revert_project_to_classic_service.rb rename to app/services/project_identifiers/convert_project_to_classic_service.rb index 718d3321409a..9b6393f542b4 100644 --- a/app/services/project_identifiers/revert_project_to_classic_service.rb +++ b/app/services/project_identifiers/convert_project_to_classic_service.rb @@ -37,7 +37,7 @@ module ProjectIdentifiers # WP sequence_number/identifier, WorkPackageSemanticAlias rows, and # wp_sequence_counter are intentionally left intact so that a back-switch to # semantic mode can resume without data loss. - class RevertProjectToClassicService + class ConvertProjectToClassicService def initialize(project) @project = project end diff --git a/app/services/project_identifiers/identifier_autofix.rb b/app/services/project_identifiers/identifier_autofix.rb index e5bc6d67c1e2..19e688ff362c 100644 --- a/app/services/project_identifiers/identifier_autofix.rb +++ b/app/services/project_identifiers/identifier_autofix.rb @@ -37,7 +37,7 @@ module IdentifierAutofix ].freeze REVERSION_JOB_CLASSES = [ - ProjectIdentifiers::RevertInstanceToClassicIdsJob.name + ProjectIdentifiers::ConvertInstanceToClassicIdsJob.name ].freeze def self.job_in_progress? diff --git a/app/workers/project_identifiers/revert_instance_to_classic_ids_job.rb b/app/workers/project_identifiers/convert_instance_to_classic_ids_job.rb similarity index 93% rename from app/workers/project_identifiers/revert_instance_to_classic_ids_job.rb rename to app/workers/project_identifiers/convert_instance_to_classic_ids_job.rb index 18f5e5c9459a..ab46529f7f13 100644 --- a/app/workers/project_identifiers/revert_instance_to_classic_ids_job.rb +++ b/app/workers/project_identifiers/convert_instance_to_classic_ids_job.rb @@ -34,7 +34,7 @@ # # The global Setting.work_packages_identifier is expected to already be "classic" # before this job runs — it is set by the controller before enqueueing. -class ProjectIdentifiers::RevertInstanceToClassicIdsJob < ApplicationJob +class ProjectIdentifiers::ConvertInstanceToClassicIdsJob < ApplicationJob include GoodJob::ActiveJobExtensions::Concurrency good_job_control_concurrency_with(total_limit: 1) @@ -46,7 +46,7 @@ def perform Project.find_each do |project| next if Project.classic_identifier_format?(project.identifier) - ProjectIdentifiers::RevertProjectToClassicService.new(project).call + ProjectIdentifiers::ConvertProjectToClassicService.new(project).call end end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 46c674d24539..916ce1060a87 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -450,7 +450,7 @@ en: success_banner: Successfully updated work package identifier format. in_progress: converting_banner_message: Project identifiers are currently being converted to semantic format. This may take some time. - reverting_banner_message: Project identifiers are currently being reverted to classic format. This may take some time. + reverting_banner_message: Project identifiers are currently being converted to classic format. This may take some time. workflows: tabs: default_transitions: "Default transitions" diff --git a/spec/controllers/admin/settings/work_packages_identifier_controller_spec.rb b/spec/controllers/admin/settings/work_packages_identifier_controller_spec.rb index ff61b21fa9af..6c3ec1aa53c5 100644 --- a/spec/controllers/admin/settings/work_packages_identifier_controller_spec.rb +++ b/spec/controllers/admin/settings/work_packages_identifier_controller_spec.rb @@ -62,10 +62,10 @@ end context "when work_packages_identifier is 'classic'" do - it "updates the setting to classic, enqueues RevertInstanceToClassicIdsJob, and redirects" do + it "updates the setting to classic, enqueues ConvertInstanceToClassicIdsJob, and redirects" do expect do patch :update, params: { settings: { work_packages_identifier: "classic" } } - end.to have_enqueued_job(ProjectIdentifiers::RevertInstanceToClassicIdsJob) + end.to have_enqueued_job(ProjectIdentifiers::ConvertInstanceToClassicIdsJob) expect(Setting.work_packages_identifier).to eq("classic") expect(response).to redirect_to(action: "show") @@ -79,7 +79,7 @@ it "does not enqueue another job but still updates the setting and redirects" do expect do patch :update, params: { settings: { work_packages_identifier: "classic" } } - end.not_to have_enqueued_job(ProjectIdentifiers::RevertInstanceToClassicIdsJob) + end.not_to have_enqueued_job(ProjectIdentifiers::ConvertInstanceToClassicIdsJob) expect(Setting.work_packages_identifier).to eq("classic") expect(response).to redirect_to(action: "show") @@ -93,7 +93,7 @@ expect(response).to have_http_status(:bad_request) expect(ProjectIdentifiers::ConvertInstanceToSemanticIdsJob).not_to have_been_enqueued - expect(ProjectIdentifiers::RevertInstanceToClassicIdsJob).not_to have_been_enqueued + expect(ProjectIdentifiers::ConvertInstanceToClassicIdsJob).not_to have_been_enqueued end end @@ -103,7 +103,7 @@ expect(response).to have_http_status(:bad_request) expect(ProjectIdentifiers::ConvertInstanceToSemanticIdsJob).not_to have_been_enqueued - expect(ProjectIdentifiers::RevertInstanceToClassicIdsJob).not_to have_been_enqueued + expect(ProjectIdentifiers::ConvertInstanceToClassicIdsJob).not_to have_been_enqueued end end end diff --git a/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb b/spec/services/project_identifiers/convert_project_to_classic_service_spec.rb similarity index 98% rename from spec/services/project_identifiers/revert_project_to_classic_service_spec.rb rename to spec/services/project_identifiers/convert_project_to_classic_service_spec.rb index 25b52bf6adce..aa5cbdcfe86a 100644 --- a/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb +++ b/spec/services/project_identifiers/convert_project_to_classic_service_spec.rb @@ -30,7 +30,7 @@ require "rails_helper" -RSpec.describe ProjectIdentifiers::RevertProjectToClassicService do +RSpec.describe ProjectIdentifiers::ConvertProjectToClassicService do describe "#call" do context "when the project has a classic identifier in FriendlyId history" do let!(:project) do diff --git a/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb b/spec/workers/project_identifiers/convert_instance_to_classic_ids_job_spec.rb similarity index 80% rename from spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb rename to spec/workers/project_identifiers/convert_instance_to_classic_ids_job_spec.rb index 0bfcc3bf3e6f..cff63317e4f1 100644 --- a/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb +++ b/spec/workers/project_identifiers/convert_instance_to_classic_ids_job_spec.rb @@ -30,7 +30,7 @@ require "rails_helper" -RSpec.describe ProjectIdentifiers::RevertInstanceToClassicIdsJob do +RSpec.describe ProjectIdentifiers::ConvertInstanceToClassicIdsJob do describe "#perform" do context "when the setting is not classic" do before { allow(Setting::WorkPackageIdentifier).to receive(:classic?).and_return(false) } @@ -51,10 +51,10 @@ end end - it "calls RevertProjectToClassicService for each project" do + it "calls ConvertProjectToClassicService for each project" do services = projects.map do |project| - instance_double(ProjectIdentifiers::RevertProjectToClassicService, call: nil).tap do |service| - allow(ProjectIdentifiers::RevertProjectToClassicService).to receive(:new).with(project).and_return(service) + instance_double(ProjectIdentifiers::ConvertProjectToClassicService, call: nil).tap do |service| + allow(ProjectIdentifiers::ConvertProjectToClassicService).to receive(:new).with(project).and_return(service) end end @@ -67,18 +67,18 @@ context "when a project already has a classic identifier" do let!(:project) { create(:project) } - it "skips it and does not call RevertProjectToClassicService" do - allow(ProjectIdentifiers::RevertProjectToClassicService).to receive(:new) + it "skips it and does not call ConvertProjectToClassicService" do + allow(ProjectIdentifiers::ConvertProjectToClassicService).to receive(:new) described_class.new.perform - expect(ProjectIdentifiers::RevertProjectToClassicService).not_to have_received(:new) + expect(ProjectIdentifiers::ConvertProjectToClassicService).not_to have_received(:new) end end context "when there are no projects" do - it "does not call RevertProjectToClassicService" do - allow(ProjectIdentifiers::RevertProjectToClassicService).to receive(:new) + it "does not call ConvertProjectToClassicService" do + allow(ProjectIdentifiers::ConvertProjectToClassicService).to receive(:new) described_class.new.perform - expect(ProjectIdentifiers::RevertProjectToClassicService).not_to have_received(:new) + expect(ProjectIdentifiers::ConvertProjectToClassicService).not_to have_received(:new) end end