PrivateCoffee/travelynx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move account deletion to Users model

Browse source
This commit is contained in:
Daniel Friesel 2023-01-22 13:07:46 +01:00
parent 1c63574245
commit 3499311154
No known key found for this signature in database
GPG key ID: 100D5BFB5166E005
2 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/Travelynx/Command/maintenance.pm
View file

@ -143,27 +143,13 @@ sub run {
for my $uid (@uids_to_delete) { for my $uid (@uids_to_delete) {
say "Deleting uid ${uid}..."; say "Deleting uid ${uid}...";
my $tokens_res = $db->delete( 'tokens', { user_id => $uid } ); my $count = $self->app->users->delete(
my $stats_res = $db->delete( 'journey_stats', { user_id => $uid } ); uid => $uid,
my $journeys_res = $db->delete( 'journeys', { user_id => $uid } ); db => $db,
my $transit_res = $db->delete( 'in_transit', { user_id => $uid } ); in_transaction => 1
my $hooks_res = $db->delete( 'webhooks', { user_id => $uid } ); );
my $trwl_res = $db->delete( 'traewelling', { user_id => $uid } );
my $lt_res = $db->delete( 'localtransit', { user_id => $uid } );
my $password_res
= $db->delete( 'pending_passwords', { user_id => $uid } );
my $user_res = $db->delete( 'users', { id => $uid } );
printf( " %d tokens, %d monthly stats, %d journeys\n", printf( " %d tokens, %d monthly stats, %d journeys\n",
$tokens_res->rows, $stats_res->rows, $journeys_res->rows ); $count->{tokens}, $count->{stats}, $count->{journeys} );
if ( $user_res->rows != 1 ) {
printf STDERR (
"Deleted %d rows from users, expected 1. Rollback and abort.\n",
$user_res->rows
);
exit(1);
}
} }
$tx->commit; $tx->commit;

38
lib/Travelynx/Model/Users.pm
View file

@ -451,6 +451,44 @@ sub unflag_deletion {
); );
} }
sub delete {
my ( $self, %opt ) = @_;
my $db = $opt{db} // $self->{pg}->db;
my $uid = $opt{uid};
my $tx;
if ( not $opt{in_transaction} ) {
$tx = $db->begin;
}
my %res;
$res{tokens} = $db->delete( 'tokens', { user_id => $uid } );
$res{stats} = $db->delete( 'journey_stats', { user_id => $uid } );
$res{journeys} = $db->delete( 'journeys', { user_id => $uid } );
$res{transit} = $db->delete( 'in_transit', { user_id => $uid } );
$res{hooks} = $db->delete( 'webhooks', { user_id => $uid } );
$res{trwl} = $db->delete( 'traewelling', { user_id => $uid } );
$res{lt} = $db->delete( 'localtransit', { user_id => $uid } );
$res{password} = $db->delete( 'pending_passwords', { user_id => $uid } );
$res{users} = $db->delete( 'users', { id => $uid } );
for my $key ( keys %res ) {
$res{$key} = $res{$key}->rows;
}
if ( $res{users} != 1 ) {
die("Deleted $res{users} rows from users, expected 1. Rolling back.\n");
}
if ( not $opt{in_transaction} ) {
$tx->commit;
}
return \%res;
}
sub set_password_hash { sub set_password_hash {
my ( $self, %opt ) = @_; my ( $self, %opt ) = @_;
my $db = $opt{db} // $self->{pg}->db; my $db = $opt{db} // $self->{pg}->db;