Merge pull request #1081 from joyent/ether/fix-copy_user_data

skip users with a duplicate email address that were created since the dbs diverged
joyent · Jan 7, 2021 · ea7abdf · ea7abdf
2 parents 23c8316 + 28576c3
commit ea7abdf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/Conch/Command/copy_user_data.pm b/lib/Conch/Command/copy_user_data.pm
@@ -69,7 +69,7 @@ sub run ($self, @opts) {
             },
         ), $opt->from, $opt->to;
 
-    my $from_user_rs = $from_schema->resultset('user_account')->hri;
+    my $from_user_rs = $from_schema->resultset('user_account')->active->hri;
     my $to_user_rs = $to_schema->resultset('user_account');
 
     if ($opt->dry_run) {
@@ -86,6 +86,8 @@ sub run ($self, @opts) {
                 ++$updated;
             }
             else {
+                next if $to_user_rs->search(\[ 'lower(email) = lower(?)', $user_data->{email} ]);
+
                 my $row = $to_user_rs->new_result({});
                 # we do not use set_columns, because DBIx::Class::PassphraseColumn
                 # inappropriately wraps it to encrypt the data.