diff --git a/app/controllers/import/source_users_controller.rb b/app/controllers/import/source_users_controller.rb index 3800bedd4d352f7b3963c9656c8ad9dc44255166..5972511dd5f81bbd170273ee8062ccc30aa4be83 100644 --- a/app/controllers/import/source_users_controller.rb +++ b/app/controllers/import/source_users_controller.rb @@ -4,7 +4,6 @@ module Import class SourceUsersController < ApplicationController prepend_before_action :check_feature_flag! - before_action :source_user before_action :check_source_user_valid! respond_to :html @@ -53,7 +52,7 @@ def source_user strong_memoize_attr :source_user def check_feature_flag! - not_found unless Feature.enabled?(:importer_user_mapping, current_user) + not_found unless Feature.enabled?(:importer_user_mapping, source_user.reassigned_by_user) end def banner(partial) diff --git a/app/workers/import/reassign_placeholder_user_records_worker.rb b/app/workers/import/reassign_placeholder_user_records_worker.rb index 93425b5f5a002ad16c43f3447b5e69cf6e39ba2c..eeb7d7bd61fb02f28cb953252736b05a7e928195 100644 --- a/app/workers/import/reassign_placeholder_user_records_worker.rb +++ b/app/workers/import/reassign_placeholder_user_records_worker.rb @@ -19,11 +19,6 @@ class ReassignPlaceholderUserRecordsWorker def perform(import_source_user_id, _params = {}) @import_source_user = Import::SourceUser.find_by_id(import_source_user_id) - return unless Feature.enabled?( - :importer_user_mapping, - User.actor_from_id(import_source_user&.reassigned_by_user_id) - ) - return unless import_source_user_valid? Import::ReassignPlaceholderUserRecordsService.new(import_source_user).execute diff --git a/spec/workers/import/reassign_placeholder_user_records_worker_spec.rb b/spec/workers/import/reassign_placeholder_user_records_worker_spec.rb index 4f05e1cdf68f29ea41bac254fc96b7f50d2015f9..e946e2bf961fde0c83ab7ab3894a2959bef73726 100644 --- a/spec/workers/import/reassign_placeholder_user_records_worker_spec.rb +++ b/spec/workers/import/reassign_placeholder_user_records_worker_spec.rb @@ -51,18 +51,6 @@ it_behaves_like 'an invalid source user' end - context 'when the feature flag is disabled' do - before do - stub_feature_flags(importer_user_mapping: false) - end - - it 'does not enqueue service to map records to real users' do - expect(Import::ReassignPlaceholderUserRecordsService).not_to receive(:new) - - perform_multiple(job_args) - end - end - it 'queues a DeletePlaceholderUserWorker with the source user ID' do expect(Import::DeletePlaceholderUserWorker) .to receive(:perform_async).with(import_source_user.id)