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

Move incomplete checkin removal from "maintenance" to "work" task

Browse source
This commit is contained in:
Daniel Friesel 2021-03-07 19:06:21 +01:00
parent a21826a055
commit 574e83d567
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,6 @@ sub run {
my ( $self, $filename ) = @_; my ( $self, $filename ) = @_;
my $now = DateTime->now( time_zone => 'Europe/Berlin' ); my $now = DateTime->now( time_zone => 'Europe/Berlin' );
my $checkin_deadline = $now->clone->subtract( hours => 48 );
my $verification_deadline = $now->clone->subtract( hours => 48 ); my $verification_deadline = $now->clone->subtract( hours => 48 );
my $deletion_deadline = $now->clone->subtract( hours => 72 ); my $deletion_deadline = $now->clone->subtract( hours => 72 );
my $old_deadline = $now->clone->subtract( years => 1 ); my $old_deadline = $now->clone->subtract( years => 1 );
@ -23,13 +22,6 @@ sub run {
my $db = $self->app->pg->db; my $db = $self->app->pg->db;
my $tx = $db->begin; my $tx = $db->begin;
my $res = $db->delete( 'in_transit',
{ checkin_time => { '<', $checkin_deadline } } );
if ( my $rows = $res->rows ) {
printf( "Removed %d incomplete checkins\n", $rows );
}
my $unverified = $db->select( my $unverified = $db->select(
'users', 'users',
'id, email, extract(epoch from registered_at) as registered_ts', 'id, email, extract(epoch from registered_at) as registered_ts',
@ -76,7 +68,7 @@ sub run {
printf( "Pruned unverified user %d\n", $user->{id} ); printf( "Pruned unverified user %d\n", $user->{id} );
} }
$res = $db->delete( 'pending_passwords', my $res = $db->delete( 'pending_passwords',
{ requested_at => { '<', $verification_deadline } } ); { requested_at => { '<', $verification_deadline } } );
if ( my $rows = $res->rows ) { if ( my $rows = $res->rows ) {

8
lib/Travelynx/Command/work.pm
View file

@ -18,10 +18,18 @@ sub run {
my ($self) = @_; my ($self) = @_;
my $now = DateTime->now( time_zone => 'Europe/Berlin' ); my $now = DateTime->now( time_zone => 'Europe/Berlin' );
my $checkin_deadline = $now->clone->subtract( hours => 48 );
my $json = JSON->new; my $json = JSON->new;
my $db = $self->app->pg->db; my $db = $self->app->pg->db;
my $res = $db->delete( 'in_transit',
{ checkin_time => { '<', $checkin_deadline } } );
if ( my $rows = $res->rows ) {
$self->app->log->debug("Removed ${rows} incomplete checkins");
}
for my $entry ( for my $entry (
$db->select( 'in_transit_str', '*', { cancelled => 0 } )->hashes->each ) $db->select( 'in_transit_str', '*', { cancelled => 0 } )->hashes->each )
{ {