Commit a5ab4fa6 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

regularly generate statistics in the background

parent 77ecd6d0

lib/Travelynx/Command/maintenance.pm

+17 −0
Original line number Diff line number Diff line 
package Travelynx::Command::maintenance;



# Copyright (C) 2020 Daniel Friesel

#

# SPDX-License-Identifier: MIT
@@ -136,6 +137,22 @@ sub run { 


	$tx->commit;



	# Computing stats may take a while, but we've got all time in the

	# world here. This means users won't have to wait when loading their

	# own journey log.

	say 'Generating missing stats ...';

	for

	  my $user ( $db->select( 'users', ['id'], { status => 1 } )->hashes->each )

	{

		$tx = $db->begin;

		$self->app->journeys->generate_missing_stats( uid => $user->{id} );

		$self->app->journeys->get_stats(

			uid  => $user->{id},

			year => $now->year

		);

		$tx->commit;

	}



	# Add estimated polylines to journeys logged before 2020-01-28



	$tx = $db->begin;

lib/Travelynx/Command/work.pm

+0 −13
Original line number Diff line number Diff line
@@ -288,19 +288,6 @@ sub run { 
		$self->app->traewelling_api->checkin( %{$candidate},

			trip_id => $trip_id );

	}



	# Computing yearly stats may take a while, but we've got all time in the

	# world here. This means users won't have to wait when loading their

	# own by-year journey log.

	for my $user ( $db->select( 'users', 'id', { status => 1 } )->hashes->each )

	{

		$self->app->journeys->get_stats(

			uid  => $user->{id},

			year => $now->year

		);

	}



	# TODO wait until all background jobs have terminated

}



1;

lib/Travelynx/Model/JourneyStatsCache.pm

+34 −12
Original line number Diff line number Diff line 
package Travelynx::Model::JourneyStatsCache;



# Copyright (C) 2020 Daniel Friesel

#

# SPDX-License-Identifier: MIT
@@ -33,8 +34,8 @@ sub add { 
		);

	};

	if ( my $err = $@ ) {

		if ( $err =~ m{duplicate key value violates unique constraint} )

		{

		if ( $err =~ m{duplicate key value violates unique constraint} ) {



			# If a user opens the same history page several times in

			# short succession, there is a race condition where several

			# Mojolicious workers execute this helper, notice that there is
@@ -97,4 +98,25 @@ sub invalidate { 
	);

}



sub get_yyyymm_having_stats {

	my ( $self, %opt ) = @_;

	my $uid = $opt{uid};

	my $db  = $opt{db} // $self->{pg}->db;

	my $res = $db->select(

		'journey_stats',

		[ 'year', 'month' ],

		{ user_id  => $uid },

		{ order_by => { -asc => [ 'year', 'month' ] } }

	);



	my @ret;

	for my $row ( $res->hashes->each ) {

		if ( $row->{month} != 0 ) {

			push( @ret, [ $row->{year}, $row->{month} ] );

		}

	}



	return @ret;

}



1;

lib/Travelynx/Model/Journeys.pm

+58 −1
Original line number Diff line number Diff line
@@ -763,6 +763,62 @@ sub get_months_for_year { 
	return @ret;

}



sub get_yyyymm_having_journeys {

	my ( $self, %opt ) = @_;

	my $uid = $opt{uid};

	my $db  = $opt{db} // $self->{pg}->db;

	my $res = $db->select(

		'journeys',

		"distinct to_char(real_departure, 'YYYY.MM') as yearmonth",

		{ user_id  => $uid },

		{ order_by => { -asc => 'yearmonth' } }

	);



	my @ret;

	for my $row ( $res->hashes->each ) {

		push( @ret, [ split( qr{[.]}, $row->{yearmonth} ) ] );

	}



	return @ret;

}



sub generate_missing_stats {

	my ( $self, %opt ) = @_;

	my $uid            = $opt{uid};

	my $db             = $opt{db} // $self->{pg}->db;

	my @journey_months = $self->get_yyyymm_having_journeys(

		uid => $uid,

		db  => $db

	);

	my @stats_months = $self->stats_cache->get_yyyymm_having_stats(

		uid => $uid,

		$db => $db

	);



	my $stats_index = 0;



	for my $journey_index ( 0 .. $#journey_months ) {

		if (    $stats_index < @stats_months

			and $journey_months[$journey_index][0]

			== $stats_months[$stats_index][0]

			and $journey_months[$journey_index][1]

			== $stats_months[$stats_index][1] )

		{

			$stats_index++;

		}

		else {

			my ( $year, $month ) = @{ $journey_months[$journey_index] };

			$self->get_stats(

				uid        => $uid,

				db         => $db,

				year       => $year,

				month      => $month,

				write_only => 1

			);

		}

	}

}



sub get_nav_months {

	my ( $self, %opt ) = @_;
@@ -1048,7 +1104,8 @@ sub get_stats { 
	# checks out of a train or manually edits/adds a journey.



	if (

		my $stats = $self->stats_cache->get(

		not $opt{write_only}

		and my $stats = $self->stats_cache->get(

			uid   => $uid,

			db    => $db,

			year  => $year,