A platform for community discussion. Free, open, simple.
MT: Preserve valid usernames when external IDs duplicate (#44135)
Ruben Oussorenbf55a44c2872
diff --git a/script/bulk_import/generic_bulk.rb b/script/bulk_import/generic_bulk.rbindex dc318b416ee..bcc7a7e01f0 100644--- a/script/bulk_import/generic_bulk.rb+++ b/script/bulk_import/generic_bulk.rb@@ -1474,7 +1474,9 @@ class BulkImport::Generic < BulkImport::Baseupdate_delta_usersend- query("SELECT * FROM users ORDER BY id") { |rows| reserve_valid_usernames(rows) }+ query("SELECT id, username, email, sso_record, anonymized FROM users ORDER BY id") do |rows|+ reserve_valid_usernames(rows)+ endusers = query(<<~SQL)SELECT *@@ -1550,14 +1552,17 @@ class BulkImport::Generic < BulkImport::Basenext if user_id_from_imported_id(row["id"]).present? || row["anonymized"] == 1if (email = row["email"].presence&.downcase)- next if @emails.key?(email) || !emails.add?(email)+ next if @emails.key?(email) || emails.include?(email)endexternal_id = JSON.parse(row["sso_record"])["external_id"] if row["sso_record"].present?if external_id.present?- next if @external_ids.key?(external_id) || !external_ids.add?(external_id)+ next if @external_ids.key?(external_id) || external_ids.include?(external_id)end+ emails.add(email) if email+ external_ids.add(external_id) if external_id.present?+username = row["username"]next if username.blank? || fix_name(username) != usernamediff --git a/spec/script/bulk_import/generic_bulk_spec.rb b/spec/script/bulk_import/generic_bulk_spec.rbindex b875ad3aaa1..507ce6eba71 100644--- a/spec/script/bulk_import/generic_bulk_spec.rb+++ b/spec/script/bulk_import/generic_bulk_spec.rb@@ -1942,10 +1942,12 @@ if generic_import_dependencies_availabledef import_usernames(importer, rows)importer.reserve_valid_usernames(rows)rows.map do |row|+ external_id = JSON.parse(row["sso_record"])["external_id"] if row["sso_record"].present?importer.process_user(imported_id: row["id"],username: row["username"],email: row["email"],+ external_id: external_id,)endend@@ -2035,6 +2037,77 @@ if generic_import_dependencies_availableexpect(users.map { |user| user[:skip] }).to eq([nil, true, nil, true])end+ it "keeps an email available when an external ID maps an earlier row to an existing user" do+ importer = build_user_importer(BulkImport::Generic)+ importer.instance_variable_set(:@external_ids, { "existing-id" => 99 })++ users =+ import_usernames(+ importer,+ [+ {+ "id" => 1,+ "username" => "Existing",+ "email" => "[email protected]",+ "sso_record" => { external_id: "existing-id" }.to_json,+ },+ { "id" => 2, "username" => "Bob_" },+ { "id" => 3, "username" => "Bob", "email" => "[email protected]" },+ ],+ )++ expect(users.map { |user| user[:username] }).to eq(%w[Existing Bob_1 Bob])+ expect(users.map { |user| user[:skip] }).to eq([true, nil, nil])+ end++ it "keeps an email available when an external ID duplicates an earlier source row" do+ importer = build_user_importer(BulkImport::Generic)++ users =+ import_usernames(+ importer,+ [+ {+ "id" => 1,+ "username" => "First",+ "sso_record" => { external_id: "shared-id" }.to_json,+ },+ {+ "id" => 2,+ "username" => "Duplicate",+ "email" => "[email protected]",+ "sso_record" => { external_id: "shared-id" }.to_json,+ },+ { "id" => 3, "username" => "Bob_" },+ { "id" => 4, "username" => "Bob", "email" => "[email protected]" },+ ],+ )++ expect(users.map { |user| user[:username] }).to eq(%w[First Duplicate Bob_1 Bob])+ expect(users.map { |user| user[:skip] }).to eq([nil, true, nil, nil])+ end++ it "reserves usernames for users without SSO records after a user with one" do+ importer = build_user_importer(BulkImport::Generic)++ users =+ import_usernames(+ importer,+ [+ {+ "id" => 1,+ "username" => "Alice",+ "sso_record" => { external_id: "alice-id" }.to_json,+ },+ { "id" => 2, "username" => "Bob_" },+ { "id" => 3, "username" => "Bob" },+ ],+ )++ expect(users.map { |user| user[:username] }).to eq(%w[Alice Bob_1 Bob])+ expect(users.map { |user| user[:skip] }).to eq([nil, nil, nil])+ end+it "does not let a reservation displace an existing site user" doimporter = build_user_importer(BulkImport::Generic)importer.instance_variable_get(:@usernames_lower) << "dana"