2019-03-21 21:12:45 +00:00
|
|
|
package Travelynx;
|
|
|
|
use Mojo::Base 'Mojolicious';
|
|
|
|
|
2019-04-17 11:10:49 +00:00
|
|
|
use Mojo::Pg;
|
2019-05-31 18:18:22 +00:00
|
|
|
use Mojo::Promise;
|
2019-03-21 21:12:45 +00:00
|
|
|
use Mojolicious::Plugin::Authentication;
|
|
|
|
use Cache::File;
|
|
|
|
use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64);
|
|
|
|
use DateTime;
|
2019-05-31 18:18:22 +00:00
|
|
|
use DateTime::Format::Strptime;
|
2019-03-21 21:12:45 +00:00
|
|
|
use Encode qw(decode encode);
|
2020-01-06 16:59:40 +00:00
|
|
|
use File::Slurp qw(read_file);
|
2019-03-21 21:12:45 +00:00
|
|
|
use Geo::Distance;
|
2019-04-07 14:55:35 +00:00
|
|
|
use JSON;
|
2019-12-14 20:53:23 +00:00
|
|
|
use List::Util;
|
2019-03-21 21:12:45 +00:00
|
|
|
use List::MoreUtils qw(after_incl before_incl);
|
2019-06-23 15:08:47 +00:00
|
|
|
use Travel::Status::DE::DBWagenreihung;
|
2019-03-21 21:12:45 +00:00
|
|
|
use Travel::Status::DE::IRIS;
|
|
|
|
use Travel::Status::DE::IRIS::Stations;
|
2019-04-02 18:10:48 +00:00
|
|
|
use Travelynx::Helper::Sendmail;
|
2019-05-31 18:18:22 +00:00
|
|
|
use XML::LibXML;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
|
|
|
sub check_password {
|
|
|
|
my ( $password, $hash ) = @_;
|
|
|
|
|
|
|
|
if ( bcrypt( $password, $hash ) eq $hash ) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub epoch_to_dt {
|
|
|
|
my ($epoch) = @_;
|
|
|
|
|
|
|
|
# Bugs (and user errors) may lead to undefined timestamps. Set them to
|
|
|
|
# 1970-01-01 to avoid crashing and show obviously wrong data instead.
|
|
|
|
$epoch //= 0;
|
|
|
|
|
|
|
|
return DateTime->from_epoch(
|
|
|
|
epoch => $epoch,
|
|
|
|
time_zone => 'Europe/Berlin'
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
sub get_station {
|
|
|
|
my ($station_name) = @_;
|
|
|
|
|
|
|
|
my @candidates
|
|
|
|
= Travel::Status::DE::IRIS::Stations::get_station($station_name);
|
|
|
|
|
|
|
|
if ( @candidates == 1 ) {
|
|
|
|
return $candidates[0];
|
|
|
|
}
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub startup {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
2019-03-22 20:18:03 +00:00
|
|
|
push( @{ $self->commands->namespaces }, 'Travelynx::Command' );
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->defaults( layout => 'default' );
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->types->type( json => 'application/json; charset=utf-8' );
|
|
|
|
|
2019-04-13 10:17:19 +00:00
|
|
|
$self->plugin('Config');
|
|
|
|
|
|
|
|
if ( $self->config->{secrets} ) {
|
|
|
|
$self->secrets( $self->config->{secrets} );
|
|
|
|
}
|
|
|
|
|
2019-12-29 22:06:39 +00:00
|
|
|
chomp $self->app->config->{version};
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->plugin(
|
|
|
|
authentication => {
|
|
|
|
autoload_user => 1,
|
|
|
|
fail_render => { template => 'login' },
|
|
|
|
load_user => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
return $self->get_user_data($uid);
|
|
|
|
},
|
|
|
|
validate_user => sub {
|
|
|
|
my ( $self, $username, $password, $extradata ) = @_;
|
|
|
|
my $user_info = $self->get_user_password($username);
|
|
|
|
if ( not $user_info ) {
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
if ( $user_info->{status} != 1 ) {
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
if ( check_password( $password, $user_info->{password_hash} ) )
|
|
|
|
{
|
|
|
|
return $user_info->{id};
|
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
return undef;
|
2019-03-22 15:57:24 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
);
|
|
|
|
$self->sessions->default_expiration( 60 * 60 * 24 * 180 );
|
|
|
|
|
2019-06-01 16:04:50 +00:00
|
|
|
# Starting with v8.11, Mojolicious sends SameSite=Lax Cookies by default.
|
|
|
|
# In theory, "The default lax value provides a reasonable balance between
|
|
|
|
# security and usability for websites that want to maintain user's logged-in
|
|
|
|
# session after the user arrives from an external link". In practice,
|
|
|
|
# Safari (both iOS and macOS) does not send a SameSite=lax cookie when
|
|
|
|
# following a link from an external site. So, marudor.de providing a
|
|
|
|
# checkin link to travelynx.de/s/whatever does not work because the user
|
|
|
|
# is not logged in due to Safari not sending the cookie.
|
|
|
|
#
|
|
|
|
# This looks a lot like a Safari bug, but we can't do anything about it. So
|
|
|
|
# we don't set the SameSite flag at all for now.
|
|
|
|
#
|
|
|
|
# --derf, 2019-05-01
|
|
|
|
$self->sessions->samesite(undef);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->defaults( layout => 'default' );
|
|
|
|
|
2019-05-18 06:23:59 +00:00
|
|
|
$self->hook(
|
|
|
|
before_dispatch => sub {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
# The "theme" cookie is set client-side if the theme we delivered was
|
|
|
|
# changed by dark mode detection or by using the theme switcher. It's
|
|
|
|
# not part of Mojolicious' session data (and can't be, due to
|
|
|
|
# signing and HTTPOnly), so we need to add it here.
|
2019-05-18 06:23:59 +00:00
|
|
|
for my $cookie ( @{ $self->req->cookies } ) {
|
|
|
|
if ( $cookie->name eq 'theme' ) {
|
|
|
|
$self->session( theme => $cookie->value );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-13 10:17:19 +00:00
|
|
|
$self->attr(
|
|
|
|
cache_iris_main => sub {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
|
|
|
return Cache::File->new(
|
|
|
|
cache_root => $self->app->config->{cache}->{schedule},
|
|
|
|
default_expires => '6 hours',
|
|
|
|
lock_level => Cache::File::LOCK_LOCAL(),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->attr(
|
|
|
|
cache_iris_rt => sub {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
|
|
|
return Cache::File->new(
|
|
|
|
cache_root => $self->app->config->{cache}->{realtime},
|
|
|
|
default_expires => '70 seconds',
|
|
|
|
lock_level => Cache::File::LOCK_LOCAL(),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->attr(
|
|
|
|
token_type => sub {
|
|
|
|
return {
|
|
|
|
status => 1,
|
|
|
|
history => 2,
|
2019-12-14 20:53:23 +00:00
|
|
|
travel => 3,
|
2019-12-14 19:46:02 +00:00
|
|
|
import => 4,
|
2019-03-22 15:57:24 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
);
|
|
|
|
$self->attr(
|
|
|
|
token_types => sub {
|
2019-12-14 20:53:23 +00:00
|
|
|
return [qw(status history travel import)];
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-12-08 09:29:25 +00:00
|
|
|
$self->attr(
|
|
|
|
account_public_mask => sub {
|
|
|
|
return {
|
|
|
|
status_intern => 0x01,
|
|
|
|
status_extern => 0x02,
|
|
|
|
status_comment => 0x04,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->attr(
|
|
|
|
journey_edit_mask => sub {
|
|
|
|
return {
|
|
|
|
sched_departure => 0x0001,
|
|
|
|
real_departure => 0x0002,
|
|
|
|
route => 0x0010,
|
2019-12-08 18:46:45 +00:00
|
|
|
is_cancelled => 0x0020,
|
2019-12-08 09:29:25 +00:00
|
|
|
sched_arrival => 0x0100,
|
|
|
|
real_arrival => 0x0200,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-11-16 14:24:16 +00:00
|
|
|
$self->attr(
|
|
|
|
coordinates_by_station => sub {
|
2020-01-25 14:46:42 +00:00
|
|
|
my $legacy_names = $self->app->renamed_station;
|
2019-11-16 14:24:16 +00:00
|
|
|
my %location;
|
|
|
|
for
|
|
|
|
my $station ( Travel::Status::DE::IRIS::Stations::get_stations() )
|
|
|
|
{
|
|
|
|
if ( $station->[3] ) {
|
|
|
|
$location{ $station->[1] }
|
|
|
|
= [ $station->[4], $station->[3] ];
|
|
|
|
}
|
|
|
|
}
|
2020-01-06 17:24:28 +00:00
|
|
|
while ( my ( $old_name, $new_name ) = each %{$legacy_names} ) {
|
2019-12-28 13:35:07 +00:00
|
|
|
$location{$old_name} = $location{$new_name};
|
|
|
|
}
|
2019-11-16 14:24:16 +00:00
|
|
|
return \%location;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2020-01-04 17:48:46 +00:00
|
|
|
# https://de.wikipedia.org/wiki/Liste_nach_Gemeinden_und_Regionen_benannter_IC/ICE-Fahrzeuge#Namensgebung_ICE-Triebz%C3%BCge_nach_Gemeinden
|
|
|
|
# via https://github.com/marudor/BahnhofsAbfahrten/blob/master/src/server/Reihung/ICENaming.ts
|
|
|
|
$self->attr(
|
|
|
|
ice_name => sub {
|
2020-01-06 17:03:50 +00:00
|
|
|
my $id_to_name = JSON->new->utf8->decode(
|
|
|
|
scalar read_file('share/ice_names.json') );
|
2020-01-06 16:59:40 +00:00
|
|
|
return $id_to_name;
|
2020-01-04 17:48:46 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2020-01-25 14:46:42 +00:00
|
|
|
$self->attr(
|
|
|
|
renamed_station => sub {
|
|
|
|
my $legacy_to_new = JSON->new->utf8->decode(
|
|
|
|
scalar read_file('share/old_station_names.json') );
|
|
|
|
return $legacy_to_new;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
$self->attr(
|
|
|
|
station_by_eva => sub {
|
|
|
|
my %map;
|
|
|
|
for
|
|
|
|
my $station ( Travel::Status::DE::IRIS::Stations::get_stations() )
|
|
|
|
{
|
|
|
|
$map{ $station->[2] } = $station;
|
|
|
|
}
|
|
|
|
return \%map;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-17 11:10:49 +00:00
|
|
|
$self->helper(
|
|
|
|
sendmail => sub {
|
|
|
|
state $sendmail = Travelynx::Helper::Sendmail->new(
|
|
|
|
config => ( $self->config->{mail} // {} ),
|
|
|
|
log => $self->log
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
2019-04-17 11:10:49 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-04 16:26:53 +00:00
|
|
|
$self->helper(
|
2019-04-17 11:10:49 +00:00
|
|
|
pg => sub {
|
|
|
|
my ($self) = @_;
|
|
|
|
my $config = $self->app->config;
|
|
|
|
|
|
|
|
my $dbname = $config->{db}->{database};
|
|
|
|
my $host = $config->{db}->{host} // 'localhost';
|
|
|
|
my $port = $config->{db}->{port} // 5432;
|
|
|
|
my $user = $config->{db}->{user};
|
|
|
|
my $pw = $config->{db}->{password};
|
|
|
|
|
|
|
|
state $pg
|
|
|
|
= Mojo::Pg->new("postgresql://${user}\@${host}:${port}/${dbname}")
|
|
|
|
->password($pw);
|
2019-04-13 15:09:10 +00:00
|
|
|
}
|
2019-04-04 16:26:53 +00:00
|
|
|
);
|
2019-04-02 18:10:48 +00:00
|
|
|
|
2019-05-19 08:32:57 +00:00
|
|
|
$self->helper(
|
|
|
|
'now' => sub {
|
|
|
|
return DateTime->now( time_zone => 'Europe/Berlin' );
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-21 13:46:19 +00:00
|
|
|
$self->helper(
|
|
|
|
'numify_skipped_stations' => sub {
|
|
|
|
my ( $self, $count ) = @_;
|
|
|
|
|
|
|
|
if ( $count == 0 ) {
|
|
|
|
return 'INTERNAL ERROR';
|
|
|
|
}
|
|
|
|
if ( $count == 1 ) {
|
|
|
|
return
|
|
|
|
'Eine Station ohne Geokoordinaten wurde nicht berücksichtigt.';
|
|
|
|
}
|
|
|
|
return
|
|
|
|
"${count} Stationen ohne Geookordinaten wurden nicht berücksichtigt.";
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_departures' => sub {
|
2019-07-14 19:29:52 +00:00
|
|
|
my ( $self, $station, $lookbehind, $lookahead, $with_related ) = @_;
|
2019-03-22 15:57:24 +00:00
|
|
|
|
2019-07-14 19:29:52 +00:00
|
|
|
$lookbehind //= 180;
|
|
|
|
$lookahead //= 30;
|
|
|
|
$with_related //= 0;
|
2019-03-22 15:57:24 +00:00
|
|
|
|
|
|
|
my @station_matches
|
|
|
|
= Travel::Status::DE::IRIS::Stations::get_station($station);
|
|
|
|
|
|
|
|
if ( @station_matches == 1 ) {
|
|
|
|
$station = $station_matches[0][0];
|
|
|
|
my $status = Travel::Status::DE::IRIS->new(
|
|
|
|
station => $station,
|
2019-04-13 10:17:19 +00:00
|
|
|
main_cache => $self->app->cache_iris_main,
|
|
|
|
realtime_cache => $self->app->cache_iris_rt,
|
2019-12-15 12:42:11 +00:00
|
|
|
keep_transfers => 1,
|
2019-03-22 15:57:24 +00:00
|
|
|
lookbehind => 20,
|
|
|
|
datetime => DateTime->now( time_zone => 'Europe/Berlin' )
|
|
|
|
->subtract( minutes => $lookbehind ),
|
2019-05-09 15:58:23 +00:00
|
|
|
lookahead => $lookbehind + $lookahead,
|
|
|
|
lwp_options => {
|
|
|
|
timeout => 10,
|
|
|
|
agent => 'travelynx/' . $self->app->config->{version},
|
|
|
|
},
|
2019-07-14 19:29:52 +00:00
|
|
|
with_related => $with_related,
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
|
|
|
return {
|
2019-12-23 21:57:45 +00:00
|
|
|
results => [ $status->results ],
|
|
|
|
errstr => $status->errstr,
|
|
|
|
station_ds100 =>
|
|
|
|
( $status->station ? $status->station->{ds100} : undef ),
|
|
|
|
station_eva =>
|
|
|
|
( $status->station ? $status->station->{uic} : undef ),
|
2019-03-22 15:57:24 +00:00
|
|
|
station_name =>
|
2019-12-23 21:57:45 +00:00
|
|
|
( $status->station ? $status->station->{name} : undef ),
|
2019-10-19 08:15:18 +00:00
|
|
|
related_stations => [ $status->related_stations ],
|
2019-03-22 15:57:24 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
elsif ( @station_matches > 1 ) {
|
|
|
|
return {
|
|
|
|
results => [],
|
2019-12-23 21:57:45 +00:00
|
|
|
errstr => 'Mehrdeutiger Stationsname. Mögliche Eingaben: '
|
|
|
|
. join( q{, }, map { $_->[1] } @station_matches ),
|
2019-03-22 15:57:24 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return {
|
|
|
|
results => [],
|
2019-12-23 21:57:45 +00:00
|
|
|
errstr => 'Unbekannte Station',
|
2019-03-22 15:57:24 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-11-22 16:59:50 +00:00
|
|
|
$self->helper(
|
|
|
|
'grep_unknown_stations' => sub {
|
|
|
|
my ( $self, @stations ) = @_;
|
|
|
|
|
|
|
|
my @unknown_stations;
|
|
|
|
for my $station (@stations) {
|
|
|
|
my $station_info = get_station($station);
|
|
|
|
if ( not $station_info ) {
|
|
|
|
push( @unknown_stations, $station );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return @unknown_stations;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-26 17:53:01 +00:00
|
|
|
# Returns (journey id, error)
|
2019-04-13 08:43:05 +00:00
|
|
|
# Must be called during a transaction.
|
|
|
|
# Must perform a rollback on error.
|
|
|
|
$self->helper(
|
|
|
|
'add_journey' => sub {
|
|
|
|
my ( $self, %opt ) = @_;
|
|
|
|
|
2019-04-26 17:53:01 +00:00
|
|
|
my $db = $opt{db};
|
2019-12-14 19:46:02 +00:00
|
|
|
my $uid = $opt{uid} // $self->current_user->{id};
|
2019-04-26 17:53:01 +00:00
|
|
|
my $now = DateTime->now( time_zone => 'Europe/Berlin' );
|
2019-04-13 08:43:05 +00:00
|
|
|
my $dep_station = get_station( $opt{dep_station} );
|
|
|
|
my $arr_station = get_station( $opt{arr_station} );
|
|
|
|
|
|
|
|
if ( not $dep_station ) {
|
2019-04-26 17:56:03 +00:00
|
|
|
return ( undef, 'Unbekannter Startbahnhof' );
|
2019-04-13 08:43:05 +00:00
|
|
|
}
|
|
|
|
if ( not $arr_station ) {
|
2019-04-26 17:56:03 +00:00
|
|
|
return ( undef, 'Unbekannter Zielbahnhof' );
|
2019-04-13 08:43:05 +00:00
|
|
|
}
|
|
|
|
|
2020-01-26 14:31:01 +00:00
|
|
|
my $daily_journey_count = $db->select(
|
|
|
|
'journeys_str',
|
|
|
|
'count(*) as count',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
real_dep_ts => {
|
|
|
|
-between => [
|
|
|
|
$opt{rt_departure}->clone->subtract( days => 1 )
|
|
|
|
->epoch,
|
|
|
|
$opt{rt_departure}->epoch
|
|
|
|
],
|
|
|
|
},
|
|
|
|
}
|
|
|
|
)->hash->{count};
|
|
|
|
|
|
|
|
if ( $daily_journey_count >= 100 ) {
|
|
|
|
return ( undef,
|
|
|
|
"In den 24 Stunden vor der angegebenen Abfahrtszeit wurden ${daily_journey_count} weitere Fahrten angetreten. Das kann nicht stimmen."
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-11-19 18:46:21 +00:00
|
|
|
my @route = ( [ $dep_station->[1], {}, undef ] );
|
|
|
|
|
|
|
|
if ( $opt{route} ) {
|
|
|
|
my @unknown_stations;
|
|
|
|
for my $station ( @{ $opt{route} } ) {
|
|
|
|
my $station_info = get_station($station);
|
2019-12-17 19:09:02 +00:00
|
|
|
if ($station_info) {
|
|
|
|
push( @route, [ $station_info->[1], {}, undef ] );
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
push( @route, [ $station, {}, undef ] );
|
2019-11-19 18:46:21 +00:00
|
|
|
push( @unknown_stations, $station );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-17 19:09:02 +00:00
|
|
|
if ( not $opt{lax} ) {
|
|
|
|
if ( @unknown_stations == 1 ) {
|
|
|
|
return ( undef,
|
|
|
|
"Unbekannter Unterwegshalt: $unknown_stations[0]" );
|
|
|
|
}
|
|
|
|
elsif (@unknown_stations) {
|
|
|
|
return ( undef,
|
|
|
|
'Unbekannte Unterwegshalte: '
|
|
|
|
. join( ', ', @unknown_stations ) );
|
|
|
|
}
|
2019-11-19 18:46:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
push( @route, [ $arr_station->[1], {}, undef ] );
|
|
|
|
|
|
|
|
if ( $route[0][0] eq $route[1][0] ) {
|
|
|
|
shift(@route);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( $route[-2][0] eq $route[-1][0] ) {
|
|
|
|
pop(@route);
|
|
|
|
}
|
|
|
|
|
2019-04-26 17:53:01 +00:00
|
|
|
my $entry = {
|
2019-12-23 21:57:45 +00:00
|
|
|
user_id => $uid,
|
|
|
|
train_type => $opt{train_type},
|
|
|
|
train_line => $opt{train_line},
|
|
|
|
train_no => $opt{train_no},
|
|
|
|
train_id => 'manual',
|
|
|
|
checkin_station_id => $dep_station->[2],
|
2019-04-26 17:53:01 +00:00
|
|
|
checkin_time => $now,
|
|
|
|
sched_departure => $opt{sched_departure},
|
|
|
|
real_departure => $opt{rt_departure},
|
2019-12-23 21:57:45 +00:00
|
|
|
checkout_station_id => $arr_station->[2],
|
|
|
|
sched_arrival => $opt{sched_arrival},
|
|
|
|
real_arrival => $opt{rt_arrival},
|
|
|
|
checkout_time => $now,
|
|
|
|
edited => 0x3fff,
|
|
|
|
cancelled => $opt{cancelled} ? 1 : 0,
|
|
|
|
route => JSON->new->encode( \@route ),
|
2019-04-17 17:35:38 +00:00
|
|
|
};
|
|
|
|
|
2019-04-26 17:53:01 +00:00
|
|
|
if ( $opt{comment} ) {
|
2019-08-23 08:34:02 +00:00
|
|
|
$entry->{user_data}
|
|
|
|
= JSON->new->encode( { comment => $opt{comment} } );
|
2019-04-13 08:43:05 +00:00
|
|
|
}
|
2019-04-17 17:35:38 +00:00
|
|
|
|
2019-04-26 17:53:01 +00:00
|
|
|
my $journey_id = undef;
|
2019-04-17 17:35:38 +00:00
|
|
|
eval {
|
2019-04-26 17:53:01 +00:00
|
|
|
$journey_id
|
|
|
|
= $db->insert( 'journeys', $entry, { returning => 'id' } )
|
|
|
|
->hash->{id};
|
2019-12-14 19:46:02 +00:00
|
|
|
$self->invalidate_stats_cache( $opt{rt_departure}, $db, $uid );
|
2019-04-17 17:35:38 +00:00
|
|
|
};
|
2019-04-26 17:53:01 +00:00
|
|
|
|
2019-04-17 17:35:38 +00:00
|
|
|
if ($@) {
|
2019-04-26 17:53:01 +00:00
|
|
|
$self->app->log->error("add_journey($uid): $@");
|
|
|
|
return ( undef, 'add_journey failed: ' . $@ );
|
2019-04-13 08:43:05 +00:00
|
|
|
}
|
2019-04-26 17:53:01 +00:00
|
|
|
|
|
|
|
return ( $journey_id, undef );
|
2019-04-13 08:43:05 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'checkin' => sub {
|
2019-12-14 20:53:23 +00:00
|
|
|
my ( $self, $station, $train_id, $uid ) = @_;
|
|
|
|
|
|
|
|
$uid //= $self->current_user->{id};
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-07-14 19:29:52 +00:00
|
|
|
my $status = $self->get_departures( $station, 140, 40, 0 );
|
2019-03-22 15:57:24 +00:00
|
|
|
if ( $status->{errstr} ) {
|
|
|
|
return ( undef, $status->{errstr} );
|
|
|
|
}
|
|
|
|
else {
|
2019-12-14 20:53:23 +00:00
|
|
|
my ($train) = List::Util::first { $_->train_id eq $train_id }
|
|
|
|
@{ $status->{results} };
|
2019-03-22 15:57:24 +00:00
|
|
|
if ( not defined $train ) {
|
|
|
|
return ( undef, "Train ${train_id} not found" );
|
|
|
|
}
|
|
|
|
else {
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-12-14 20:53:23 +00:00
|
|
|
my $user = $self->get_user_status($uid);
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( $user->{checked_in} or $user->{cancelled} ) {
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-05-20 16:59:28 +00:00
|
|
|
if ( $user->{train_id} eq $train_id
|
2019-12-23 21:57:45 +00:00
|
|
|
and $user->{dep_eva} eq $status->{station_eva} )
|
2019-05-20 16:59:28 +00:00
|
|
|
{
|
|
|
|
# checking in twice is harmless
|
|
|
|
return ( $train, undef );
|
|
|
|
}
|
|
|
|
|
|
|
|
# Otherwise, someone forgot to check out first
|
2019-12-14 20:53:23 +00:00
|
|
|
$self->checkout( $station, 1, $uid );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
|
|
|
|
2019-04-17 17:35:38 +00:00
|
|
|
eval {
|
2019-05-26 15:28:21 +00:00
|
|
|
my $json = JSON->new;
|
2019-04-17 17:35:38 +00:00
|
|
|
$self->pg->db->insert(
|
2019-04-23 16:08:07 +00:00
|
|
|
'in_transit',
|
2019-04-17 17:35:38 +00:00
|
|
|
{
|
2019-12-14 20:53:23 +00:00
|
|
|
user_id => $uid,
|
2019-04-23 16:08:07 +00:00
|
|
|
cancelled => $train->departure_is_cancelled
|
|
|
|
? 1
|
|
|
|
: 0,
|
2019-12-23 21:57:45 +00:00
|
|
|
checkin_station_id => $status->{station_eva},
|
2019-04-23 16:08:07 +00:00
|
|
|
checkin_time =>
|
2019-04-17 17:35:38 +00:00
|
|
|
DateTime->now( time_zone => 'Europe/Berlin' ),
|
2019-05-18 15:10:53 +00:00
|
|
|
dep_platform => $train->platform,
|
2019-04-23 16:08:07 +00:00
|
|
|
train_type => $train->type,
|
|
|
|
train_line => $train->line_no,
|
|
|
|
train_no => $train->train_no,
|
|
|
|
train_id => $train->train_id,
|
|
|
|
sched_departure => $train->sched_departure,
|
|
|
|
real_departure => $train->departure,
|
2019-05-26 15:28:21 +00:00
|
|
|
route => $json->encode(
|
2019-10-04 21:27:45 +00:00
|
|
|
[ $self->route_diff($train) ]
|
2019-05-26 15:28:21 +00:00
|
|
|
),
|
|
|
|
messages => $json->encode(
|
|
|
|
[
|
|
|
|
map { [ $_->[0]->epoch, $_->[1] ] }
|
|
|
|
$train->messages
|
|
|
|
]
|
2019-04-17 17:35:38 +00:00
|
|
|
)
|
|
|
|
}
|
|
|
|
);
|
|
|
|
};
|
|
|
|
if ($@) {
|
2019-03-25 17:12:01 +00:00
|
|
|
$self->app->log->error(
|
2019-04-23 16:08:07 +00:00
|
|
|
"Checkin($uid): INSERT failed: $@");
|
2019-04-17 17:35:38 +00:00
|
|
|
return ( undef, 'INSERT failed: ' . $@ );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-12-14 20:53:23 +00:00
|
|
|
$self->add_route_timestamps( $uid, $train, 1 );
|
|
|
|
$self->run_hook( $uid, 'checkin' );
|
2019-04-17 17:35:38 +00:00
|
|
|
return ( $train, undef );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'undo' => sub {
|
2019-12-14 20:53:23 +00:00
|
|
|
my ( $self, $journey_id, $uid ) = @_;
|
|
|
|
$uid //= $self->current_user->{id};
|
2019-03-22 15:57:24 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( $journey_id eq 'in_transit' ) {
|
|
|
|
eval {
|
|
|
|
$self->pg->db->delete( 'in_transit', { user_id => $uid } );
|
|
|
|
};
|
|
|
|
if ($@) {
|
|
|
|
$self->app->log->error("Undo($uid, $journey_id): $@");
|
|
|
|
return "Undo($journey_id): $@";
|
|
|
|
}
|
2019-05-05 16:09:11 +00:00
|
|
|
$self->run_hook( $uid, 'undo' );
|
2019-04-23 16:08:07 +00:00
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
if ( $journey_id !~ m{ ^ \d+ $ }x ) {
|
|
|
|
return 'Invalid Journey ID';
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
|
|
|
|
2019-04-17 11:10:49 +00:00
|
|
|
eval {
|
2019-04-23 16:08:07 +00:00
|
|
|
my $db = $self->pg->db;
|
|
|
|
my $tx = $db->begin;
|
|
|
|
|
|
|
|
my $journey = $db->select(
|
|
|
|
'journeys',
|
|
|
|
'*',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
id => $journey_id
|
|
|
|
}
|
|
|
|
)->hash;
|
|
|
|
$db->delete(
|
|
|
|
'journeys',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
id => $journey_id
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( $journey->{edited} ) {
|
|
|
|
die(
|
|
|
|
"Cannot undo a journey which has already been edited. Please delete manually.\n"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
delete $journey->{edited};
|
|
|
|
delete $journey->{id};
|
|
|
|
|
|
|
|
$db->insert( 'in_transit', $journey );
|
|
|
|
|
|
|
|
my $cache_ts = DateTime->now( time_zone => 'Europe/Berlin' );
|
|
|
|
if ( $journey->{real_departure}
|
|
|
|
=~ m{ ^ (?<year> \d{4} ) - (?<month> \d{2} ) }x )
|
|
|
|
{
|
|
|
|
$cache_ts->set(
|
|
|
|
year => $+{year},
|
|
|
|
month => $+{month}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-12-19 17:18:26 +00:00
|
|
|
$self->invalidate_stats_cache( $cache_ts, $db, $uid );
|
2019-04-23 16:08:07 +00:00
|
|
|
|
|
|
|
$tx->commit;
|
2019-04-17 11:10:49 +00:00
|
|
|
};
|
|
|
|
if ($@) {
|
2019-04-23 16:08:07 +00:00
|
|
|
$self->app->log->error("Undo($uid, $journey_id): $@");
|
|
|
|
return "Undo($journey_id): $@";
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-05-05 16:09:11 +00:00
|
|
|
$self->run_hook( $uid, 'undo' );
|
2019-04-23 16:08:07 +00:00
|
|
|
return undef;
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
# Statistics are partitioned by real_departure, which must be provided
|
|
|
|
# when calling this function e.g. after journey deletion or editing.
|
|
|
|
# If a joureny's real_departure has been edited, this function must be
|
|
|
|
# called twice: once with the old and once with the new value.
|
2019-04-07 15:16:06 +00:00
|
|
|
$self->helper(
|
|
|
|
'invalidate_stats_cache' => sub {
|
2019-04-23 19:30:31 +00:00
|
|
|
my ( $self, $ts, $db, $uid ) = @_;
|
2019-04-07 15:16:06 +00:00
|
|
|
|
2019-04-23 19:30:31 +00:00
|
|
|
$uid //= $self->current_user->{id};
|
|
|
|
$db //= $self->pg->db;
|
2019-04-07 15:16:06 +00:00
|
|
|
|
2019-04-17 11:10:49 +00:00
|
|
|
$self->pg->db->delete(
|
|
|
|
'journey_stats',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
year => $ts->year,
|
|
|
|
month => $ts->month,
|
|
|
|
}
|
|
|
|
);
|
|
|
|
$self->pg->db->delete(
|
|
|
|
'journey_stats',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
year => $ts->year,
|
|
|
|
month => 0,
|
|
|
|
}
|
|
|
|
);
|
2019-04-07 15:16:06 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'checkout' => sub {
|
2019-04-23 19:30:31 +00:00
|
|
|
my ( $self, $station, $force, $uid ) = @_;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-06-17 18:59:57 +00:00
|
|
|
my $db = $self->pg->db;
|
2019-07-14 19:29:52 +00:00
|
|
|
my $status = $self->get_departures( $station, 120, 120, 0 );
|
2019-04-23 19:30:31 +00:00
|
|
|
$uid //= $self->current_user->{id};
|
|
|
|
my $user = $self->get_user_status($uid);
|
2019-03-22 15:57:24 +00:00
|
|
|
my $train_id = $user->{train_id};
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
if ( not $user->{checked_in} and not $user->{cancelled} ) {
|
2019-04-23 16:08:07 +00:00
|
|
|
return ( 0, 'You are not checked into any train' );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
|
|
|
if ( $status->{errstr} and not $force ) {
|
2019-04-23 16:08:07 +00:00
|
|
|
return ( 1, $status->{errstr} );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-07 15:16:06 +00:00
|
|
|
my $now = DateTime->now( time_zone => 'Europe/Berlin' );
|
2019-04-23 16:08:07 +00:00
|
|
|
my $journey
|
2019-06-01 09:52:42 +00:00
|
|
|
= $db->select( 'in_transit', '*', { user_id => $uid } )
|
|
|
|
->expand->hash;
|
2019-12-15 12:42:11 +00:00
|
|
|
|
|
|
|
# Note that a train may pass the same station several times.
|
|
|
|
# Notable example: S41 / S42 ("Ringbahn") both starts and
|
|
|
|
# terminates at Berlin Südkreuz
|
|
|
|
my ($train) = List::Util::first {
|
|
|
|
$_->train_id eq $train_id
|
|
|
|
and $_->sched_arrival
|
|
|
|
and $_->sched_arrival->epoch > $user->{sched_departure}->epoch
|
|
|
|
}
|
|
|
|
@{ $status->{results} };
|
|
|
|
|
|
|
|
$train //= List::Util::first { $_->train_id eq $train_id }
|
2019-12-14 20:53:23 +00:00
|
|
|
@{ $status->{results} };
|
2019-04-23 16:08:07 +00:00
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
my $new_checkout_station_id = $status->{station_eva};
|
|
|
|
|
2019-11-12 18:13:38 +00:00
|
|
|
# When a checkout is triggered by a checkin, there is an edge case
|
|
|
|
# with related stations.
|
|
|
|
# Assume a user travels from A to B1, then from B2 to C. B1 and B2 are
|
|
|
|
# relatd stations (e.g. "Frankfurt Hbf" and "Frankfurt Hbf(tief)").
|
|
|
|
# Now, if they check in for the journey from B2 to C, and have not yet
|
|
|
|
# checked out of the previous train, $train is undef as B2 is not B1.
|
|
|
|
# Redo the request with with_related => 1 to avoid this case.
|
|
|
|
# While at it, we increase the lookahead to handle long journeys as
|
|
|
|
# well.
|
|
|
|
if ( not $train ) {
|
|
|
|
$status = $self->get_departures( $station, 120, 180, 1 );
|
2019-12-14 20:53:23 +00:00
|
|
|
($train) = List::Util::first { $_->train_id eq $train_id }
|
|
|
|
@{ $status->{results} };
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( $train
|
|
|
|
and $self->app->station_by_eva->{ $train->station_uic } )
|
|
|
|
{
|
|
|
|
$new_checkout_station_id = $train->station_uic;
|
|
|
|
}
|
2019-11-12 18:13:38 +00:00
|
|
|
}
|
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
# Store the intended checkout station regardless of this operation's
|
|
|
|
# success.
|
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{
|
|
|
|
checkout_station_id => $new_checkout_station_id,
|
|
|
|
},
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
|
|
|
|
# If in_transit already contains arrival data for another estimated
|
|
|
|
# destination, we must invalidate it.
|
|
|
|
if ( defined $journey->{checkout_station_id}
|
|
|
|
and $journey->{checkout_station_id}
|
|
|
|
!= $new_checkout_station_id )
|
|
|
|
{
|
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{
|
|
|
|
checkout_time => undef,
|
2019-05-18 15:10:53 +00:00
|
|
|
arr_platform => undef,
|
2019-04-23 16:08:07 +00:00
|
|
|
sched_arrival => undef,
|
|
|
|
real_arrival => undef,
|
|
|
|
},
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
|
2019-09-18 16:08:06 +00:00
|
|
|
if ( not defined $train ) {
|
2019-06-01 09:52:42 +00:00
|
|
|
|
2019-09-18 16:08:06 +00:00
|
|
|
# Arrival time via IRIS is unknown, so the train probably has not
|
|
|
|
# arrived yet. Fall back to HAFAS.
|
2019-12-23 21:57:45 +00:00
|
|
|
# TODO support cases where $station is EVA or DS100 code
|
2019-12-14 20:53:23 +00:00
|
|
|
if (
|
|
|
|
my $station_data
|
|
|
|
= List::Util::first { $_->[0] eq $station }
|
|
|
|
@{ $journey->{route} }
|
|
|
|
)
|
2019-06-01 09:52:42 +00:00
|
|
|
{
|
|
|
|
$station_data = $station_data->[1];
|
|
|
|
if ( $station_data->{sched_arr} ) {
|
|
|
|
my $sched_arr
|
|
|
|
= epoch_to_dt( $station_data->{sched_arr} );
|
|
|
|
my $rt_arr = $sched_arr->clone;
|
|
|
|
if ( $station_data->{adelay}
|
|
|
|
and $station_data->{adelay} =~ m{^\d+$} )
|
|
|
|
{
|
|
|
|
$rt_arr->add( minutes => $station_data->{adelay} );
|
|
|
|
}
|
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{
|
|
|
|
sched_arrival => $sched_arr,
|
|
|
|
real_arrival => $rt_arr
|
|
|
|
},
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
2019-09-18 16:08:06 +00:00
|
|
|
if ( not $force ) {
|
|
|
|
$self->run_hook( $uid, 'update' );
|
|
|
|
return ( 1, undef );
|
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
my $has_arrived = 0;
|
|
|
|
|
|
|
|
eval {
|
|
|
|
|
|
|
|
my $tx = $db->begin;
|
|
|
|
|
|
|
|
if ( defined $train ) {
|
2019-12-20 17:33:59 +00:00
|
|
|
|
|
|
|
if ( not $train->arrival ) {
|
|
|
|
die("Train has no arrival timestamp\n");
|
|
|
|
}
|
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
$has_arrived = $train->arrival->epoch < $now->epoch ? 1 : 0;
|
2019-05-26 15:28:21 +00:00
|
|
|
my $json = JSON->new;
|
2019-04-23 16:08:07 +00:00
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
2019-04-17 17:35:38 +00:00
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
checkout_time => $now,
|
2019-05-18 15:10:53 +00:00
|
|
|
arr_platform => $train->platform,
|
2019-04-23 16:08:07 +00:00
|
|
|
sched_arrival => $train->sched_arrival,
|
|
|
|
real_arrival => $train->arrival,
|
|
|
|
cancelled => $train->arrival_is_cancelled ? 1 : 0,
|
2019-05-26 15:28:21 +00:00
|
|
|
route =>
|
2019-10-04 21:27:45 +00:00
|
|
|
$json->encode( [ $self->route_diff($train) ] ),
|
2019-05-26 15:28:21 +00:00
|
|
|
messages => $json->encode(
|
|
|
|
[
|
|
|
|
map { [ $_->[0]->epoch, $_->[1] ] }
|
|
|
|
$train->messages
|
|
|
|
]
|
|
|
|
)
|
2019-04-23 16:08:07 +00:00
|
|
|
},
|
|
|
|
{ user_id => $uid }
|
2019-04-17 17:35:38 +00:00
|
|
|
);
|
2019-11-22 16:59:50 +00:00
|
|
|
if ($has_arrived) {
|
|
|
|
my @unknown_stations
|
|
|
|
= $self->grep_unknown_stations( $train->route );
|
|
|
|
if (@unknown_stations) {
|
|
|
|
$self->app->log->warn(
|
|
|
|
'Encountered unknown stations: '
|
|
|
|
. join( ', ', @unknown_stations ) );
|
|
|
|
}
|
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
|
|
|
|
$journey
|
|
|
|
= $db->select( 'in_transit', '*', { user_id => $uid } )->hash;
|
|
|
|
|
|
|
|
if ( $has_arrived or $force ) {
|
2019-06-04 19:12:36 +00:00
|
|
|
delete $journey->{data};
|
2019-04-23 16:08:07 +00:00
|
|
|
$journey->{edited} = 0;
|
|
|
|
$journey->{checkout_time} = $now;
|
|
|
|
$db->insert( 'journeys', $journey );
|
|
|
|
$db->delete( 'in_transit', { user_id => $uid } );
|
|
|
|
|
|
|
|
my $cache_ts = $now->clone;
|
|
|
|
if ( $journey->{real_departure}
|
|
|
|
=~ m{ ^ (?<year> \d{4} ) - (?<month> \d{2} ) }x )
|
|
|
|
{
|
|
|
|
$cache_ts->set(
|
|
|
|
year => $+{year},
|
|
|
|
month => $+{month}
|
|
|
|
);
|
|
|
|
}
|
2019-04-23 19:30:31 +00:00
|
|
|
$self->invalidate_stats_cache( $cache_ts, $db, $uid );
|
2019-04-23 16:08:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
$tx->commit;
|
|
|
|
};
|
|
|
|
|
|
|
|
if ($@) {
|
|
|
|
$self->app->log->error("Checkout($uid): $@");
|
|
|
|
return ( 1, 'Checkout error: ' . $@ );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
|
|
|
|
if ( $has_arrived or $force ) {
|
2019-05-05 16:09:11 +00:00
|
|
|
$self->run_hook( $uid, 'checkout' );
|
2019-05-06 14:59:48 +00:00
|
|
|
return ( 0, undef );
|
2019-04-23 16:08:07 +00:00
|
|
|
}
|
2019-05-06 14:59:48 +00:00
|
|
|
$self->run_hook( $uid, 'update' );
|
2019-12-14 20:53:23 +00:00
|
|
|
$self->add_route_timestamps( $uid, $train, 0 );
|
2019-04-23 16:08:07 +00:00
|
|
|
return ( 1, undef );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
);
|
|
|
|
|
2019-04-30 10:47:32 +00:00
|
|
|
$self->helper(
|
|
|
|
'mark_seen' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
|
|
|
|
$self->pg->db->update(
|
|
|
|
'users',
|
|
|
|
{ last_seen => DateTime->now( time_zone => 'Europe/Berlin' ) },
|
|
|
|
{ id => $uid }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-12-06 20:40:51 +00:00
|
|
|
$self->helper(
|
|
|
|
'update_in_transit_comment' => sub {
|
2019-12-14 22:46:36 +00:00
|
|
|
my ( $self, $comment, $uid ) = @_;
|
|
|
|
$uid //= $self->current_user->{id};
|
2019-12-06 20:40:51 +00:00
|
|
|
|
|
|
|
my $status = $self->pg->db->select( 'in_transit', ['user_data'],
|
|
|
|
{ user_id => $uid } )->expand->hash;
|
|
|
|
if ( not $status ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
$status->{user_data}{comment} = $comment;
|
|
|
|
$self->pg->db->update(
|
|
|
|
'in_transit',
|
|
|
|
{ user_data => JSON->new->encode( $status->{user_data} ) },
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-08 19:20:04 +00:00
|
|
|
$self->helper(
|
|
|
|
'update_journey_part' => sub {
|
2019-04-23 16:08:07 +00:00
|
|
|
my ( $self, $db, $journey_id, $key, $value ) = @_;
|
2019-04-17 17:35:38 +00:00
|
|
|
my $rows;
|
2019-04-08 19:20:04 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
my $journey = $self->get_journey(
|
2019-11-24 19:29:52 +00:00
|
|
|
db => $db,
|
|
|
|
journey_id => $journey_id,
|
|
|
|
with_datetime => 1,
|
2019-04-23 16:08:07 +00:00
|
|
|
);
|
|
|
|
|
2019-04-17 17:35:38 +00:00
|
|
|
eval {
|
|
|
|
if ( $key eq 'sched_departure' ) {
|
|
|
|
$rows = $db->update(
|
2019-04-23 16:08:07 +00:00
|
|
|
'journeys',
|
2019-04-17 17:35:38 +00:00
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
sched_departure => $value,
|
|
|
|
edited => $journey->{edited} | 0x0001,
|
2019-04-17 17:35:38 +00:00
|
|
|
},
|
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
id => $journey_id,
|
2019-04-17 17:35:38 +00:00
|
|
|
}
|
|
|
|
)->rows;
|
|
|
|
}
|
|
|
|
elsif ( $key eq 'rt_departure' ) {
|
|
|
|
$rows = $db->update(
|
2019-04-23 16:08:07 +00:00
|
|
|
'journeys',
|
2019-04-17 17:35:38 +00:00
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
real_departure => $value,
|
|
|
|
edited => $journey->{edited} | 0x0002,
|
2019-04-17 17:35:38 +00:00
|
|
|
},
|
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
id => $journey_id,
|
2019-04-17 17:35:38 +00:00
|
|
|
}
|
|
|
|
)->rows;
|
2019-04-23 16:08:07 +00:00
|
|
|
|
|
|
|
# stats are partitioned by rt_departure -> both the cache for
|
|
|
|
# the old value (see bottom of this function) and the new value
|
|
|
|
# (here) must be invalidated.
|
|
|
|
$self->invalidate_stats_cache( $value, $db );
|
2019-04-17 17:35:38 +00:00
|
|
|
}
|
|
|
|
elsif ( $key eq 'sched_arrival' ) {
|
|
|
|
$rows = $db->update(
|
2019-04-23 16:08:07 +00:00
|
|
|
'journeys',
|
2019-04-17 17:35:38 +00:00
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
sched_arrival => $value,
|
|
|
|
edited => $journey->{edited} | 0x0100,
|
2019-04-17 17:35:38 +00:00
|
|
|
},
|
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
id => $journey_id,
|
2019-04-17 17:35:38 +00:00
|
|
|
}
|
|
|
|
)->rows;
|
|
|
|
}
|
|
|
|
elsif ( $key eq 'rt_arrival' ) {
|
|
|
|
$rows = $db->update(
|
2019-04-23 16:08:07 +00:00
|
|
|
'journeys',
|
2019-04-17 17:35:38 +00:00
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
real_arrival => $value,
|
|
|
|
edited => $journey->{edited} | 0x0200,
|
2019-04-17 17:35:38 +00:00
|
|
|
},
|
|
|
|
{
|
2019-04-23 16:08:07 +00:00
|
|
|
id => $journey_id,
|
2019-04-17 17:35:38 +00:00
|
|
|
}
|
|
|
|
)->rows;
|
|
|
|
}
|
2019-11-20 16:41:21 +00:00
|
|
|
elsif ( $key eq 'route' ) {
|
|
|
|
my @new_route = map { [ $_, {}, undef ] } @{$value};
|
|
|
|
$rows = $db->update(
|
|
|
|
'journeys',
|
|
|
|
{
|
|
|
|
route => JSON->new->encode( \@new_route ),
|
|
|
|
edited => $journey->{edited} | 0x0010,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id => $journey_id,
|
|
|
|
}
|
|
|
|
)->rows;
|
|
|
|
}
|
2019-12-08 18:46:45 +00:00
|
|
|
elsif ( $key eq 'cancelled' ) {
|
|
|
|
$rows = $db->update(
|
|
|
|
'journeys',
|
|
|
|
{
|
|
|
|
cancelled => $value,
|
|
|
|
edited => $journey->{edited} | 0x0020,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id => $journey_id,
|
|
|
|
}
|
|
|
|
)->rows;
|
|
|
|
}
|
2019-08-23 10:02:22 +00:00
|
|
|
elsif ( $key eq 'comment' ) {
|
|
|
|
$journey->{user_data}{comment} = $value;
|
|
|
|
$rows = $db->update(
|
|
|
|
'journeys',
|
|
|
|
{
|
|
|
|
user_data =>
|
|
|
|
JSON->new->encode( $journey->{user_data} ),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id => $journey_id,
|
|
|
|
}
|
|
|
|
)->rows;
|
|
|
|
}
|
2019-04-17 17:35:38 +00:00
|
|
|
else {
|
2019-04-23 16:08:07 +00:00
|
|
|
die("Invalid key $key\n");
|
2019-04-17 17:35:38 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
if ($@) {
|
2019-04-08 19:20:04 +00:00
|
|
|
$self->app->log->error(
|
2019-04-23 16:08:07 +00:00
|
|
|
"update_journey_part($journey_id, $key): $@");
|
|
|
|
return "update_journey_part($key): $@";
|
2019-04-08 19:20:04 +00:00
|
|
|
}
|
2019-04-17 17:35:38 +00:00
|
|
|
if ( $rows == 1 ) {
|
2019-04-23 16:08:07 +00:00
|
|
|
$self->invalidate_stats_cache( $journey->{rt_departure}, $db );
|
2019-04-17 17:35:38 +00:00
|
|
|
return undef;
|
2019-04-08 19:20:04 +00:00
|
|
|
}
|
2019-04-17 17:35:38 +00:00
|
|
|
return 'UPDATE failed: did not match any journey part';
|
2019-04-08 19:20:04 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'journey_sanity_check' => sub {
|
2019-12-17 19:01:39 +00:00
|
|
|
my ( $self, $journey, $lax ) = @_;
|
2019-04-08 19:20:04 +00:00
|
|
|
|
2020-01-28 19:01:00 +00:00
|
|
|
if ( defined $journey->{sched_duration}
|
|
|
|
and $journey->{sched_duration} <= 0 )
|
2019-04-08 19:20:04 +00:00
|
|
|
{
|
2019-04-09 16:11:55 +00:00
|
|
|
return
|
2020-01-28 19:01:00 +00:00
|
|
|
'Die geplante Dauer dieser Zugfahrt ist ≤ 0. Teleportation und Zeitreisen werden aktuell nicht unterstützt.';
|
2019-04-08 19:20:04 +00:00
|
|
|
}
|
2020-01-28 19:01:00 +00:00
|
|
|
if ( defined $journey->{rt_duration}
|
|
|
|
and $journey->{rt_duration} <= 0 )
|
|
|
|
{
|
2019-04-09 16:11:55 +00:00
|
|
|
return
|
2020-01-28 19:01:00 +00:00
|
|
|
'Die Dauer dieser Zugfahrt ist ≤ 0. Teleportation und Zeitreisen werden aktuell nicht unterstützt.';
|
2019-04-08 19:20:04 +00:00
|
|
|
}
|
|
|
|
if ( $journey->{sched_duration}
|
|
|
|
and $journey->{sched_duration} > 60 * 60 * 24 )
|
|
|
|
{
|
2019-04-09 16:11:55 +00:00
|
|
|
return 'Die Zugfahrt ist länger als 24 Stunden.';
|
2019-04-08 19:20:04 +00:00
|
|
|
}
|
|
|
|
if ( $journey->{rt_duration}
|
|
|
|
and $journey->{rt_duration} > 60 * 60 * 24 )
|
|
|
|
{
|
2019-04-09 16:11:55 +00:00
|
|
|
return 'Die Zugfahrt ist länger als 24 Stunden.';
|
2019-04-08 19:20:04 +00:00
|
|
|
}
|
2019-11-20 16:41:21 +00:00
|
|
|
if ( $journey->{kmh_route} > 500 or $journey->{kmh_beeline} > 500 )
|
|
|
|
{
|
|
|
|
return 'Zugfahrten mit über 500 km/h? Schön wär\'s.';
|
|
|
|
}
|
2019-12-17 19:01:39 +00:00
|
|
|
if ( $journey->{route} and @{ $journey->{route} } > 99 ) {
|
|
|
|
my $stop_count = @{ $journey->{route} };
|
|
|
|
return
|
|
|
|
"Die Zugfahrt hat $stop_count Unterwegshalte. Also ich weiß ja nicht so recht.";
|
|
|
|
}
|
|
|
|
if ( $journey->{edited} & 0x0010 and not $lax ) {
|
2019-11-22 16:59:50 +00:00
|
|
|
my @unknown_stations
|
|
|
|
= $self->grep_unknown_stations( map { $_->[0] }
|
|
|
|
@{ $journey->{route} } );
|
2019-11-20 16:41:21 +00:00
|
|
|
if (@unknown_stations) {
|
2019-11-22 16:59:50 +00:00
|
|
|
return 'Unbekannte Station(en): '
|
2019-11-20 16:41:21 +00:00
|
|
|
. join( ', ', @unknown_stations );
|
|
|
|
}
|
|
|
|
}
|
2019-04-08 19:20:04 +00:00
|
|
|
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
2019-04-30 16:05:07 +00:00
|
|
|
'verify_registration_token' => sub {
|
|
|
|
my ( $self, $uid, $token ) = @_;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-30 16:05:07 +00:00
|
|
|
my $db = $self->pg->db;
|
|
|
|
my $tx = $db->begin;
|
|
|
|
|
|
|
|
my $res = $db->select(
|
|
|
|
'pending_registrations',
|
|
|
|
'count(*) as count',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
token => $token
|
|
|
|
}
|
2019-04-19 19:56:54 +00:00
|
|
|
);
|
|
|
|
|
2019-04-30 16:05:07 +00:00
|
|
|
if ( $res->hash->{count} ) {
|
|
|
|
$db->update( 'users', { status => 1 }, { id => $uid } );
|
|
|
|
$db->delete( 'pending_registrations', { user_id => $uid } );
|
|
|
|
$tx->commit;
|
|
|
|
return 1;
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-29 18:12:59 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_uid_by_name_and_mail' => sub {
|
|
|
|
my ( $self, $name, $email ) = @_;
|
|
|
|
|
|
|
|
my $res = $self->pg->db->select(
|
|
|
|
'users',
|
|
|
|
['id'],
|
|
|
|
{
|
|
|
|
name => $name,
|
|
|
|
email => $email,
|
|
|
|
status => 1
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( my $user = $res->hash ) {
|
|
|
|
return $user->{id};
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-30 21:23:49 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_privacy_by_name' => sub {
|
|
|
|
my ( $self, $name ) = @_;
|
|
|
|
|
|
|
|
my $res = $self->pg->db->select(
|
|
|
|
'users',
|
|
|
|
[ 'id', 'public_level' ],
|
|
|
|
{
|
|
|
|
name => $name,
|
|
|
|
status => 1
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( my $user = $res->hash ) {
|
|
|
|
return $user;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'set_privacy' => sub {
|
|
|
|
my ( $self, $uid, $public_level ) = @_;
|
|
|
|
|
|
|
|
$self->pg->db->update(
|
|
|
|
'users',
|
|
|
|
{ public_level => $public_level },
|
|
|
|
{ id => $uid }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-29 18:12:59 +00:00
|
|
|
$self->helper(
|
|
|
|
'mark_for_password_reset' => sub {
|
|
|
|
my ( $self, $db, $uid, $token ) = @_;
|
|
|
|
|
|
|
|
my $res = $db->select(
|
|
|
|
'pending_passwords',
|
|
|
|
'count(*) as count',
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
if ( $res->hash->{count} ) {
|
|
|
|
return 'in progress';
|
|
|
|
}
|
|
|
|
|
|
|
|
$db->insert(
|
|
|
|
'pending_passwords',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
token => $token,
|
|
|
|
requested_at =>
|
|
|
|
DateTime->now( time_zone => 'Europe/Berlin' )
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'verify_password_token' => sub {
|
|
|
|
my ( $self, $uid, $token ) = @_;
|
|
|
|
|
|
|
|
my $res = $self->pg->db->select(
|
|
|
|
'pending_passwords',
|
|
|
|
'count(*) as count',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
token => $token
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( $res->hash->{count} ) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-30 10:08:51 +00:00
|
|
|
$self->helper(
|
|
|
|
'mark_for_mail_change' => sub {
|
|
|
|
my ( $self, $db, $uid, $email, $token ) = @_;
|
|
|
|
|
|
|
|
$db->insert(
|
|
|
|
'pending_mails',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
email => $email,
|
|
|
|
token => $token,
|
|
|
|
requested_at =>
|
|
|
|
DateTime->now( time_zone => 'Europe/Berlin' )
|
|
|
|
},
|
|
|
|
{
|
|
|
|
on_conflict => \
|
|
|
|
'(user_id) do update set email = EXCLUDED.email, token = EXCLUDED.token, requested_at = EXCLUDED.requested_at'
|
|
|
|
},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'change_mail_with_token' => sub {
|
|
|
|
my ( $self, $uid, $token ) = @_;
|
|
|
|
|
|
|
|
my $db = $self->pg->db;
|
|
|
|
my $tx = $db->begin;
|
|
|
|
|
|
|
|
my $res_h = $db->select(
|
|
|
|
'pending_mails',
|
|
|
|
['email'],
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
token => $token
|
|
|
|
}
|
|
|
|
)->hash;
|
|
|
|
|
|
|
|
if ($res_h) {
|
|
|
|
$db->update(
|
|
|
|
'users',
|
|
|
|
{ email => $res_h->{email} },
|
|
|
|
{ id => $uid }
|
|
|
|
);
|
|
|
|
$db->delete( 'pending_mails', { user_id => $uid } );
|
|
|
|
$tx->commit;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-29 18:12:59 +00:00
|
|
|
$self->helper(
|
|
|
|
'remove_password_token' => sub {
|
|
|
|
my ( $self, $uid, $token ) = @_;
|
|
|
|
|
|
|
|
$self->pg->db->delete(
|
|
|
|
'pending_passwords',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
token => $token
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
# This helper should only be called directly when also providing a user ID.
|
|
|
|
# If you don't have one, use current_user() instead (get_user_data will
|
|
|
|
# delegate to it anyways).
|
|
|
|
$self->helper(
|
|
|
|
'get_user_data' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$uid //= $self->current_user->{id};
|
2019-04-22 07:58:39 +00:00
|
|
|
|
|
|
|
my $user_data = $self->pg->db->select(
|
|
|
|
'users',
|
|
|
|
'id, name, status, public_level, email, '
|
|
|
|
. 'extract(epoch from registered_at) as registered_at_ts, '
|
2019-04-30 10:47:32 +00:00
|
|
|
. 'extract(epoch from last_seen) as last_seen_ts, '
|
2019-04-22 07:58:39 +00:00
|
|
|
. 'extract(epoch from deletion_requested) as deletion_requested_ts',
|
|
|
|
{ id => $uid }
|
|
|
|
)->hash;
|
|
|
|
|
|
|
|
if ($user_data) {
|
2019-03-22 15:57:24 +00:00
|
|
|
return {
|
2019-04-22 07:58:39 +00:00
|
|
|
id => $user_data->{id},
|
|
|
|
name => $user_data->{name},
|
|
|
|
status => $user_data->{status},
|
|
|
|
is_public => $user_data->{public_level},
|
|
|
|
email => $user_data->{email},
|
2019-03-22 15:57:24 +00:00
|
|
|
registered_at => DateTime->from_epoch(
|
2019-04-22 07:58:39 +00:00
|
|
|
epoch => $user_data->{registered_at_ts},
|
2019-03-22 15:57:24 +00:00
|
|
|
time_zone => 'Europe/Berlin'
|
|
|
|
),
|
|
|
|
last_seen => DateTime->from_epoch(
|
2019-04-30 10:47:32 +00:00
|
|
|
epoch => $user_data->{last_seen_ts},
|
2019-03-22 15:57:24 +00:00
|
|
|
time_zone => 'Europe/Berlin'
|
|
|
|
),
|
2019-04-22 07:58:39 +00:00
|
|
|
deletion_requested => $user_data->{deletion_requested_ts}
|
2019-03-22 15:57:24 +00:00
|
|
|
? DateTime->from_epoch(
|
2019-04-22 07:58:39 +00:00
|
|
|
epoch => $user_data->{deletion_requested_ts},
|
2019-03-22 15:57:24 +00:00
|
|
|
time_zone => 'Europe/Berlin'
|
|
|
|
)
|
|
|
|
: undef,
|
|
|
|
};
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
return undef;
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'get_api_token' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
$uid //= $self->current_user->{id};
|
2019-04-22 10:11:22 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
my $token = {};
|
2019-04-22 10:11:22 +00:00
|
|
|
my $res = $self->pg->db->select(
|
|
|
|
'tokens',
|
|
|
|
[ 'type', 'token' ],
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
|
|
|
|
for my $entry ( $res->hashes->each ) {
|
|
|
|
$token->{ $self->app->token_types->[ $entry->{type} - 1 ] }
|
|
|
|
= $entry->{token};
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-04-22 10:11:22 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
return $token;
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
|
|
|
|
2019-05-05 16:09:11 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_webhook' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
$uid //= $self->current_user->{id};
|
|
|
|
|
|
|
|
my $res_h
|
|
|
|
= $self->pg->db->select( 'webhooks_str', '*',
|
|
|
|
{ user_id => $uid } )->hash;
|
|
|
|
|
|
|
|
$res_h->{latest_run} = epoch_to_dt( $res_h->{latest_run_ts} );
|
|
|
|
|
|
|
|
return $res_h;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'set_webhook' => sub {
|
|
|
|
my ( $self, %opt ) = @_;
|
|
|
|
|
|
|
|
$opt{uid} //= $self->current_user->{id};
|
|
|
|
|
2019-05-06 14:59:48 +00:00
|
|
|
if ( $opt{token} ) {
|
|
|
|
$opt{token} =~ tr{\r\n}{}d;
|
|
|
|
}
|
|
|
|
|
2019-05-05 16:09:11 +00:00
|
|
|
my $res = $self->pg->db->insert(
|
|
|
|
'webhooks',
|
|
|
|
{
|
|
|
|
user_id => $opt{uid},
|
|
|
|
enabled => $opt{enabled},
|
|
|
|
url => $opt{url},
|
|
|
|
token => $opt{token}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
on_conflict => \
|
|
|
|
'(user_id) do update set enabled = EXCLUDED.enabled, url = EXCLUDED.url, token = EXCLUDED.token, errored = null, latest_run = null, output = null'
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'mark_hook_status' => sub {
|
|
|
|
my ( $self, $uid, $url, $success, $text ) = @_;
|
|
|
|
|
2019-05-06 14:59:48 +00:00
|
|
|
if ( length($text) > 1000 ) {
|
|
|
|
$text = substr( $text, 0, 1000 ) . '…';
|
2019-05-05 16:09:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
$self->pg->db->update(
|
|
|
|
'webhooks',
|
|
|
|
{
|
2019-05-10 17:03:18 +00:00
|
|
|
errored => $success ? 0 : 1,
|
2019-05-05 16:09:11 +00:00
|
|
|
latest_run => DateTime->now( time_zone => 'Europe/Berlin' ),
|
|
|
|
output => $text,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
url => $url
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'run_hook' => sub {
|
2019-05-14 18:05:45 +00:00
|
|
|
my ( $self, $uid, $reason, $callback ) = @_;
|
2019-05-05 16:09:11 +00:00
|
|
|
|
|
|
|
my $hook = $self->get_webhook($uid);
|
|
|
|
|
|
|
|
if ( not $hook->{enabled} or not $hook->{url} =~ m{^ https?:// }x )
|
|
|
|
{
|
2019-05-14 18:05:45 +00:00
|
|
|
if ($callback) {
|
|
|
|
&$callback();
|
|
|
|
}
|
2019-05-05 16:09:11 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-05-06 14:59:48 +00:00
|
|
|
my $status = $self->get_user_status_json_v1($uid);
|
2019-05-05 16:09:11 +00:00
|
|
|
my $header = {};
|
|
|
|
my $hook_body = {
|
|
|
|
reason => $reason,
|
|
|
|
status => $status,
|
|
|
|
};
|
|
|
|
|
|
|
|
if ( $hook->{token} ) {
|
|
|
|
$header->{Authorization} = "Bearer $hook->{token}";
|
2019-12-29 22:06:51 +00:00
|
|
|
$header->{'User-Agent'}
|
|
|
|
= 'travelynx/' . $self->app->config->{version};
|
2019-05-05 16:09:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
my $ua = $self->ua;
|
2019-05-14 18:05:45 +00:00
|
|
|
if ($callback) {
|
|
|
|
$ua->request_timeout(4);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$ua->request_timeout(10);
|
|
|
|
}
|
2019-05-05 16:09:11 +00:00
|
|
|
|
|
|
|
$ua->post_p( $hook->{url} => $header => json => $hook_body )->then(
|
|
|
|
sub {
|
|
|
|
my ($tx) = @_;
|
|
|
|
if ( my $err = $tx->error ) {
|
|
|
|
$self->mark_hook_status( $uid, $hook->{url}, 0,
|
|
|
|
"HTTP $err->{code} $err->{message}" );
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$self->mark_hook_status( $uid, $hook->{url}, 1,
|
|
|
|
$tx->result->body );
|
|
|
|
}
|
2019-05-14 18:05:45 +00:00
|
|
|
if ($callback) {
|
|
|
|
&$callback();
|
|
|
|
}
|
2019-05-05 16:09:11 +00:00
|
|
|
}
|
|
|
|
)->catch(
|
|
|
|
sub {
|
|
|
|
my ($err) = @_;
|
|
|
|
$self->mark_hook_status( $uid, $hook->{url}, 0, $err );
|
2019-05-14 18:05:45 +00:00
|
|
|
if ($callback) {
|
|
|
|
&$callback();
|
|
|
|
}
|
2019-05-05 16:09:11 +00:00
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_user_password' => sub {
|
|
|
|
my ( $self, $name ) = @_;
|
2019-04-22 07:58:39 +00:00
|
|
|
|
|
|
|
my $res_h = $self->pg->db->select(
|
|
|
|
'users',
|
|
|
|
'id, name, status, password as password_hash',
|
|
|
|
{ name => $name }
|
|
|
|
)->hash;
|
|
|
|
|
|
|
|
return $res_h;
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'add_user' => sub {
|
2019-04-22 10:11:22 +00:00
|
|
|
my ( $self, $db, $user_name, $email, $token, $password ) = @_;
|
|
|
|
|
|
|
|
# This helper must be called during a transaction, as user creation
|
|
|
|
# may fail even after the database entry has been generated, e.g. if
|
|
|
|
# the registration mail cannot be sent. We therefore use $db (the
|
|
|
|
# database handle performing the transaction) instead of $self->pg->db
|
|
|
|
# (which may be a new handle not belonging to the transaction).
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-22 07:58:39 +00:00
|
|
|
my $now = DateTime->now( time_zone => 'Europe/Berlin' );
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-22 10:11:22 +00:00
|
|
|
my $res = $db->insert(
|
2019-04-22 07:58:39 +00:00
|
|
|
'users',
|
|
|
|
{
|
|
|
|
name => $user_name,
|
|
|
|
status => 0,
|
|
|
|
public_level => 0,
|
|
|
|
email => $email,
|
|
|
|
password => $password,
|
|
|
|
registered_at => $now,
|
2019-04-30 10:47:32 +00:00
|
|
|
last_seen => $now,
|
2019-04-22 07:58:39 +00:00
|
|
|
},
|
|
|
|
{ returning => 'id' }
|
|
|
|
);
|
2019-04-30 16:05:07 +00:00
|
|
|
my $uid = $res->hash->{id};
|
|
|
|
|
|
|
|
$db->insert(
|
|
|
|
'pending_registrations',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
token => $token
|
|
|
|
}
|
|
|
|
);
|
2019-04-22 07:58:39 +00:00
|
|
|
|
2019-04-30 16:05:07 +00:00
|
|
|
return $uid;
|
2019-04-22 07:58:39 +00:00
|
|
|
}
|
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-22 07:58:39 +00:00
|
|
|
$self->helper(
|
|
|
|
'flag_user_deletion' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
|
|
|
|
my $now = DateTime->now( time_zone => 'Europe/Berlin' );
|
|
|
|
|
|
|
|
$self->pg->db->update(
|
|
|
|
'users',
|
|
|
|
{ deletion_requested => $now },
|
|
|
|
{
|
|
|
|
id => $uid,
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-04-22 07:58:39 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'unflag_user_deletion' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
|
|
|
|
$self->pg->db->update(
|
|
|
|
'users',
|
|
|
|
{
|
|
|
|
deletion_requested => undef,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id => $uid,
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-04-22 07:58:39 +00:00
|
|
|
);
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-06 09:20:10 +00:00
|
|
|
$self->helper(
|
|
|
|
'set_user_password' => sub {
|
|
|
|
my ( $self, $uid, $password ) = @_;
|
2019-04-22 07:58:39 +00:00
|
|
|
|
|
|
|
$self->pg->db->update(
|
|
|
|
'users',
|
|
|
|
{ password => $password },
|
|
|
|
{ id => $uid }
|
|
|
|
);
|
2019-04-06 09:20:10 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'check_if_user_name_exists' => sub {
|
|
|
|
my ( $self, $user_name ) = @_;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-22 07:58:39 +00:00
|
|
|
my $count = $self->pg->db->select(
|
|
|
|
'users',
|
|
|
|
'count(*) as count',
|
|
|
|
{ name => $user_name }
|
|
|
|
)->hash->{count};
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-22 07:58:39 +00:00
|
|
|
if ($count) {
|
2019-03-22 15:57:24 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'check_if_mail_is_blacklisted' => sub {
|
|
|
|
my ( $self, $mail ) = @_;
|
|
|
|
|
2019-04-22 07:58:39 +00:00
|
|
|
my $count = $self->pg->db->select(
|
|
|
|
'users',
|
|
|
|
'count(*) as count',
|
|
|
|
{
|
|
|
|
email => $mail,
|
|
|
|
status => 0,
|
|
|
|
}
|
|
|
|
)->hash->{count};
|
|
|
|
|
|
|
|
if ($count) {
|
2019-03-22 15:57:24 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2019-04-22 07:58:39 +00:00
|
|
|
|
|
|
|
$count = $self->pg->db->select(
|
2019-04-30 10:08:51 +00:00
|
|
|
'mail_blacklist',
|
2019-04-22 07:58:39 +00:00
|
|
|
'count(*) as count',
|
|
|
|
{
|
|
|
|
email => $mail,
|
|
|
|
num_tries => { '>', 1 },
|
|
|
|
}
|
|
|
|
)->hash->{count};
|
|
|
|
|
|
|
|
if ($count) {
|
2019-03-22 15:57:24 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-04 16:26:53 +00:00
|
|
|
$self->helper(
|
|
|
|
'delete_journey' => sub {
|
2019-04-23 16:08:07 +00:00
|
|
|
my ( $self, $journey_id, $checkin_epoch, $checkout_epoch ) = @_;
|
2019-04-04 16:26:53 +00:00
|
|
|
my $uid = $self->current_user->{id};
|
|
|
|
|
|
|
|
my @journeys = $self->get_user_travels(
|
2019-04-23 16:08:07 +00:00
|
|
|
uid => $uid,
|
|
|
|
journey_id => $journey_id
|
2019-04-04 16:26:53 +00:00
|
|
|
);
|
|
|
|
if ( @journeys == 0 ) {
|
|
|
|
return 'Journey not found';
|
|
|
|
}
|
|
|
|
my $journey = $journeys[0];
|
|
|
|
|
|
|
|
# Double-check (comparing both ID and action epoch) to make sure we
|
|
|
|
# are really deleting the right journey and the user isn't just
|
|
|
|
# playing around with POST requests.
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( $journey->{id} != $journey_id
|
2019-11-24 19:29:52 +00:00
|
|
|
or $journey->{checkin_ts} != $checkin_epoch
|
|
|
|
or $journey->{checkout_ts} != $checkout_epoch )
|
2019-04-04 16:26:53 +00:00
|
|
|
{
|
|
|
|
return 'Invalid journey data';
|
|
|
|
}
|
2019-04-17 17:35:38 +00:00
|
|
|
|
|
|
|
my $rows;
|
|
|
|
eval {
|
|
|
|
$rows = $self->pg->db->delete(
|
2019-04-23 16:08:07 +00:00
|
|
|
'journeys',
|
2019-04-17 17:35:38 +00:00
|
|
|
{
|
|
|
|
user_id => $uid,
|
2019-04-23 16:08:07 +00:00
|
|
|
id => $journey_id,
|
2019-04-17 17:35:38 +00:00
|
|
|
}
|
|
|
|
)->rows;
|
|
|
|
};
|
|
|
|
|
|
|
|
if ($@) {
|
2019-04-23 16:08:07 +00:00
|
|
|
$self->app->log->error("Delete($uid, $journey_id): $@");
|
2019-04-17 17:35:38 +00:00
|
|
|
return 'DELETE failed: ' . $@;
|
|
|
|
}
|
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( $rows == 1 ) {
|
2019-11-24 19:29:52 +00:00
|
|
|
$self->invalidate_stats_cache(
|
|
|
|
epoch_to_dt( $journey->{rt_dep_ts} ) );
|
2019-04-17 17:35:38 +00:00
|
|
|
return undef;
|
2019-04-04 16:26:53 +00:00
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
return sprintf( 'Deleted %d rows, expected 1', $rows );
|
2019-04-04 16:26:53 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-07 14:55:35 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_journey_stats' => sub {
|
|
|
|
my ( $self, %opt ) = @_;
|
|
|
|
|
|
|
|
if ( $opt{cancelled} ) {
|
2020-01-15 21:13:20 +00:00
|
|
|
$self->app->log->warn(
|
2019-04-07 14:55:35 +00:00
|
|
|
'get_journey_stats called with illegal option cancelled => 1'
|
|
|
|
);
|
|
|
|
return {};
|
|
|
|
}
|
|
|
|
|
2019-06-17 18:59:57 +00:00
|
|
|
my $uid = $opt{uid} // $self->current_user->{id};
|
|
|
|
my $year = $opt{year} // 0;
|
2019-04-07 14:55:35 +00:00
|
|
|
my $month = $opt{month} // 0;
|
|
|
|
|
|
|
|
# Assumption: If the stats cache contains an entry it is up-to-date.
|
|
|
|
# -> Cache entries must be explicitly invalidated whenever the user
|
|
|
|
# checks out of a train or manually edits/adds a journey.
|
|
|
|
|
2019-04-22 07:58:39 +00:00
|
|
|
my $res = $self->pg->db->select(
|
|
|
|
'journey_stats',
|
|
|
|
['data'],
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
year => $year,
|
|
|
|
month => $month
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
my $res_h = $res->expand->hash;
|
2019-04-07 14:55:35 +00:00
|
|
|
|
2019-04-22 07:58:39 +00:00
|
|
|
if ($res_h) {
|
|
|
|
$res->finish;
|
|
|
|
return $res_h->{data};
|
2019-04-07 14:55:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
my $interval_start = DateTime->new(
|
|
|
|
time_zone => 'Europe/Berlin',
|
|
|
|
year => 2000,
|
|
|
|
month => 1,
|
|
|
|
day => 1,
|
|
|
|
hour => 0,
|
|
|
|
minute => 0,
|
|
|
|
second => 0,
|
|
|
|
);
|
|
|
|
|
|
|
|
# I wonder if people will still be traveling by train in the year 3000
|
|
|
|
my $interval_end = $interval_start->clone->add( years => 1000 );
|
|
|
|
|
|
|
|
if ( $opt{year} and $opt{month} ) {
|
|
|
|
$interval_start->set(
|
|
|
|
year => $opt{year},
|
|
|
|
month => $opt{month}
|
|
|
|
);
|
|
|
|
$interval_end = $interval_start->clone->add( months => 1 );
|
|
|
|
}
|
|
|
|
elsif ( $opt{year} ) {
|
|
|
|
$interval_start->set( year => $opt{year} );
|
|
|
|
$interval_end = $interval_start->clone->add( years => 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
my @journeys = $self->get_user_travels(
|
2019-05-11 13:23:29 +00:00
|
|
|
uid => $uid,
|
2019-04-07 14:55:35 +00:00
|
|
|
cancelled => $opt{cancelled} ? 1 : 0,
|
|
|
|
verbose => 1,
|
|
|
|
after => $interval_start,
|
|
|
|
before => $interval_end
|
|
|
|
);
|
|
|
|
my $stats = $self->compute_journey_stats(@journeys);
|
|
|
|
|
2019-07-20 18:58:28 +00:00
|
|
|
eval {
|
|
|
|
$self->pg->db->insert(
|
|
|
|
'journey_stats',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
year => $year,
|
|
|
|
month => $month,
|
|
|
|
data => JSON->new->encode($stats),
|
|
|
|
}
|
|
|
|
);
|
|
|
|
};
|
|
|
|
if ( my $err = $@ ) {
|
|
|
|
if ( $err =~ m{duplicate key value violates unique constraint} )
|
2019-04-17 11:10:49 +00:00
|
|
|
{
|
2019-07-20 18:58:28 +00:00
|
|
|
# When 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
|
|
|
|
# no up-to-date history, compute it, and insert it using the
|
|
|
|
# statement above. This will lead to a uniqueness violation
|
|
|
|
# in each successive insert. However, this is harmless, and
|
|
|
|
# thus ignored.
|
2019-04-17 11:10:49 +00:00
|
|
|
}
|
2019-07-20 18:58:28 +00:00
|
|
|
else {
|
|
|
|
# Otherwise we probably have a problem.
|
|
|
|
die($@);
|
|
|
|
}
|
|
|
|
}
|
2019-04-07 14:55:35 +00:00
|
|
|
|
|
|
|
return $stats;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-27 07:11:42 +00:00
|
|
|
$self->helper(
|
|
|
|
'history_years' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
$uid //= $self->current_user->{id},
|
|
|
|
|
|
|
|
my $res = $self->pg->db->select(
|
|
|
|
'journeys',
|
|
|
|
'distinct extract(year from real_departure) as year',
|
|
|
|
{ user_id => $uid },
|
|
|
|
{ order_by => { -asc => 'year' } }
|
|
|
|
);
|
|
|
|
|
|
|
|
my @ret;
|
|
|
|
for my $row ( $res->hashes->each ) {
|
|
|
|
push( @ret, [ $row->{year}, $row->{year} ] );
|
|
|
|
}
|
|
|
|
return @ret;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'history_months' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
$uid //= $self->current_user->{id},
|
|
|
|
|
|
|
|
my $res = $self->pg->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 ) {
|
|
|
|
my ( $year, $month ) = split( qr{[.]}, $row->{yearmonth} );
|
|
|
|
push( @ret, [ "${year}/${month}", "${month}.${year}" ] );
|
|
|
|
}
|
|
|
|
return @ret;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-10-04 21:27:45 +00:00
|
|
|
$self->helper(
|
|
|
|
'route_diff' => sub {
|
|
|
|
my ( $self, $train ) = @_;
|
|
|
|
my @json_route;
|
|
|
|
my @route = $train->route;
|
|
|
|
my @sched_route = $train->sched_route;
|
|
|
|
|
|
|
|
my $route_idx = 0;
|
|
|
|
my $sched_idx = 0;
|
|
|
|
|
|
|
|
while ( $route_idx <= $#route and $sched_idx <= $#sched_route ) {
|
|
|
|
if ( $route[$route_idx] eq $sched_route[$sched_idx] ) {
|
|
|
|
push( @json_route, [ $route[$route_idx], {}, undef ] );
|
|
|
|
$route_idx++;
|
|
|
|
$sched_idx++;
|
|
|
|
}
|
|
|
|
|
|
|
|
# this branch is inefficient, but won't be taken frequently
|
|
|
|
elsif ( not( grep { $_ eq $route[$route_idx] } @sched_route ) )
|
|
|
|
{
|
|
|
|
push( @json_route,
|
|
|
|
[ $route[$route_idx], {}, 'additional' ],
|
|
|
|
);
|
|
|
|
$route_idx++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
push( @json_route,
|
|
|
|
[ $sched_route[$sched_idx], {}, 'cancelled' ],
|
|
|
|
);
|
|
|
|
$sched_idx++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while ( $route_idx <= $#route ) {
|
|
|
|
push( @json_route, [ $route[$route_idx], {}, 'additional' ], );
|
|
|
|
$route_idx++;
|
|
|
|
}
|
|
|
|
while ( $sched_idx <= $#sched_route ) {
|
|
|
|
push( @json_route,
|
|
|
|
[ $sched_route[$sched_idx], {}, 'cancelled' ],
|
|
|
|
);
|
|
|
|
$sched_idx++;
|
|
|
|
}
|
|
|
|
return @json_route;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-06-22 15:02:04 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_dbdb_station_p' => sub {
|
2019-12-23 21:57:45 +00:00
|
|
|
my ( $self, $eva ) = @_;
|
2019-06-22 15:02:04 +00:00
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
my $url = "https://lib.finalrewind.org/dbdb/s/${eva}.json";
|
2019-06-22 15:02:04 +00:00
|
|
|
|
|
|
|
my $cache = $self->app->cache_iris_main;
|
|
|
|
my $promise = Mojo::Promise->new;
|
|
|
|
|
|
|
|
if ( my $content = $cache->thaw($url) ) {
|
|
|
|
$promise->resolve($content);
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
|
|
|
|
$self->ua->request_timeout(5)->get_p($url)->then(
|
|
|
|
sub {
|
|
|
|
my ($tx) = @_;
|
|
|
|
my $body = decode( 'utf-8', $tx->res->body );
|
|
|
|
|
|
|
|
my $json = JSON->new->decode($body);
|
|
|
|
$cache->freeze( $url, $json );
|
|
|
|
$promise->resolve($json);
|
|
|
|
}
|
|
|
|
)->catch(
|
|
|
|
sub {
|
|
|
|
my ($err) = @_;
|
|
|
|
$promise->reject($err);
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-12-11 20:36:41 +00:00
|
|
|
$self->helper(
|
|
|
|
'has_wagonorder_p' => sub {
|
|
|
|
my ( $self, $ts, $train_no ) = @_;
|
|
|
|
my $api_ts = $ts->strftime('%Y%m%d%H%M');
|
|
|
|
my $url
|
|
|
|
= "https://lib.finalrewind.org/dbdb/has_wagonorder/${train_no}/${api_ts}";
|
|
|
|
my $cache = $self->app->cache_iris_main;
|
|
|
|
my $promise = Mojo::Promise->new;
|
|
|
|
|
|
|
|
if ( my $content = $cache->get($url) ) {
|
2019-12-16 21:15:37 +00:00
|
|
|
if ( $content eq 'y' ) {
|
|
|
|
$promise->resolve;
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
elsif ( $content eq 'n' ) {
|
2019-12-11 20:36:41 +00:00
|
|
|
$promise->reject;
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$self->ua->request_timeout(5)->head_p($url)->then(
|
|
|
|
sub {
|
2019-12-16 21:15:37 +00:00
|
|
|
my ($tx) = @_;
|
|
|
|
if ( $tx->result->is_success ) {
|
|
|
|
$cache->set( $url, 'y' );
|
|
|
|
$promise->resolve;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$cache->set( $url, 'n' );
|
2020-01-22 19:18:37 +00:00
|
|
|
$promise->reject;
|
2019-12-16 21:15:37 +00:00
|
|
|
}
|
2019-12-11 20:36:41 +00:00
|
|
|
}
|
|
|
|
)->catch(
|
|
|
|
sub {
|
|
|
|
$cache->set( $url, 'n' );
|
|
|
|
$promise->reject;
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-06-17 18:59:57 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_wagonorder_p' => sub {
|
|
|
|
my ( $self, $ts, $train_no ) = @_;
|
|
|
|
my $api_ts = $ts->strftime('%Y%m%d%H%M');
|
|
|
|
my $url
|
|
|
|
= "https://www.apps-bahn.de/wr/wagenreihung/1.0/${train_no}/${api_ts}";
|
|
|
|
|
|
|
|
my $cache = $self->app->cache_iris_main;
|
|
|
|
my $promise = Mojo::Promise->new;
|
|
|
|
|
|
|
|
if ( my $content = $cache->thaw($url) ) {
|
|
|
|
$promise->resolve($content);
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
|
|
|
|
$self->ua->request_timeout(5)->get_p($url)->then(
|
|
|
|
sub {
|
|
|
|
my ($tx) = @_;
|
|
|
|
my $body = decode( 'utf-8', $tx->res->body );
|
|
|
|
|
|
|
|
my $json = JSON->new->decode($body);
|
|
|
|
$cache->freeze( $url, $json );
|
|
|
|
$promise->resolve($json);
|
|
|
|
}
|
|
|
|
)->catch(
|
|
|
|
sub {
|
|
|
|
my ($err) = @_;
|
|
|
|
$promise->reject($err);
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2020-01-27 19:32:15 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_hafas_polyline_p' => sub {
|
|
|
|
my ( $self, $train, $trip_id ) = @_;
|
|
|
|
|
|
|
|
my $line = $train->line // 0;
|
|
|
|
my $url
|
|
|
|
= "https://2.db.transport.rest/trips/${trip_id}?lineName=${line}&polyline=true";
|
|
|
|
my $cache = $self->app->cache_iris_main;
|
|
|
|
my $promise = Mojo::Promise->new;
|
|
|
|
my $version = $self->app->config->{version};
|
|
|
|
|
|
|
|
if ( my $content = $cache->thaw($url) ) {
|
|
|
|
$promise->resolve($content);
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
|
|
|
|
$self->ua->request_timeout(5)->get_p(
|
|
|
|
$url => {
|
|
|
|
'User-Agent' =>
|
|
|
|
"travelynx/${version} +https://finalrewind.org/projects/travelynx"
|
|
|
|
}
|
|
|
|
)->then(
|
|
|
|
sub {
|
|
|
|
my ($tx) = @_;
|
|
|
|
my $body = decode( 'utf-8', $tx->res->body );
|
|
|
|
my $json = JSON->new->decode($body);
|
|
|
|
my @coordinate_list;
|
|
|
|
|
|
|
|
for my $feature ( @{ $json->{polyline}{features} } ) {
|
|
|
|
if ( exists $feature->{geometry}{coordinates} ) {
|
|
|
|
my $coord = $feature->{geometry}{coordinates};
|
|
|
|
if ( exists $feature->{properties}{type}
|
|
|
|
and $feature->{properties}{type} eq 'stop' )
|
|
|
|
{
|
|
|
|
push( @{$coord}, $feature->{properties}{id} );
|
|
|
|
}
|
|
|
|
push( @coordinate_list, $coord );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
my $ret = {
|
|
|
|
name => $json->{line}{name} // '?',
|
|
|
|
polyline => [@coordinate_list],
|
|
|
|
raw => $json,
|
|
|
|
};
|
|
|
|
|
|
|
|
$cache->freeze( $url, $ret );
|
|
|
|
$promise->resolve($ret);
|
|
|
|
}
|
|
|
|
)->catch(
|
|
|
|
sub {
|
|
|
|
my ($err) = @_;
|
|
|
|
$promise->reject($err);
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2020-01-08 17:42:17 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_hafas_tripid_p' => sub {
|
|
|
|
my ( $self, $train ) = @_;
|
|
|
|
|
|
|
|
my $promise = Mojo::Promise->new;
|
|
|
|
my $cache = $self->app->cache_iris_main;
|
|
|
|
my $eva = $train->station_uic;
|
|
|
|
|
|
|
|
my $dep_ts = DateTime->now( time_zone => 'Europe/Berlin' );
|
|
|
|
my $url
|
|
|
|
= "https://2.db.transport.rest/stations/${eva}/departures?duration=5&when=$dep_ts";
|
|
|
|
|
|
|
|
if ( $train->sched_departure ) {
|
|
|
|
$dep_ts = $train->sched_departure->epoch;
|
|
|
|
$url
|
|
|
|
= "https://2.db.transport.rest/stations/${eva}/departures?duration=5&when=$dep_ts";
|
|
|
|
}
|
|
|
|
elsif ( $train->sched_arrival ) {
|
|
|
|
$dep_ts = $train->sched_arrival->epoch;
|
|
|
|
$url
|
|
|
|
= "https://2.db.transport.rest/stations/${eva}/arrivals?duration=5&when=$dep_ts";
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( my $content = $cache->get($url) ) {
|
|
|
|
$promise->resolve($content);
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
|
|
|
|
$self->ua->request_timeout(5)->get_p(
|
|
|
|
$url => {
|
|
|
|
'User-Agent' => 'travelynx/' . $self->app->config->{version}
|
|
|
|
}
|
|
|
|
)->then(
|
|
|
|
sub {
|
|
|
|
my ($tx) = @_;
|
|
|
|
my $body = decode( 'utf-8', $tx->res->body );
|
|
|
|
my $json = JSON->new->decode($body);
|
|
|
|
|
|
|
|
for my $result ( @{$json} ) {
|
|
|
|
if ( $result->{line}
|
|
|
|
and $result->{line}{fahrtNr} == $train->train_no )
|
|
|
|
{
|
|
|
|
my $trip_id = $result->{tripId};
|
|
|
|
$cache->set( $url, $trip_id );
|
|
|
|
$promise->resolve($trip_id);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$promise->reject;
|
|
|
|
}
|
|
|
|
)->catch(
|
|
|
|
sub {
|
|
|
|
my ($err) = @_;
|
|
|
|
$promise->reject($err);
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-05-31 18:18:22 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_hafas_json_p' => sub {
|
|
|
|
my ( $self, $url ) = @_;
|
|
|
|
|
|
|
|
my $cache = $self->app->cache_iris_main;
|
|
|
|
my $promise = Mojo::Promise->new;
|
|
|
|
|
|
|
|
if ( my $content = $cache->thaw($url) ) {
|
|
|
|
$promise->resolve($content);
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
|
|
|
|
$self->ua->request_timeout(5)->get_p($url)->then(
|
|
|
|
sub {
|
|
|
|
my ($tx) = @_;
|
|
|
|
my $body = decode( 'ISO-8859-15', $tx->res->body );
|
|
|
|
|
|
|
|
$body =~ s{^TSLs[.]sls = }{};
|
|
|
|
$body =~ s{;$}{};
|
|
|
|
$body =~ s{(}{(}g;
|
|
|
|
$body =~ s{)}{)}g;
|
|
|
|
my $json = JSON->new->decode($body);
|
|
|
|
$cache->freeze( $url, $json );
|
|
|
|
$promise->resolve($json);
|
|
|
|
}
|
|
|
|
)->catch(
|
|
|
|
sub {
|
|
|
|
my ($err) = @_;
|
2020-01-15 21:13:20 +00:00
|
|
|
$self->app->log->warn("get($url): $err");
|
2019-05-31 18:18:22 +00:00
|
|
|
$promise->reject($err);
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'get_hafas_xml_p' => sub {
|
|
|
|
my ( $self, $url ) = @_;
|
|
|
|
|
|
|
|
my $cache = $self->app->cache_iris_rt;
|
|
|
|
my $promise = Mojo::Promise->new;
|
|
|
|
|
|
|
|
if ( my $content = $cache->thaw($url) ) {
|
|
|
|
$promise->resolve($content);
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
|
|
|
|
$self->ua->request_timeout(5)->get_p($url)->then(
|
|
|
|
sub {
|
|
|
|
my ($tx) = @_;
|
|
|
|
my $body = decode( 'ISO-8859-15', $tx->res->body );
|
|
|
|
my $tree;
|
|
|
|
|
|
|
|
my $traininfo = {
|
2019-06-04 19:12:36 +00:00
|
|
|
station => {},
|
|
|
|
messages => [],
|
2019-05-31 18:18:22 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
# <SDay text="... > ..."> is invalid HTML, but present in
|
|
|
|
# regardless. As it is the last tag, we just throw it away.
|
2019-06-04 19:12:36 +00:00
|
|
|
$body =~ s{<SDay [^>]*/>}{}s;
|
2019-05-31 18:18:22 +00:00
|
|
|
eval { $tree = XML::LibXML->load_xml( string => $body ) };
|
|
|
|
if ($@) {
|
2020-01-15 21:13:20 +00:00
|
|
|
$self->app->log->warn("load_xml($url): $@");
|
2019-05-31 18:18:22 +00:00
|
|
|
$cache->freeze( $url, $traininfo );
|
|
|
|
$promise->resolve($traininfo);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for my $station ( $tree->findnodes('/Journey/St') ) {
|
|
|
|
my $name = $station->getAttribute('name');
|
|
|
|
my $adelay = $station->getAttribute('adelay');
|
|
|
|
my $ddelay = $station->getAttribute('ddelay');
|
|
|
|
$traininfo->{station}{$name} = {
|
|
|
|
adelay => $adelay,
|
|
|
|
ddelay => $ddelay,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2019-06-04 19:12:36 +00:00
|
|
|
for my $message ( $tree->findnodes('/Journey/HIMMessage') )
|
|
|
|
{
|
|
|
|
my $header = $message->getAttribute('header');
|
|
|
|
my $lead = $message->getAttribute('lead');
|
|
|
|
my $display = $message->getAttribute('display');
|
|
|
|
push(
|
|
|
|
@{ $traininfo->{messages} },
|
|
|
|
{
|
|
|
|
header => $header,
|
|
|
|
lead => $lead,
|
|
|
|
display => $display
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-05-31 18:18:22 +00:00
|
|
|
$cache->freeze( $url, $traininfo );
|
|
|
|
$promise->resolve($traininfo);
|
|
|
|
}
|
|
|
|
)->catch(
|
|
|
|
sub {
|
|
|
|
my ($err) = @_;
|
2020-01-15 21:13:20 +00:00
|
|
|
$self->app->log->warn("get($url): $err");
|
2019-05-31 18:18:22 +00:00
|
|
|
$promise->reject($err);
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
return $promise;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'add_route_timestamps' => sub {
|
2019-06-17 18:59:57 +00:00
|
|
|
my ( $self, $uid, $train, $is_departure ) = @_;
|
2019-05-31 18:18:22 +00:00
|
|
|
|
|
|
|
$uid //= $self->current_user->{id};
|
|
|
|
|
|
|
|
my $db = $self->pg->db;
|
|
|
|
|
2019-06-22 15:02:04 +00:00
|
|
|
my $journey = $db->select(
|
|
|
|
'in_transit_str',
|
2020-01-08 17:42:17 +00:00
|
|
|
[ 'arr_eva', 'dep_eva', 'route', 'data' ],
|
2019-06-22 15:02:04 +00:00
|
|
|
{ user_id => $uid }
|
|
|
|
)->expand->hash;
|
2019-05-31 18:18:22 +00:00
|
|
|
|
|
|
|
if ( not $journey ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-01-08 17:42:17 +00:00
|
|
|
if ( not $journey->{data}{trip_id} ) {
|
2020-01-27 19:32:15 +00:00
|
|
|
my ( $origin_eva, $destination_eva, $polyline_str );
|
2020-01-08 17:42:17 +00:00
|
|
|
$self->get_hafas_tripid_p($train)->then(
|
|
|
|
sub {
|
|
|
|
my ($trip_id) = @_;
|
|
|
|
|
|
|
|
my $res = $db->select( 'in_transit', ['data'],
|
|
|
|
{ user_id => $uid } );
|
|
|
|
my $res_h = $res->expand->hash;
|
|
|
|
my $data = $res_h->{data} // {};
|
|
|
|
|
|
|
|
$data->{trip_id} = $trip_id;
|
|
|
|
|
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{ data => JSON->new->encode($data) },
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
2020-01-27 19:32:15 +00:00
|
|
|
return $self->get_hafas_polyline_p( $train, $trip_id );
|
|
|
|
}
|
|
|
|
)->then(
|
|
|
|
sub {
|
|
|
|
my ($ret) = @_;
|
|
|
|
my $polyline = $ret->{polyline};
|
|
|
|
$origin_eva = 0 + $ret->{raw}{origin}{id};
|
|
|
|
$destination_eva = 0 + $ret->{raw}{destination}{id};
|
|
|
|
|
|
|
|
# work around Cache::File turning floats into strings
|
|
|
|
for my $coord ( @{$polyline} ) {
|
|
|
|
@{$coord} = map { 0 + $_ } @{$coord};
|
|
|
|
}
|
|
|
|
|
|
|
|
$polyline_str = JSON->new->encode($polyline);
|
|
|
|
|
|
|
|
return $db->select_p(
|
|
|
|
'polylines',
|
|
|
|
['id'],
|
|
|
|
{
|
|
|
|
origin_eva => $origin_eva,
|
|
|
|
destination_eva => $destination_eva,
|
|
|
|
polyline => $polyline_str
|
|
|
|
},
|
|
|
|
{ limit => 1 }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
)->then(
|
|
|
|
sub {
|
|
|
|
my ($pl_res) = @_;
|
|
|
|
my $polyline_id;
|
|
|
|
if ( my $h = $pl_res->hash ) {
|
|
|
|
$polyline_id = $h->{id};
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
eval {
|
|
|
|
$polyline_id = $db->insert(
|
|
|
|
'polylines',
|
|
|
|
{
|
|
|
|
origin_eva => $origin_eva,
|
|
|
|
destination_eva => $destination_eva,
|
|
|
|
polyline => $polyline_str
|
|
|
|
},
|
|
|
|
{ returning => 'id' }
|
|
|
|
)->hash->{id};
|
|
|
|
};
|
|
|
|
if ($@) {
|
|
|
|
$self->app->log->warn(
|
|
|
|
"add_route_timestamps: insert polyline: $@"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ($polyline_id) {
|
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{ polyline_id => $polyline_id },
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
}
|
2020-01-08 17:42:17 +00:00
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
}
|
|
|
|
|
2019-06-22 15:02:04 +00:00
|
|
|
my ($platform) = ( ( $train->platform // 0 ) =~ m{(\d+)} );
|
|
|
|
|
2019-05-31 18:18:22 +00:00
|
|
|
my $route = $journey->{route};
|
|
|
|
|
|
|
|
my $base
|
|
|
|
= 'https://reiseauskunft.bahn.de/bin/trainsearch.exe/dn?L=vs_json.vs_hap&start=yes&rt=1';
|
|
|
|
my $date_yy = $train->start->strftime('%d.%m.%y');
|
|
|
|
my $date_yyyy = $train->start->strftime('%d.%m.%Y');
|
|
|
|
my $train_no = $train->type . ' ' . $train->train_no;
|
|
|
|
|
|
|
|
my ( $trainlink, $route_data );
|
|
|
|
|
|
|
|
$self->get_hafas_json_p(
|
|
|
|
"${base}&date=${date_yy}&trainname=${train_no}")->then(
|
|
|
|
sub {
|
|
|
|
my ($trainsearch) = @_;
|
|
|
|
|
|
|
|
# Fallback: Take first result
|
|
|
|
$trainlink = $trainsearch->{suggestions}[0]{trainLink};
|
|
|
|
|
|
|
|
# Try finding a result for the current date
|
|
|
|
for
|
|
|
|
my $suggestion ( @{ $trainsearch->{suggestions} // [] } )
|
|
|
|
{
|
|
|
|
|
|
|
|
# Drunken API, sail with care. Both date formats are used interchangeably
|
2020-02-01 09:59:46 +00:00
|
|
|
if (
|
|
|
|
$suggestion->{depDate}
|
|
|
|
and ( $suggestion->{depDate} eq $date_yy
|
|
|
|
or $suggestion->{depDate} eq $date_yyyy )
|
|
|
|
)
|
2019-05-31 18:18:22 +00:00
|
|
|
{
|
2019-07-14 15:17:44 +00:00
|
|
|
# Train numbers are not unique, e.g. IC 149 refers both to the
|
|
|
|
# InterCity service Amsterdam -> Berlin and to the InterCity service
|
|
|
|
# Koebenhavns Lufthavn st -> Aarhus. One workaround is making
|
|
|
|
# requests with the stationFilter=80 parameter. Checking the origin
|
|
|
|
# station seems to be the more generic solution, so we do that
|
|
|
|
# instead.
|
|
|
|
if ( $suggestion->{dep} eq $train->origin ) {
|
|
|
|
$trainlink = $suggestion->{trainLink};
|
|
|
|
last;
|
|
|
|
}
|
2019-05-31 18:18:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( not $trainlink ) {
|
|
|
|
$self->app->log->debug("trainlink not found");
|
|
|
|
return Mojo::Promise->reject("trainlink not found");
|
|
|
|
}
|
|
|
|
my $base2
|
|
|
|
= 'https://reiseauskunft.bahn.de/bin/traininfo.exe/dn';
|
|
|
|
return $self->get_hafas_json_p(
|
|
|
|
"${base2}/${trainlink}?rt=1&date=${date_yy}&L=vs_json.vs_hap"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
)->then(
|
|
|
|
sub {
|
|
|
|
my ($traininfo) = @_;
|
|
|
|
if ( not $traininfo or $traininfo->{error} ) {
|
|
|
|
$self->app->log->debug("traininfo error");
|
|
|
|
return Mojo::Promise->reject("traininfo error");
|
|
|
|
}
|
|
|
|
my $routeinfo
|
|
|
|
= $traininfo->{suggestions}[0]{locations};
|
|
|
|
|
|
|
|
my $strp = DateTime::Format::Strptime->new(
|
|
|
|
pattern => '%d.%m.%y %H:%M',
|
|
|
|
time_zone => 'Europe/Berlin',
|
|
|
|
);
|
|
|
|
|
|
|
|
$route_data = {};
|
|
|
|
|
|
|
|
for my $station ( @{$routeinfo} ) {
|
|
|
|
my $arr
|
|
|
|
= $strp->parse_datetime(
|
|
|
|
$station->{arrDate} . ' ' . $station->{arrTime} );
|
|
|
|
my $dep
|
|
|
|
= $strp->parse_datetime(
|
|
|
|
$station->{depDate} . ' ' . $station->{depTime} );
|
|
|
|
$route_data->{ $station->{name} } = {
|
|
|
|
sched_arr => $arr ? $arr->epoch : 0,
|
|
|
|
sched_dep => $dep ? $dep->epoch : 0,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
my $base2
|
|
|
|
= 'https://reiseauskunft.bahn.de/bin/traininfo.exe/dn';
|
|
|
|
return $self->get_hafas_xml_p(
|
|
|
|
"${base2}/${trainlink}?rt=1&date=${date_yy}&L=vs_java3"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
)->then(
|
|
|
|
sub {
|
|
|
|
my ($traininfo2) = @_;
|
|
|
|
|
|
|
|
for my $station ( keys %{$route_data} ) {
|
|
|
|
for my $key (
|
|
|
|
keys %{ $traininfo2->{station}{$station} // {} } )
|
|
|
|
{
|
|
|
|
$route_data->{$station}{$key}
|
|
|
|
= $traininfo2->{station}{$station}{$key};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for my $station ( @{$route} ) {
|
|
|
|
$station->[1]
|
|
|
|
= $route_data->{ $station->[0] };
|
|
|
|
}
|
2019-06-04 19:12:36 +00:00
|
|
|
|
2019-06-22 15:02:04 +00:00
|
|
|
my $res = $db->select( 'in_transit', ['data'],
|
|
|
|
{ user_id => $uid } );
|
|
|
|
my $res_h = $res->expand->hash;
|
|
|
|
my $data = $res_h->{data} // {};
|
2019-06-04 19:12:36 +00:00
|
|
|
|
2019-06-22 15:02:04 +00:00
|
|
|
$data->{delay_msg} = [ map { [ $_->[0]->epoch, $_->[1] ] }
|
|
|
|
$train->delay_messages ];
|
|
|
|
$data->{qos_msg} = [ map { [ $_->[0]->epoch, $_->[1] ] }
|
|
|
|
$train->qos_messages ];
|
2019-06-17 18:59:57 +00:00
|
|
|
|
2019-06-22 15:02:04 +00:00
|
|
|
$data->{him_msg} = $traininfo2->{messages};
|
|
|
|
|
|
|
|
$db->update(
|
2019-05-31 18:18:22 +00:00
|
|
|
'in_transit',
|
2019-06-04 19:12:36 +00:00
|
|
|
{
|
|
|
|
route => JSON->new->encode($route),
|
2019-06-22 15:02:04 +00:00
|
|
|
data => JSON->new->encode($data)
|
2019-06-04 19:12:36 +00:00
|
|
|
},
|
2019-05-31 18:18:22 +00:00
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
)->wait;
|
2019-06-22 15:02:04 +00:00
|
|
|
|
2019-12-11 20:36:41 +00:00
|
|
|
if ( $train->sched_departure ) {
|
|
|
|
$self->has_wagonorder_p( $train->sched_departure,
|
2019-06-22 15:02:04 +00:00
|
|
|
$train->train_no )->then(
|
2019-12-11 20:36:41 +00:00
|
|
|
sub {
|
|
|
|
return $self->get_wagonorder_p( $train->sched_departure,
|
|
|
|
$train->train_no );
|
|
|
|
}
|
|
|
|
)->then(
|
2019-06-22 15:02:04 +00:00
|
|
|
sub {
|
|
|
|
my ($wagonorder) = @_;
|
|
|
|
|
2019-12-12 18:21:39 +00:00
|
|
|
my $res = $db->select(
|
|
|
|
'in_transit',
|
|
|
|
[ 'data', 'user_data' ],
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
my $res_h = $res->expand->hash;
|
|
|
|
my $data = $res_h->{data} // {};
|
|
|
|
my $user_data = $res_h->{user_data} // {};
|
2019-06-22 15:02:04 +00:00
|
|
|
|
2020-01-15 20:48:50 +00:00
|
|
|
if ( $is_departure and not exists $wagonorder->{error} )
|
|
|
|
{
|
2019-06-22 15:02:04 +00:00
|
|
|
$data->{wagonorder_dep} = $wagonorder;
|
2019-12-13 19:37:51 +00:00
|
|
|
if ( exists $user_data->{wagongroups} ) {
|
|
|
|
$user_data->{wagongroups} = [];
|
|
|
|
}
|
2019-12-12 18:21:39 +00:00
|
|
|
for my $group (
|
|
|
|
@{
|
|
|
|
$wagonorder->{data}{istformation}
|
|
|
|
{allFahrzeuggruppe} // []
|
|
|
|
}
|
|
|
|
)
|
|
|
|
{
|
2019-12-19 19:16:10 +00:00
|
|
|
my @wagons;
|
2019-12-12 18:21:39 +00:00
|
|
|
for
|
|
|
|
my $wagon ( @{ $group->{allFahrzeug} // [] } )
|
|
|
|
{
|
|
|
|
push(
|
2019-12-19 19:16:10 +00:00
|
|
|
@wagons,
|
2019-12-12 18:21:39 +00:00
|
|
|
{
|
|
|
|
id => $wagon->{fahrzeugnummer},
|
|
|
|
number =>
|
|
|
|
$wagon->{wagenordnungsnummer},
|
|
|
|
type => $wagon->{fahrzeugtyp},
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
2019-12-19 19:16:10 +00:00
|
|
|
push(
|
|
|
|
@{ $user_data->{wagongroups} },
|
|
|
|
{
|
|
|
|
name =>
|
|
|
|
$group->{fahrzeuggruppebezeichnung},
|
|
|
|
from =>
|
|
|
|
$group->{startbetriebsstellename},
|
|
|
|
to => $group->{zielbetriebsstellename},
|
|
|
|
no => $group->{verkehrlichezugnummer},
|
|
|
|
wagons => [@wagons],
|
|
|
|
}
|
|
|
|
);
|
2019-12-12 18:21:39 +00:00
|
|
|
}
|
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{
|
|
|
|
data => JSON->new->encode($data),
|
|
|
|
user_data => JSON->new->encode($user_data)
|
|
|
|
},
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
2019-06-22 15:02:04 +00:00
|
|
|
}
|
2020-01-15 20:48:50 +00:00
|
|
|
elsif ( not $is_departure
|
|
|
|
and not exists $wagonorder->{error} )
|
|
|
|
{
|
2019-06-22 15:02:04 +00:00
|
|
|
$data->{wagonorder_arr} = $wagonorder;
|
2019-12-12 18:21:39 +00:00
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{ data => JSON->new->encode($data) },
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
2019-06-22 15:02:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
}
|
|
|
|
|
2019-08-03 10:35:47 +00:00
|
|
|
if ($is_departure) {
|
2019-12-23 21:57:45 +00:00
|
|
|
$self->get_dbdb_station_p( $journey->{dep_eva} )->then(
|
2019-08-03 10:35:47 +00:00
|
|
|
sub {
|
|
|
|
my ($station_info) = @_;
|
|
|
|
|
|
|
|
my $res = $db->select( 'in_transit', ['data'],
|
|
|
|
{ user_id => $uid } );
|
|
|
|
my $res_h = $res->expand->hash;
|
|
|
|
my $data = $res_h->{data} // {};
|
|
|
|
|
|
|
|
$data->{stationinfo_dep} = $station_info;
|
|
|
|
|
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{ data => JSON->new->encode($data) },
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
}
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( $journey->{arr_eva} and not $is_departure ) {
|
|
|
|
$self->get_dbdb_station_p( $journey->{arr_eva} )->then(
|
2019-06-22 15:02:04 +00:00
|
|
|
sub {
|
|
|
|
my ($station_info) = @_;
|
|
|
|
|
|
|
|
my $res = $db->select( 'in_transit', ['data'],
|
|
|
|
{ user_id => $uid } );
|
|
|
|
my $res_h = $res->expand->hash;
|
|
|
|
my $data = $res_h->{data} // {};
|
|
|
|
|
|
|
|
$data->{stationinfo_arr} = $station_info;
|
|
|
|
|
|
|
|
$db->update(
|
|
|
|
'in_transit',
|
|
|
|
{ data => JSON->new->encode($data) },
|
|
|
|
{ user_id => $uid }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
)->wait;
|
|
|
|
}
|
2019-05-31 18:18:22 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-26 17:53:01 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_oldest_journey_ts' => sub {
|
|
|
|
my ($self) = @_;
|
|
|
|
|
|
|
|
my $res_h = $self->pg->db->select(
|
|
|
|
'journeys_str',
|
|
|
|
['sched_dep_ts'],
|
|
|
|
{
|
|
|
|
user_id => $self->current_user->{id},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
limit => 1,
|
|
|
|
order_by => {
|
|
|
|
-asc => 'real_dep_ts',
|
|
|
|
},
|
|
|
|
}
|
|
|
|
)->hash;
|
|
|
|
|
|
|
|
if ($res_h) {
|
|
|
|
return epoch_to_dt( $res_h->{sched_dep_ts} );
|
|
|
|
}
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-05-19 06:55:23 +00:00
|
|
|
$self->helper(
|
2019-05-20 17:15:21 +00:00
|
|
|
'get_latest_dest_id' => sub {
|
2019-05-19 06:55:23 +00:00
|
|
|
my ( $self, %opt ) = @_;
|
|
|
|
|
2019-05-20 17:15:21 +00:00
|
|
|
my $uid = $opt{uid} // $self->current_user->{id};
|
2019-06-17 18:59:57 +00:00
|
|
|
my $db = $opt{db} // $self->pg->db;
|
2019-05-19 06:55:23 +00:00
|
|
|
|
|
|
|
my $journey = $db->select( 'in_transit', ['checkout_station_id'],
|
|
|
|
{ user_id => $uid } )->hash;
|
|
|
|
if ( not $journey ) {
|
|
|
|
$journey = $db->select(
|
|
|
|
'journeys',
|
|
|
|
['checkout_station_id'],
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
cancelled => 0
|
|
|
|
},
|
|
|
|
{
|
|
|
|
limit => 1,
|
2019-05-19 08:32:57 +00:00
|
|
|
order_by => { -desc => 'real_departure' }
|
2019-05-19 06:55:23 +00:00
|
|
|
}
|
|
|
|
)->hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( not $journey ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-05-20 17:15:21 +00:00
|
|
|
return $journey->{checkout_station_id};
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'get_connection_targets' => sub {
|
|
|
|
my ( $self, %opt ) = @_;
|
|
|
|
|
2019-06-17 18:59:57 +00:00
|
|
|
my $uid = $opt{uid} //= $self->current_user->{id};
|
2019-05-20 17:15:21 +00:00
|
|
|
my $threshold = $opt{threshold}
|
|
|
|
// DateTime->now( time_zone => 'Europe/Berlin' )
|
2019-05-24 15:09:11 +00:00
|
|
|
->subtract( months => 4 );
|
2019-06-17 18:59:57 +00:00
|
|
|
my $db = $opt{db} //= $self->pg->db;
|
2019-05-20 17:15:21 +00:00
|
|
|
my $min_count = $opt{min_count} // 3;
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
my $dest_id = $opt{eva} // $self->get_latest_dest_id(%opt);
|
2019-05-20 17:15:21 +00:00
|
|
|
|
|
|
|
if ( not $dest_id ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-05-19 06:55:23 +00:00
|
|
|
my $res = $db->query(
|
|
|
|
qq{
|
|
|
|
select
|
2019-12-23 21:57:45 +00:00
|
|
|
count(checkout_station_id) as count,
|
|
|
|
checkout_station_id as dest
|
2019-05-19 06:55:23 +00:00
|
|
|
from journeys
|
|
|
|
where user_id = ?
|
|
|
|
and checkin_station_id = ?
|
|
|
|
and real_departure > ?
|
2019-12-23 21:57:45 +00:00
|
|
|
group by checkout_station_id
|
2019-05-19 06:55:23 +00:00
|
|
|
order by count desc;
|
|
|
|
},
|
|
|
|
$uid,
|
2019-05-20 17:15:21 +00:00
|
|
|
$dest_id,
|
2019-05-19 06:55:23 +00:00
|
|
|
$threshold
|
|
|
|
);
|
2019-05-20 17:15:21 +00:00
|
|
|
my @destinations
|
|
|
|
= $res->hashes->grep( sub { shift->{count} >= $min_count } )
|
|
|
|
->map( sub { shift->{dest} } )->each;
|
2019-12-23 21:57:45 +00:00
|
|
|
@destinations
|
|
|
|
= grep { $self->app->station_by_eva->{$_} } @destinations;
|
|
|
|
@destinations
|
|
|
|
= map { $self->app->station_by_eva->{$_}->[1] } @destinations;
|
2019-05-19 06:55:23 +00:00
|
|
|
return @destinations;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
$self->helper(
|
|
|
|
'get_connecting_trains' => sub {
|
|
|
|
my ( $self, %opt ) = @_;
|
|
|
|
|
2019-06-17 18:59:57 +00:00
|
|
|
my $uid = $opt{uid} //= $self->current_user->{id};
|
2019-05-20 17:15:21 +00:00
|
|
|
my $use_history = $self->account_use_history($uid);
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
my ( $eva, $exclude_via, $exclude_train_id, $exclude_before );
|
2019-05-20 17:15:21 +00:00
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( $opt{eva} ) {
|
2019-05-20 17:15:21 +00:00
|
|
|
if ( $use_history & 0x01 ) {
|
2019-12-23 21:57:45 +00:00
|
|
|
$eva = $opt{eva};
|
2019-05-20 17:15:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if ( $use_history & 0x02 ) {
|
|
|
|
my $status = $self->get_user_status;
|
2019-12-23 21:57:45 +00:00
|
|
|
$eva = $status->{arr_eva};
|
2019-05-20 17:15:21 +00:00
|
|
|
$exclude_via = $status->{dep_name};
|
|
|
|
$exclude_train_id = $status->{train_id};
|
2019-12-26 20:39:24 +00:00
|
|
|
if ( $status->{real_arrival} ) {
|
|
|
|
$exclude_before = $status->{real_arrival}->epoch;
|
|
|
|
}
|
2019-05-20 17:15:21 +00:00
|
|
|
}
|
|
|
|
}
|
2019-05-19 06:55:23 +00:00
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( not $eva ) {
|
2019-05-19 06:55:23 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
my @destinations = $self->get_connection_targets(%opt);
|
2019-05-20 17:15:21 +00:00
|
|
|
|
|
|
|
if ($exclude_via) {
|
|
|
|
@destinations = grep { $_ ne $exclude_via } @destinations;
|
|
|
|
}
|
2019-05-19 06:55:23 +00:00
|
|
|
|
2019-05-19 08:32:57 +00:00
|
|
|
if ( not @destinations ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
my $stationboard = $self->get_departures( $eva, 0, 40, 1 );
|
2019-05-19 06:55:23 +00:00
|
|
|
if ( $stationboard->{errstr} ) {
|
|
|
|
return;
|
|
|
|
}
|
2019-06-07 18:34:28 +00:00
|
|
|
@{ $stationboard->{results} } = map { $_->[0] }
|
|
|
|
sort { $a->[1] <=> $b->[1] }
|
|
|
|
map { [ $_, $_->departure ? $_->departure->epoch : 0 ] }
|
|
|
|
@{ $stationboard->{results} };
|
2019-05-19 06:55:23 +00:00
|
|
|
my @results;
|
2019-11-25 20:18:57 +00:00
|
|
|
my @cancellations;
|
2019-05-19 06:55:23 +00:00
|
|
|
my %via_count = map { $_ => 0 } @destinations;
|
|
|
|
for my $train ( @{ $stationboard->{results} } ) {
|
|
|
|
if ( not $train->departure ) {
|
|
|
|
next;
|
|
|
|
}
|
2019-05-20 17:15:21 +00:00
|
|
|
if ( $exclude_before
|
2019-12-26 20:39:24 +00:00
|
|
|
and $train->departure
|
2019-05-20 17:15:21 +00:00
|
|
|
and $train->departure->epoch < $exclude_before )
|
2019-05-19 06:55:23 +00:00
|
|
|
{
|
|
|
|
next;
|
|
|
|
}
|
2019-05-20 17:15:21 +00:00
|
|
|
if ( $exclude_train_id
|
|
|
|
and $train->train_id eq $exclude_train_id )
|
|
|
|
{
|
2019-05-19 06:55:23 +00:00
|
|
|
next;
|
|
|
|
}
|
2019-11-25 20:18:57 +00:00
|
|
|
|
|
|
|
# In general, this function is meant to return feasible
|
|
|
|
# connections. However, cancelled connections may also be of
|
|
|
|
# interest and are also useful for logging cancellations.
|
|
|
|
# To satisfy both demands with (hopefully) little confusion and
|
|
|
|
# UI clutter, this function returns two concatenated arrays:
|
|
|
|
# actual connections (ordered by actual departure time) followed
|
|
|
|
# by cancelled connections (ordered by scheduled departure time).
|
|
|
|
# This is easiest to achieve in two separate loops.
|
|
|
|
#
|
|
|
|
# Note that a cancelled train may still have a matching destination
|
2019-12-23 21:57:45 +00:00
|
|
|
# in its route_post, e.g. if it leaves out $eva due to
|
2019-11-25 20:18:57 +00:00
|
|
|
# unscheduled route changes but continues on schedule afterwards
|
2019-12-23 21:57:45 +00:00
|
|
|
# -- so it is only cancelled at $eva, not on the remainder of
|
2019-11-25 20:18:57 +00:00
|
|
|
# the route. Also note that this specific case is not yet handled
|
|
|
|
# properly by the cancellation logic etc.
|
|
|
|
|
|
|
|
if ( $train->departure_is_cancelled ) {
|
|
|
|
my @via
|
|
|
|
= ( $train->sched_route_post, $train->sched_route_end );
|
|
|
|
for my $dest (@destinations) {
|
|
|
|
if ( List::Util::any { $_ eq $dest } @via ) {
|
|
|
|
push( @cancellations, [ $train, $dest ] );
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
my @via = ( $train->route_post, $train->route_end );
|
|
|
|
for my $dest (@destinations) {
|
|
|
|
if ( $via_count{$dest} < 2
|
|
|
|
and List::Util::any { $_ eq $dest } @via )
|
|
|
|
{
|
|
|
|
push( @results, [ $train, $dest ] );
|
|
|
|
$via_count{$dest}++;
|
|
|
|
next;
|
|
|
|
}
|
2019-05-19 06:55:23 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@results = map { $_->[0] }
|
|
|
|
sort { $a->[1] <=> $b->[1] }
|
|
|
|
map {
|
|
|
|
[
|
|
|
|
$_,
|
2019-06-07 18:34:28 +00:00
|
|
|
$_->[0]->departure->epoch // $_->[0]->sched_departure->epoch
|
2019-05-19 06:55:23 +00:00
|
|
|
]
|
|
|
|
} @results;
|
2019-11-25 20:18:57 +00:00
|
|
|
@cancellations = map { $_->[0] }
|
|
|
|
sort { $a->[1] <=> $b->[1] }
|
|
|
|
map { [ $_, $_->[0]->sched_departure->epoch ] } @cancellations;
|
2019-05-19 06:55:23 +00:00
|
|
|
|
2019-11-25 20:18:57 +00:00
|
|
|
return ( @results, @cancellations );
|
2019-05-19 06:55:23 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-05-20 17:15:21 +00:00
|
|
|
$self->helper(
|
|
|
|
'account_use_history' => sub {
|
|
|
|
my ( $self, $uid, $value ) = @_;
|
|
|
|
|
|
|
|
if ($value) {
|
|
|
|
$self->pg->db->update(
|
|
|
|
'users',
|
|
|
|
{ use_history => $value },
|
|
|
|
{ id => $uid }
|
|
|
|
);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return $self->pg->db->select( 'users', ['use_history'],
|
|
|
|
{ id => $uid } )->hash->{use_history};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_user_travels' => sub {
|
|
|
|
my ( $self, %opt ) = @_;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-27 20:20:59 +00:00
|
|
|
my $uid = $opt{uid} || $self->current_user->{id};
|
2019-04-22 09:11:14 +00:00
|
|
|
|
2019-04-22 10:11:22 +00:00
|
|
|
# If get_user_travels is called from inside a transaction, db
|
|
|
|
# specifies the database handle performing the transaction.
|
|
|
|
# Otherwise, we grab a fresh one.
|
|
|
|
my $db = $opt{db} // $self->pg->db;
|
|
|
|
|
2020-01-29 17:48:58 +00:00
|
|
|
my @select
|
|
|
|
= (
|
2020-02-01 13:28:10 +00:00
|
|
|
qw(journey_id train_type train_line train_no checkin_ts sched_dep_ts real_dep_ts dep_eva checkout_ts sched_arr_ts real_arr_ts arr_eva cancelled edited route messages user_data)
|
2020-01-29 17:48:58 +00:00
|
|
|
);
|
2019-04-23 16:08:07 +00:00
|
|
|
my %where = (
|
|
|
|
user_id => $uid,
|
|
|
|
cancelled => 0
|
|
|
|
);
|
2019-04-22 09:11:14 +00:00
|
|
|
my %order = (
|
|
|
|
order_by => {
|
2019-04-23 16:08:07 +00:00
|
|
|
-desc => 'real_dep_ts',
|
2019-04-22 09:11:14 +00:00
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( $opt{cancelled} ) {
|
|
|
|
$where{cancelled} = 1;
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( $opt{limit} ) {
|
|
|
|
$order{limit} = $opt{limit};
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-03-27 20:20:59 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( $opt{journey_id} ) {
|
|
|
|
$where{journey_id} = $opt{journey_id};
|
|
|
|
delete $where{cancelled};
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
elsif ( $opt{after} and $opt{before} ) {
|
|
|
|
$where{real_dep_ts} = {
|
|
|
|
-between => [ $opt{after}->epoch, $opt{before}->epoch, ] };
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2020-01-29 17:48:58 +00:00
|
|
|
if ( $opt{with_polyline} ) {
|
|
|
|
push( @select, 'polyline' );
|
|
|
|
}
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
my @travels;
|
|
|
|
|
2020-01-29 17:48:58 +00:00
|
|
|
my $res = $db->select( 'journeys_str', \@select, \%where, \%order );
|
2019-04-22 09:11:14 +00:00
|
|
|
|
2019-05-26 15:28:21 +00:00
|
|
|
for my $entry ( $res->expand->hashes->each ) {
|
2019-03-22 15:57:24 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
my $ref = {
|
2019-11-24 19:29:52 +00:00
|
|
|
id => $entry->{journey_id},
|
|
|
|
type => $entry->{train_type},
|
|
|
|
line => $entry->{train_line},
|
|
|
|
no => $entry->{train_no},
|
2019-12-23 21:57:45 +00:00
|
|
|
from_eva => $entry->{dep_eva},
|
2019-11-24 19:29:52 +00:00
|
|
|
checkin_ts => $entry->{checkin_ts},
|
|
|
|
sched_dep_ts => $entry->{sched_dep_ts},
|
|
|
|
rt_dep_ts => $entry->{real_dep_ts},
|
2019-12-23 21:57:45 +00:00
|
|
|
to_eva => $entry->{arr_eva},
|
2019-11-24 19:29:52 +00:00
|
|
|
checkout_ts => $entry->{checkout_ts},
|
|
|
|
sched_arr_ts => $entry->{sched_arr_ts},
|
|
|
|
rt_arr_ts => $entry->{real_arr_ts},
|
|
|
|
messages => $entry->{messages},
|
|
|
|
route => $entry->{route},
|
|
|
|
edited => $entry->{edited},
|
|
|
|
user_data => $entry->{user_data},
|
2019-04-23 16:08:07 +00:00
|
|
|
};
|
|
|
|
|
2020-01-29 17:48:58 +00:00
|
|
|
if ( $opt{with_polyline} ) {
|
|
|
|
$ref->{polyline} = $entry->{polyline};
|
|
|
|
}
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( my $station
|
|
|
|
= $self->app->station_by_eva->{ $ref->{from_eva} } )
|
|
|
|
{
|
|
|
|
$ref->{from_ds100} = $station->[0];
|
|
|
|
$ref->{from_name} = $station->[1];
|
|
|
|
}
|
|
|
|
if ( my $station
|
|
|
|
= $self->app->station_by_eva->{ $ref->{to_eva} } )
|
|
|
|
{
|
|
|
|
$ref->{to_ds100} = $station->[0];
|
|
|
|
$ref->{to_name} = $station->[1];
|
|
|
|
}
|
|
|
|
|
2019-11-24 19:29:52 +00:00
|
|
|
if ( $opt{with_datetime} ) {
|
|
|
|
$ref->{checkin} = epoch_to_dt( $ref->{checkin_ts} );
|
|
|
|
$ref->{sched_departure}
|
|
|
|
= epoch_to_dt( $ref->{sched_dep_ts} );
|
|
|
|
$ref->{rt_departure} = epoch_to_dt( $ref->{rt_dep_ts} );
|
|
|
|
$ref->{checkout} = epoch_to_dt( $ref->{checkout_ts} );
|
|
|
|
$ref->{sched_arrival} = epoch_to_dt( $ref->{sched_arr_ts} );
|
|
|
|
$ref->{rt_arrival} = epoch_to_dt( $ref->{rt_arr_ts} );
|
|
|
|
}
|
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( $opt{verbose} ) {
|
2020-01-25 14:46:42 +00:00
|
|
|
my $rename = $self->app->renamed_station;
|
|
|
|
for my $stop ( @{ $ref->{route} } ) {
|
|
|
|
if ( $rename->{ $stop->[0] } ) {
|
|
|
|
$stop->[0] = $rename->{ $stop->[0] };
|
|
|
|
}
|
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
$ref->{cancelled} = $entry->{cancelled};
|
|
|
|
my @parsed_messages;
|
|
|
|
for my $message ( @{ $ref->{messages} // [] } ) {
|
2019-05-26 15:28:21 +00:00
|
|
|
my ( $ts, $msg ) = @{$message};
|
2019-04-23 16:08:07 +00:00
|
|
|
push( @parsed_messages, [ epoch_to_dt($ts), $msg ] );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
$ref->{messages} = [ reverse @parsed_messages ];
|
|
|
|
$ref->{sched_duration}
|
2020-01-26 09:48:14 +00:00
|
|
|
= defined $ref->{sched_arr_ts}
|
2019-11-24 19:29:52 +00:00
|
|
|
? $ref->{sched_arr_ts} - $ref->{sched_dep_ts}
|
2019-04-23 16:08:07 +00:00
|
|
|
: undef;
|
|
|
|
$ref->{rt_duration}
|
2020-01-26 09:48:14 +00:00
|
|
|
= defined $ref->{rt_arr_ts}
|
2019-11-24 19:29:52 +00:00
|
|
|
? $ref->{rt_arr_ts} - $ref->{rt_dep_ts}
|
2019-04-23 16:08:07 +00:00
|
|
|
: undef;
|
2019-08-13 19:30:59 +00:00
|
|
|
my ( $km_route, $km_beeline, $skip )
|
2019-04-23 16:08:07 +00:00
|
|
|
= $self->get_travel_distance( $ref->{from_name},
|
|
|
|
$ref->{to_name}, $ref->{route} );
|
2019-08-13 19:30:59 +00:00
|
|
|
$ref->{km_route} = $km_route;
|
|
|
|
$ref->{skip_route} = $skip;
|
|
|
|
$ref->{km_beeline} = $km_beeline;
|
2019-04-23 16:08:07 +00:00
|
|
|
$ref->{skip_beeline} = $skip;
|
|
|
|
my $kmh_divisor
|
|
|
|
= ( $ref->{rt_duration} // $ref->{sched_duration}
|
|
|
|
// 999999 ) / 3600;
|
|
|
|
$ref->{kmh_route}
|
|
|
|
= $kmh_divisor ? $ref->{km_route} / $kmh_divisor : -1;
|
|
|
|
$ref->{kmh_beeline}
|
|
|
|
= $kmh_divisor
|
|
|
|
? $ref->{km_beeline} / $kmh_divisor
|
|
|
|
: -1;
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
push( @travels, $ref );
|
2019-03-27 20:20:59 +00:00
|
|
|
}
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
return @travels;
|
|
|
|
}
|
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-08 19:20:04 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_journey' => sub {
|
|
|
|
my ( $self, %opt ) = @_;
|
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
$opt{cancelled} = 'any';
|
2019-04-08 19:20:04 +00:00
|
|
|
my @journeys = $self->get_user_travels(%opt);
|
2019-04-23 16:08:07 +00:00
|
|
|
if ( @journeys == 0 ) {
|
2019-04-08 19:20:04 +00:00
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
|
|
|
|
return $journeys[0];
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-08-03 09:11:27 +00:00
|
|
|
$self->helper(
|
|
|
|
'stationinfo_to_direction' => sub {
|
2019-08-03 10:35:47 +00:00
|
|
|
my ( $self, $platform_info, $wagonorder, $prev_stop, $next_stop )
|
|
|
|
= @_;
|
2019-08-03 09:11:27 +00:00
|
|
|
if ( $platform_info->{kopfgleis} ) {
|
2019-08-03 10:35:47 +00:00
|
|
|
if ($next_stop) {
|
|
|
|
return $platform_info->{direction} eq 'r' ? 'l' : 'r';
|
|
|
|
}
|
2019-08-03 09:11:27 +00:00
|
|
|
return $platform_info->{direction};
|
|
|
|
}
|
|
|
|
elsif ( $prev_stop
|
|
|
|
and exists $platform_info->{direction_from}{$prev_stop} )
|
|
|
|
{
|
|
|
|
return $platform_info->{direction_from}{$prev_stop};
|
|
|
|
}
|
2019-08-03 10:35:47 +00:00
|
|
|
elsif ( $next_stop
|
|
|
|
and exists $platform_info->{direction_from}{$next_stop} )
|
|
|
|
{
|
|
|
|
return $platform_info->{direction_from}{$next_stop} eq 'r'
|
|
|
|
? 'l'
|
|
|
|
: 'r';
|
|
|
|
}
|
2019-08-03 09:11:27 +00:00
|
|
|
elsif ($wagonorder) {
|
|
|
|
my $wr;
|
|
|
|
eval {
|
|
|
|
$wr
|
|
|
|
= Travel::Status::DE::DBWagenreihung->new(
|
|
|
|
from_json => $wagonorder );
|
|
|
|
};
|
|
|
|
if ( $wr
|
|
|
|
and $wr->sections
|
|
|
|
and defined $wr->direction )
|
|
|
|
{
|
|
|
|
my $section_0 = ( $wr->sections )[0];
|
|
|
|
my $direction = $wr->direction;
|
|
|
|
if ( $section_0->name eq 'A'
|
|
|
|
and $direction == 0 )
|
|
|
|
{
|
|
|
|
return $platform_info->{direction};
|
|
|
|
}
|
|
|
|
elsif ( $section_0->name ne 'A'
|
|
|
|
and $direction == 100 )
|
|
|
|
{
|
|
|
|
return $platform_info->{direction};
|
|
|
|
}
|
|
|
|
elsif ( $platform_info->{direction} ) {
|
|
|
|
return $platform_info->{direction} eq 'r'
|
|
|
|
? 'l'
|
|
|
|
: 'r';
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-10-29 20:18:46 +00:00
|
|
|
$self->helper(
|
|
|
|
'journey_to_ajax_route' => sub {
|
|
|
|
my ( $self, $journey ) = @_;
|
|
|
|
|
|
|
|
my @route;
|
|
|
|
|
|
|
|
for my $station ( @{ $journey->{route_after} } ) {
|
|
|
|
my $station_desc = $station->[0];
|
|
|
|
if ( $station->[1]{rt_arr} ) {
|
|
|
|
$station_desc .= $station->[1]{sched_arr}->strftime(';%s');
|
|
|
|
$station_desc .= $station->[1]{rt_arr}->strftime(';%s');
|
|
|
|
if ( $station->[1]{rt_dep} ) {
|
|
|
|
$station_desc
|
|
|
|
.= $station->[1]{sched_dep}->strftime(';%s');
|
|
|
|
$station_desc .= $station->[1]{rt_dep}->strftime(';%s');
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$station_desc .= ';0;0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$station_desc .= ';0;0;0;0';
|
|
|
|
}
|
|
|
|
push( @route, $station_desc );
|
|
|
|
}
|
|
|
|
|
|
|
|
return join( '|', @route );
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_user_status' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$uid //= $self->current_user->{id};
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-05-31 18:18:22 +00:00
|
|
|
my $db = $self->pg->db;
|
|
|
|
my $now = DateTime->now( time_zone => 'Europe/Berlin' );
|
|
|
|
my $epoch = $now->epoch;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
my $in_transit
|
2019-05-26 15:28:21 +00:00
|
|
|
= $db->select( 'in_transit_str', '*', { user_id => $uid } )
|
|
|
|
->expand->hash;
|
2019-03-22 15:57:24 +00:00
|
|
|
|
2019-04-23 16:08:07 +00:00
|
|
|
if ($in_transit) {
|
2019-04-22 09:11:14 +00:00
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( my $station
|
|
|
|
= $self->app->station_by_eva->{ $in_transit->{dep_eva} } )
|
|
|
|
{
|
|
|
|
$in_transit->{dep_ds100} = $station->[0];
|
|
|
|
$in_transit->{dep_name} = $station->[1];
|
|
|
|
}
|
|
|
|
if ( $in_transit->{arr_eva}
|
|
|
|
and my $station
|
|
|
|
= $self->app->station_by_eva->{ $in_transit->{arr_eva} } )
|
|
|
|
{
|
|
|
|
$in_transit->{arr_ds100} = $station->[0];
|
|
|
|
$in_transit->{arr_name} = $station->[1];
|
|
|
|
}
|
|
|
|
|
2019-05-26 15:28:21 +00:00
|
|
|
my @route = @{ $in_transit->{route} // [] };
|
2019-03-22 15:57:24 +00:00
|
|
|
my @route_after;
|
2019-08-06 18:21:57 +00:00
|
|
|
my $dep_info;
|
2019-06-23 16:46:25 +00:00
|
|
|
my $stop_before_dest;
|
2019-03-22 15:57:24 +00:00
|
|
|
my $is_after = 0;
|
|
|
|
for my $station (@route) {
|
|
|
|
|
2019-06-23 16:46:25 +00:00
|
|
|
if ( $in_transit->{arr_name}
|
2019-06-24 16:02:45 +00:00
|
|
|
and @route_after
|
2019-06-23 16:46:25 +00:00
|
|
|
and $station->[0] eq $in_transit->{arr_name} )
|
|
|
|
{
|
|
|
|
$stop_before_dest = $route_after[-1][0];
|
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
if ($is_after) {
|
|
|
|
push( @route_after, $station );
|
|
|
|
}
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( $in_transit->{dep_name}
|
|
|
|
and $station->[0] eq $in_transit->{dep_name} )
|
|
|
|
{
|
2019-05-03 08:52:30 +00:00
|
|
|
$is_after = 1;
|
2019-08-06 18:21:57 +00:00
|
|
|
if ( @{$station} > 1 ) {
|
|
|
|
$dep_info = $station->[1];
|
|
|
|
}
|
2019-05-03 08:52:30 +00:00
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-12-23 21:57:45 +00:00
|
|
|
my $stop_after_dep = @route_after ? $route_after[0][0] : undef;
|
2019-04-23 16:08:07 +00:00
|
|
|
|
|
|
|
my $ts = $in_transit->{checkout_ts}
|
|
|
|
// $in_transit->{checkin_ts};
|
|
|
|
my $action_time = epoch_to_dt($ts);
|
|
|
|
|
2019-04-23 19:30:31 +00:00
|
|
|
my $ret = {
|
2019-08-06 18:21:57 +00:00
|
|
|
checked_in => !$in_transit->{cancelled},
|
|
|
|
cancelled => $in_transit->{cancelled},
|
|
|
|
timestamp => $action_time,
|
|
|
|
timestamp_delta => $now->epoch - $action_time->epoch,
|
|
|
|
train_type => $in_transit->{train_type},
|
|
|
|
train_line => $in_transit->{train_line},
|
|
|
|
train_no => $in_transit->{train_no},
|
|
|
|
train_id => $in_transit->{train_id},
|
|
|
|
boarding_countdown => -1,
|
2019-04-23 16:08:07 +00:00
|
|
|
sched_departure =>
|
|
|
|
epoch_to_dt( $in_transit->{sched_dep_ts} ),
|
|
|
|
real_departure => epoch_to_dt( $in_transit->{real_dep_ts} ),
|
|
|
|
dep_ds100 => $in_transit->{dep_ds100},
|
2019-12-23 21:57:45 +00:00
|
|
|
dep_eva => $in_transit->{dep_eva},
|
2019-04-23 16:08:07 +00:00
|
|
|
dep_name => $in_transit->{dep_name},
|
2019-05-18 15:10:53 +00:00
|
|
|
dep_platform => $in_transit->{dep_platform},
|
2019-04-23 16:08:07 +00:00
|
|
|
sched_arrival => epoch_to_dt( $in_transit->{sched_arr_ts} ),
|
|
|
|
real_arrival => epoch_to_dt( $in_transit->{real_arr_ts} ),
|
|
|
|
arr_ds100 => $in_transit->{arr_ds100},
|
2019-12-23 21:57:45 +00:00
|
|
|
arr_eva => $in_transit->{arr_eva},
|
2019-04-23 16:08:07 +00:00
|
|
|
arr_name => $in_transit->{arr_name},
|
2019-05-18 15:10:53 +00:00
|
|
|
arr_platform => $in_transit->{arr_platform},
|
2019-04-23 16:08:07 +00:00
|
|
|
route_after => \@route_after,
|
2019-05-26 15:28:21 +00:00
|
|
|
messages => $in_transit->{messages},
|
2019-06-04 19:12:36 +00:00
|
|
|
extra_data => $in_transit->{data},
|
2019-12-06 20:40:51 +00:00
|
|
|
comment => $in_transit->{user_data}{comment},
|
2019-03-22 15:57:24 +00:00
|
|
|
};
|
2019-04-23 19:30:31 +00:00
|
|
|
|
2019-04-24 12:58:08 +00:00
|
|
|
my @parsed_messages;
|
|
|
|
for my $message ( @{ $ret->{messages} // [] } ) {
|
2019-05-26 15:28:21 +00:00
|
|
|
my ( $ts, $msg ) = @{$message};
|
2019-04-24 12:58:08 +00:00
|
|
|
push( @parsed_messages, [ epoch_to_dt($ts), $msg ] );
|
|
|
|
}
|
|
|
|
$ret->{messages} = [ reverse @parsed_messages ];
|
|
|
|
|
2019-06-04 19:12:36 +00:00
|
|
|
@parsed_messages = ();
|
|
|
|
for my $message ( @{ $ret->{extra_data}{qos_msg} // [] } ) {
|
|
|
|
my ( $ts, $msg ) = @{$message};
|
|
|
|
push( @parsed_messages, [ epoch_to_dt($ts), $msg ] );
|
|
|
|
}
|
|
|
|
$ret->{extra_data}{qos_msg} = [@parsed_messages];
|
|
|
|
|
2019-08-06 18:21:57 +00:00
|
|
|
if ( $dep_info and $dep_info->{sched_arr} ) {
|
|
|
|
$dep_info->{sched_arr}
|
|
|
|
= epoch_to_dt( $dep_info->{sched_arr} );
|
|
|
|
$dep_info->{rt_arr} = $dep_info->{sched_arr}->clone;
|
|
|
|
if ( $dep_info->{adelay}
|
|
|
|
and $dep_info->{adelay} =~ m{^\d+$} )
|
|
|
|
{
|
|
|
|
$dep_info->{rt_arr}
|
|
|
|
->add( minutes => $dep_info->{adelay} );
|
|
|
|
}
|
|
|
|
$dep_info->{rt_arr_countdown} = $ret->{boarding_countdown}
|
|
|
|
= $dep_info->{rt_arr}->epoch - $epoch;
|
|
|
|
}
|
|
|
|
|
2019-05-31 18:18:22 +00:00
|
|
|
for my $station (@route_after) {
|
|
|
|
if ( @{$station} > 1 ) {
|
2019-10-06 08:55:09 +00:00
|
|
|
|
2019-10-06 14:32:58 +00:00
|
|
|
# Note: $station->[1]{sched_arr} may already have been
|
|
|
|
# converted to a DateTime object in $station->[1] is
|
|
|
|
# $dep_info. This can happen when a station is present
|
|
|
|
# several times in a train's route, e.g. for Frankfurt
|
|
|
|
# Flughafen in some nightly connections.
|
|
|
|
my $times = $station->[1];
|
2019-10-06 08:55:09 +00:00
|
|
|
if ( $times->{sched_arr}
|
2019-10-06 09:02:29 +00:00
|
|
|
and ref( $times->{sched_arr} ) ne 'DateTime' )
|
2019-10-06 08:55:09 +00:00
|
|
|
{
|
2019-05-31 18:18:22 +00:00
|
|
|
$times->{sched_arr}
|
|
|
|
= epoch_to_dt( $times->{sched_arr} );
|
|
|
|
$times->{rt_arr} = $times->{sched_arr}->clone;
|
|
|
|
if ( $times->{adelay}
|
|
|
|
and $times->{adelay} =~ m{^\d+$} )
|
|
|
|
{
|
|
|
|
$times->{rt_arr}
|
|
|
|
->add( minutes => $times->{adelay} );
|
|
|
|
}
|
|
|
|
$times->{rt_arr_countdown}
|
|
|
|
= $times->{rt_arr}->epoch - $epoch;
|
|
|
|
}
|
2019-10-06 08:55:09 +00:00
|
|
|
if ( $times->{sched_dep}
|
2019-10-06 09:02:29 +00:00
|
|
|
and ref( $times->{sched_dep} ) ne 'DateTime' )
|
2019-10-06 08:55:09 +00:00
|
|
|
{
|
2019-05-31 18:18:22 +00:00
|
|
|
$times->{sched_dep}
|
|
|
|
= epoch_to_dt( $times->{sched_dep} );
|
|
|
|
$times->{rt_dep} = $times->{sched_dep}->clone;
|
|
|
|
if ( $times->{ddelay}
|
|
|
|
and $times->{ddelay} =~ m{^\d+$} )
|
|
|
|
{
|
|
|
|
$times->{rt_dep}
|
|
|
|
->add( minutes => $times->{ddelay} );
|
|
|
|
}
|
|
|
|
$times->{rt_dep_countdown}
|
|
|
|
= $times->{rt_dep}->epoch - $epoch;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-23 19:30:31 +00:00
|
|
|
$ret->{departure_countdown}
|
|
|
|
= $ret->{real_departure}->epoch - $now->epoch;
|
2019-06-24 16:02:45 +00:00
|
|
|
|
|
|
|
if ( $ret->{departure_countdown} > 0
|
|
|
|
and $in_transit->{data}{wagonorder_dep} )
|
|
|
|
{
|
|
|
|
my $wr;
|
|
|
|
eval {
|
|
|
|
$wr
|
|
|
|
= Travel::Status::DE::DBWagenreihung->new(
|
|
|
|
from_json => $in_transit->{data}{wagonorder_dep} );
|
|
|
|
};
|
|
|
|
if ( $wr
|
|
|
|
and $wr->sections
|
|
|
|
and $wr->wagons
|
|
|
|
and defined $wr->direction )
|
|
|
|
{
|
|
|
|
$ret->{wagonorder} = $wr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-23 19:30:31 +00:00
|
|
|
if ( $in_transit->{real_arr_ts} ) {
|
|
|
|
$ret->{arrival_countdown}
|
|
|
|
= $ret->{real_arrival}->epoch - $now->epoch;
|
2019-05-31 18:18:22 +00:00
|
|
|
$ret->{journey_duration}
|
|
|
|
= $ret->{real_arrival}->epoch
|
2019-04-23 19:30:31 +00:00
|
|
|
- $ret->{real_departure}->epoch;
|
2019-05-08 05:12:54 +00:00
|
|
|
$ret->{journey_completion}
|
|
|
|
= $ret->{journey_duration}
|
|
|
|
? 1
|
|
|
|
- ( $ret->{arrival_countdown} / $ret->{journey_duration} )
|
|
|
|
: 1;
|
2019-04-23 19:30:31 +00:00
|
|
|
if ( $ret->{journey_completion} > 1 ) {
|
|
|
|
$ret->{journey_completion} = 1;
|
|
|
|
}
|
|
|
|
elsif ( $ret->{journey_completion} < 0 ) {
|
|
|
|
$ret->{journey_completion} = 0;
|
|
|
|
}
|
2019-06-22 15:02:04 +00:00
|
|
|
|
2019-08-03 10:35:47 +00:00
|
|
|
my ($dep_platform_number)
|
|
|
|
= ( ( $ret->{dep_platform} // 0 ) =~ m{(\d+)} );
|
|
|
|
if ( $dep_platform_number
|
|
|
|
and exists $in_transit->{data}{stationinfo_dep}
|
|
|
|
{$dep_platform_number} )
|
|
|
|
{
|
|
|
|
$ret->{dep_direction}
|
|
|
|
= $self->stationinfo_to_direction(
|
|
|
|
$in_transit->{data}{stationinfo_dep}
|
|
|
|
{$dep_platform_number},
|
|
|
|
$in_transit->{data}{wagonorder_dep},
|
|
|
|
undef,
|
|
|
|
$stop_after_dep
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-06-22 15:02:04 +00:00
|
|
|
my ($arr_platform_number)
|
|
|
|
= ( ( $ret->{arr_platform} // 0 ) =~ m{(\d+)} );
|
|
|
|
if ( $arr_platform_number
|
|
|
|
and exists $in_transit->{data}{stationinfo_arr}
|
|
|
|
{$arr_platform_number} )
|
|
|
|
{
|
2019-08-03 09:11:27 +00:00
|
|
|
$ret->{arr_direction}
|
|
|
|
= $self->stationinfo_to_direction(
|
|
|
|
$in_transit->{data}{stationinfo_arr}
|
|
|
|
{$arr_platform_number},
|
|
|
|
$in_transit->{data}{wagonorder_arr},
|
2019-08-03 10:35:47 +00:00
|
|
|
$stop_before_dest,
|
|
|
|
undef
|
2019-08-03 09:11:27 +00:00
|
|
|
);
|
2019-06-22 15:02:04 +00:00
|
|
|
}
|
|
|
|
|
2019-04-23 19:30:31 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
$ret->{arrival_countdown} = undef;
|
|
|
|
$ret->{journey_duration} = undef;
|
|
|
|
$ret->{journey_completion} = undef;
|
|
|
|
}
|
|
|
|
|
|
|
|
return $ret;
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
|
|
|
|
my $latest = $db->select(
|
|
|
|
'journeys_str',
|
|
|
|
'*',
|
|
|
|
{
|
|
|
|
user_id => $uid,
|
|
|
|
cancelled => 0
|
|
|
|
},
|
|
|
|
{
|
|
|
|
order_by => { -desc => 'journey_id' },
|
|
|
|
limit => 1
|
|
|
|
}
|
2019-12-06 20:40:51 +00:00
|
|
|
)->expand->hash;
|
2019-04-23 16:08:07 +00:00
|
|
|
|
|
|
|
if ($latest) {
|
|
|
|
my $ts = $latest->{checkout_ts};
|
|
|
|
my $action_time = epoch_to_dt($ts);
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( my $station
|
|
|
|
= $self->app->station_by_eva->{ $latest->{dep_eva} } )
|
|
|
|
{
|
|
|
|
$latest->{dep_ds100} = $station->[0];
|
|
|
|
$latest->{dep_name} = $station->[1];
|
|
|
|
}
|
|
|
|
if ( my $station
|
|
|
|
= $self->app->station_by_eva->{ $latest->{arr_eva} } )
|
|
|
|
{
|
|
|
|
$latest->{arr_ds100} = $station->[0];
|
|
|
|
$latest->{arr_name} = $station->[1];
|
|
|
|
}
|
2019-04-23 16:08:07 +00:00
|
|
|
return {
|
|
|
|
checked_in => 0,
|
|
|
|
cancelled => 0,
|
|
|
|
journey_id => $latest->{journey_id},
|
|
|
|
timestamp => $action_time,
|
|
|
|
timestamp_delta => $now->epoch - $action_time->epoch,
|
|
|
|
train_type => $latest->{train_type},
|
|
|
|
train_line => $latest->{train_line},
|
|
|
|
train_no => $latest->{train_no},
|
|
|
|
train_id => $latest->{train_id},
|
|
|
|
sched_departure => epoch_to_dt( $latest->{sched_dep_ts} ),
|
|
|
|
real_departure => epoch_to_dt( $latest->{real_dep_ts} ),
|
|
|
|
dep_ds100 => $latest->{dep_ds100},
|
2019-12-23 21:57:45 +00:00
|
|
|
dep_eva => $latest->{dep_eva},
|
2019-04-23 16:08:07 +00:00
|
|
|
dep_name => $latest->{dep_name},
|
2019-05-18 15:10:53 +00:00
|
|
|
dep_platform => $latest->{dep_platform},
|
2019-04-23 16:08:07 +00:00
|
|
|
sched_arrival => epoch_to_dt( $latest->{sched_arr_ts} ),
|
|
|
|
real_arrival => epoch_to_dt( $latest->{real_arr_ts} ),
|
|
|
|
arr_ds100 => $latest->{arr_ds100},
|
2019-12-23 21:57:45 +00:00
|
|
|
arr_eva => $latest->{arr_eva},
|
2019-04-23 16:08:07 +00:00
|
|
|
arr_name => $latest->{arr_name},
|
2019-05-18 15:10:53 +00:00
|
|
|
arr_platform => $latest->{arr_platform},
|
2019-12-06 20:40:51 +00:00
|
|
|
comment => $latest->{user_data}{comment},
|
2019-04-23 16:08:07 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
return {
|
2019-04-23 16:08:07 +00:00
|
|
|
checked_in => 0,
|
|
|
|
cancelled => 0,
|
|
|
|
no_journeys_yet => 1,
|
|
|
|
timestamp => epoch_to_dt(0),
|
|
|
|
timestamp_delta => $now->epoch,
|
2019-03-22 15:57:24 +00:00
|
|
|
};
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-05-06 14:59:48 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_user_status_json_v1' => sub {
|
|
|
|
my ( $self, $uid ) = @_;
|
|
|
|
my $status = $self->get_user_status($uid);
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
# TODO simplify lon/lat (can be returned from get_user_status)
|
|
|
|
|
2019-05-06 14:59:48 +00:00
|
|
|
my $ret = {
|
|
|
|
deprecated => \0,
|
|
|
|
checkedIn => (
|
|
|
|
$status->{checked_in}
|
|
|
|
or $status->{cancelled}
|
|
|
|
) ? \1 : \0,
|
|
|
|
fromStation => {
|
|
|
|
ds100 => $status->{dep_ds100},
|
|
|
|
name => $status->{dep_name},
|
2019-12-23 21:57:45 +00:00
|
|
|
uic => $status->{dep_eva},
|
2019-05-06 14:59:48 +00:00
|
|
|
longitude => undef,
|
|
|
|
latitude => undef,
|
2020-01-27 19:22:46 +00:00
|
|
|
scheduledTime => $status->{sched_departure}
|
|
|
|
? $status->{sched_departure}->epoch
|
|
|
|
: undef,
|
|
|
|
realTime => $status->{real_departure}
|
|
|
|
? $status->{real_departure}->epoch
|
|
|
|
: undef,
|
2019-05-06 14:59:48 +00:00
|
|
|
},
|
|
|
|
toStation => {
|
|
|
|
ds100 => $status->{arr_ds100},
|
|
|
|
name => $status->{arr_name},
|
2019-12-23 21:57:45 +00:00
|
|
|
uic => $status->{arr_eva},
|
2019-05-06 14:59:48 +00:00
|
|
|
longitude => undef,
|
|
|
|
latitude => undef,
|
2020-01-27 19:22:46 +00:00
|
|
|
scheduledTime => $status->{sched_arrival}
|
|
|
|
? $status->{sched_arrival}->epoch
|
|
|
|
: undef,
|
|
|
|
realTime => $status->{real_arrival}
|
|
|
|
? $status->{real_arrival}->epoch
|
|
|
|
: undef,
|
2019-05-06 14:59:48 +00:00
|
|
|
},
|
|
|
|
train => {
|
|
|
|
type => $status->{train_type},
|
|
|
|
line => $status->{train_line},
|
|
|
|
no => $status->{train_no},
|
|
|
|
id => $status->{train_id},
|
|
|
|
},
|
2020-01-27 19:22:46 +00:00
|
|
|
actionTime => $status->{timestamp}
|
|
|
|
? $status->{timestamp}->epoch
|
|
|
|
: undef,
|
2020-01-26 08:59:45 +00:00
|
|
|
intermediateStops => [],
|
2019-05-06 14:59:48 +00:00
|
|
|
};
|
|
|
|
|
2020-01-23 17:18:50 +00:00
|
|
|
for my $stop ( @{ $status->{route_after} // [] } ) {
|
|
|
|
if ( $status->{arr_name} and $stop->[0] eq $status->{arr_name} )
|
|
|
|
{
|
|
|
|
last;
|
|
|
|
}
|
|
|
|
push(
|
2020-01-26 08:59:45 +00:00
|
|
|
@{ $ret->{intermediateStops} },
|
2020-01-23 17:18:50 +00:00
|
|
|
{
|
|
|
|
name => $stop->[0],
|
|
|
|
scheduledArrival => $stop->[1]{sched_arr}
|
|
|
|
? $stop->[1]{sched_arr}->epoch
|
|
|
|
: undef,
|
|
|
|
realArrival => $stop->[1]{rt_arr}
|
|
|
|
? $stop->[1]{rt_arr}->epoch
|
|
|
|
: undef,
|
|
|
|
scheduledDeparture => $stop->[1]{sched_dep}
|
|
|
|
? $stop->[1]{sched_dep}->epoch
|
|
|
|
: undef,
|
|
|
|
realDeparture => $stop->[1]{rt_dep}
|
|
|
|
? $stop->[1]{rt_dep}->epoch
|
|
|
|
: undef,
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-12-23 21:57:45 +00:00
|
|
|
if ( $status->{dep_eva} ) {
|
2019-05-06 14:59:48 +00:00
|
|
|
my @station_descriptions
|
|
|
|
= Travel::Status::DE::IRIS::Stations::get_station(
|
2019-12-23 21:57:45 +00:00
|
|
|
$status->{dep_eva} );
|
2019-05-06 14:59:48 +00:00
|
|
|
if ( @station_descriptions == 1 ) {
|
|
|
|
(
|
2019-12-23 21:57:45 +00:00
|
|
|
undef, undef, undef,
|
2019-05-06 14:59:48 +00:00
|
|
|
$ret->{fromStation}{longitude},
|
|
|
|
$ret->{fromStation}{latitude}
|
|
|
|
) = @{ $station_descriptions[0] };
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( $status->{arr_ds100} ) {
|
|
|
|
my @station_descriptions
|
|
|
|
= Travel::Status::DE::IRIS::Stations::get_station(
|
|
|
|
$status->{arr_ds100} );
|
|
|
|
if ( @station_descriptions == 1 ) {
|
|
|
|
(
|
2019-12-23 21:57:45 +00:00
|
|
|
undef, undef, undef,
|
2019-05-06 14:59:48 +00:00
|
|
|
$ret->{toStation}{longitude},
|
|
|
|
$ret->{toStation}{latitude}
|
|
|
|
) = @{ $station_descriptions[0] };
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return $ret;
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'get_travel_distance' => sub {
|
|
|
|
my ( $self, $from, $to, $route_ref ) = @_;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-08-13 19:30:59 +00:00
|
|
|
my $distance_intermediate = 0;
|
|
|
|
my $distance_beeline = 0;
|
|
|
|
my $skipped = 0;
|
|
|
|
my $geo = Geo::Distance->new();
|
|
|
|
my @stations = map { $_->[0] } @{$route_ref};
|
|
|
|
my @route = after_incl { $_ eq $from } @stations;
|
2019-03-22 15:57:24 +00:00
|
|
|
@route = before_incl { $_ eq $to } @route;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
if ( @route < 2 ) {
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
# I AM ERROR
|
2019-08-13 19:30:59 +00:00
|
|
|
return ( 0, 0 );
|
2019-03-22 15:57:24 +00:00
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
my $prev_station = get_station( shift @route );
|
|
|
|
if ( not $prev_station ) {
|
2019-08-13 19:30:59 +00:00
|
|
|
return ( 0, 0 );
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
|
2019-08-13 19:30:59 +00:00
|
|
|
# Geo-coordinates for stations outside Germany are not available
|
|
|
|
# at the moment. When calculating distance with intermediate stops,
|
|
|
|
# these are simply left out (as if they were not part of the route).
|
|
|
|
# For beeline distance calculation, we use the route's first and last
|
|
|
|
# station with known geo-coordinates.
|
|
|
|
my $from_station_beeline;
|
|
|
|
my $to_station_beeline;
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
for my $station_name (@route) {
|
|
|
|
if ( my $station = get_station($station_name) ) {
|
2019-08-13 19:30:59 +00:00
|
|
|
if ( not $from_station_beeline and $#{$prev_station} >= 4 )
|
|
|
|
{
|
|
|
|
$from_station_beeline = $prev_station;
|
|
|
|
}
|
|
|
|
if ( $#{$station} >= 4 ) {
|
|
|
|
$to_station_beeline = $station;
|
|
|
|
}
|
2019-04-21 13:46:19 +00:00
|
|
|
if ( $#{$prev_station} >= 4 and $#{$station} >= 4 ) {
|
2019-08-13 19:30:59 +00:00
|
|
|
$distance_intermediate
|
2019-04-21 13:46:19 +00:00
|
|
|
+= $geo->distance( 'kilometer', $prev_station->[3],
|
|
|
|
$prev_station->[4], $station->[3], $station->[4] );
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$skipped++;
|
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
$prev_station = $station;
|
|
|
|
}
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
|
2019-08-13 19:30:59 +00:00
|
|
|
if ( $from_station_beeline and $to_station_beeline ) {
|
|
|
|
$distance_beeline = $geo->distance(
|
|
|
|
'kilometer', $from_station_beeline->[3],
|
|
|
|
$from_station_beeline->[4], $to_station_beeline->[3],
|
|
|
|
$to_station_beeline->[4]
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ( $distance_intermediate, $distance_beeline, $skipped );
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-27 20:20:59 +00:00
|
|
|
$self->helper(
|
|
|
|
'compute_journey_stats' => sub {
|
|
|
|
my ( $self, @journeys ) = @_;
|
|
|
|
my $km_route = 0;
|
|
|
|
my $km_beeline = 0;
|
|
|
|
my $min_travel_sched = 0;
|
|
|
|
my $min_travel_real = 0;
|
|
|
|
my $delay_dep = 0;
|
|
|
|
my $delay_arr = 0;
|
2019-04-01 18:28:06 +00:00
|
|
|
my $interchange_real = 0;
|
2019-03-27 20:20:59 +00:00
|
|
|
my $num_trains = 0;
|
|
|
|
my $num_journeys = 0;
|
2019-04-28 20:33:09 +00:00
|
|
|
my @inconsistencies;
|
2019-03-27 20:20:59 +00:00
|
|
|
|
2019-11-24 19:29:52 +00:00
|
|
|
my $next_departure = 0;
|
2019-04-01 18:28:06 +00:00
|
|
|
|
2019-03-27 20:20:59 +00:00
|
|
|
for my $journey (@journeys) {
|
|
|
|
$num_trains++;
|
|
|
|
$km_route += $journey->{km_route};
|
|
|
|
$km_beeline += $journey->{km_beeline};
|
2019-05-11 13:23:29 +00:00
|
|
|
if ( $journey->{sched_duration}
|
|
|
|
and $journey->{sched_duration} > 0 )
|
|
|
|
{
|
2019-03-27 20:20:59 +00:00
|
|
|
$min_travel_sched += $journey->{sched_duration} / 60;
|
|
|
|
}
|
2019-05-11 13:23:29 +00:00
|
|
|
if ( $journey->{rt_duration} and $journey->{rt_duration} > 0 ) {
|
2019-03-27 20:20:59 +00:00
|
|
|
$min_travel_real += $journey->{rt_duration} / 60;
|
|
|
|
}
|
2019-11-24 19:29:52 +00:00
|
|
|
if ( $journey->{sched_dep_ts} and $journey->{rt_dep_ts} ) {
|
2019-03-27 20:20:59 +00:00
|
|
|
$delay_dep
|
2019-11-24 19:29:52 +00:00
|
|
|
+= ( $journey->{rt_dep_ts} - $journey->{sched_dep_ts} )
|
|
|
|
/ 60;
|
2019-03-27 20:20:59 +00:00
|
|
|
}
|
2019-11-24 19:29:52 +00:00
|
|
|
if ( $journey->{sched_arr_ts} and $journey->{rt_arr_ts} ) {
|
2019-03-27 20:20:59 +00:00
|
|
|
$delay_arr
|
2019-11-24 19:29:52 +00:00
|
|
|
+= ( $journey->{rt_arr_ts} - $journey->{sched_arr_ts} )
|
|
|
|
/ 60;
|
2019-03-27 20:20:59 +00:00
|
|
|
}
|
2019-04-01 18:28:06 +00:00
|
|
|
|
|
|
|
# Note that journeys are sorted from recent to older entries
|
2019-11-24 19:29:52 +00:00
|
|
|
if ( $journey->{rt_arr_ts}
|
|
|
|
and $next_departure
|
|
|
|
and $next_departure - $journey->{rt_arr_ts} < ( 60 * 60 ) )
|
2019-04-01 18:28:06 +00:00
|
|
|
{
|
2019-11-24 19:29:52 +00:00
|
|
|
if ( $next_departure - $journey->{rt_arr_ts} < 0 ) {
|
2019-04-28 20:33:09 +00:00
|
|
|
push( @inconsistencies,
|
2019-11-24 19:29:52 +00:00
|
|
|
epoch_to_dt($next_departure)
|
|
|
|
->strftime('%d.%m.%Y %H:%M') );
|
2019-04-28 20:33:09 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
$interchange_real
|
2019-11-24 19:29:52 +00:00
|
|
|
+= ( $next_departure - $journey->{rt_arr_ts} ) / 60;
|
2019-04-28 20:33:09 +00:00
|
|
|
}
|
2019-04-01 18:28:06 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
$num_journeys++;
|
|
|
|
}
|
2019-11-24 19:29:52 +00:00
|
|
|
$next_departure = $journey->{rt_dep_ts};
|
2019-03-27 20:20:59 +00:00
|
|
|
}
|
|
|
|
return {
|
2019-04-01 18:28:06 +00:00
|
|
|
km_route => $km_route,
|
|
|
|
km_beeline => $km_beeline,
|
|
|
|
num_trains => $num_trains,
|
|
|
|
num_journeys => $num_journeys,
|
|
|
|
min_travel_sched => $min_travel_sched,
|
|
|
|
min_travel_real => $min_travel_real,
|
|
|
|
min_interchange_real => $interchange_real,
|
|
|
|
delay_dep => $delay_dep,
|
|
|
|
delay_arr => $delay_arr,
|
2019-04-28 20:33:09 +00:00
|
|
|
inconsistencies => \@inconsistencies,
|
2019-03-27 20:20:59 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$self->helper(
|
|
|
|
'navbar_class' => sub {
|
|
|
|
my ( $self, $path ) = @_;
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
if ( $self->req->url eq $self->url_for($path) ) {
|
|
|
|
return 'active';
|
|
|
|
}
|
|
|
|
return q{};
|
2019-03-21 21:12:45 +00:00
|
|
|
}
|
2019-03-22 15:57:24 +00:00
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
my $r = $self->routes;
|
|
|
|
|
|
|
|
$r->get('/')->to('traveling#homepage');
|
|
|
|
$r->get('/about')->to('static#about');
|
2019-05-02 09:29:43 +00:00
|
|
|
$r->get('/api')->to('api#documentation');
|
2019-05-03 08:32:58 +00:00
|
|
|
$r->get('/changelog')->to('static#changelog');
|
2019-03-22 15:57:24 +00:00
|
|
|
$r->get('/impressum')->to('static#imprint');
|
|
|
|
$r->get('/imprint')->to('static#imprint');
|
2019-05-03 18:43:46 +00:00
|
|
|
$r->get('/offline')->to('static#offline');
|
2019-04-24 05:34:41 +00:00
|
|
|
$r->get('/api/v1/:user_action/:token')->to('api#get_v1');
|
2019-03-22 15:57:24 +00:00
|
|
|
$r->get('/login')->to('account#login_form');
|
2019-04-29 18:12:59 +00:00
|
|
|
$r->get('/recover')->to('account#request_password_reset');
|
|
|
|
$r->get('/recover/:id/:token')->to('account#recover_password');
|
2019-03-22 15:57:24 +00:00
|
|
|
$r->get('/register')->to('account#registration_form');
|
|
|
|
$r->get('/reg/:id/:token')->to('account#verify');
|
2019-04-30 21:23:49 +00:00
|
|
|
$r->get('/status/:name')->to('traveling#user_status');
|
2019-05-29 18:01:52 +00:00
|
|
|
$r->get('/status/:name/:ts')->to('traveling#user_status');
|
2019-05-02 08:05:15 +00:00
|
|
|
$r->get('/ajax/status/:name')->to('traveling#public_status_card');
|
2019-05-29 18:01:52 +00:00
|
|
|
$r->get('/ajax/status/:name/:ts')->to('traveling#public_status_card');
|
2019-12-14 19:46:02 +00:00
|
|
|
$r->post('/api/v1/import')->to('api#import_v1');
|
2019-12-14 20:53:23 +00:00
|
|
|
$r->post('/api/v1/travel')->to('api#travel_v1');
|
2019-03-22 15:57:24 +00:00
|
|
|
$r->post('/action')->to('traveling#log_action');
|
|
|
|
$r->post('/geolocation')->to('traveling#geolocation');
|
|
|
|
$r->post('/list_departures')->to('traveling#redirect_to_station');
|
|
|
|
$r->post('/login')->to('account#do_login');
|
|
|
|
$r->post('/register')->to('account#register');
|
2019-04-29 18:12:59 +00:00
|
|
|
$r->post('/recover')->to('account#request_password_reset');
|
2019-03-22 15:57:24 +00:00
|
|
|
|
|
|
|
my $authed_r = $r->under(
|
|
|
|
sub {
|
|
|
|
my ($self) = @_;
|
|
|
|
if ( $self->is_user_authenticated ) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
$self->render( 'login', redirect_to => $self->req->url );
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
);
|
2019-03-21 21:12:45 +00:00
|
|
|
|
2019-03-22 15:57:24 +00:00
|
|
|
$authed_r->get('/account')->to('account#account');
|
2019-04-30 21:23:49 +00:00
|
|
|
$authed_r->get('/account/privacy')->to('account#privacy');
|
2019-05-05 16:09:11 +00:00
|
|
|
$authed_r->get('/account/hooks')->to('account#webhook');
|
2019-05-20 17:15:21 +00:00
|
|
|
$authed_r->get('/account/insight')->to('account#insight');
|
2019-04-23 20:27:13 +00:00
|
|
|
$authed_r->get('/ajax/status_card.html')->to('traveling#status_card');
|
2019-04-07 16:44:33 +00:00
|
|
|
$authed_r->get('/cancelled')->to('traveling#cancelled');
|
2019-09-13 21:39:28 +00:00
|
|
|
$authed_r->get('/fgr')->to('passengerrights#list_candidates');
|
2019-05-03 16:57:24 +00:00
|
|
|
$authed_r->get('/account/password')->to('account#password_form');
|
|
|
|
$authed_r->get('/account/mail')->to('account#change_mail');
|
2019-03-22 15:57:24 +00:00
|
|
|
$authed_r->get('/export.json')->to('account#json_export');
|
2019-04-07 16:44:33 +00:00
|
|
|
$authed_r->get('/history.json')->to('traveling#json_history');
|
2019-03-22 15:57:24 +00:00
|
|
|
$authed_r->get('/history')->to('traveling#history');
|
2019-11-15 23:01:50 +00:00
|
|
|
$authed_r->get('/history/map')->to('traveling#map_history');
|
2019-04-07 16:44:33 +00:00
|
|
|
$authed_r->get('/history/:year')->to('traveling#yearly_history');
|
2019-03-27 20:20:59 +00:00
|
|
|
$authed_r->get('/history/:year/:month')->to('traveling#monthly_history');
|
2019-04-07 18:20:37 +00:00
|
|
|
$authed_r->get('/journey/add')->to('traveling#add_journey_form');
|
2019-12-06 20:40:51 +00:00
|
|
|
$authed_r->get('/journey/comment')->to('traveling#comment_form');
|
2019-03-22 15:57:24 +00:00
|
|
|
$authed_r->get('/journey/:id')->to('traveling#journey_details');
|
|
|
|
$authed_r->get('/s/*station')->to('traveling#station');
|
2019-04-30 10:08:51 +00:00
|
|
|
$authed_r->get('/confirm_mail/:token')->to('account#confirm_mail');
|
2019-04-30 21:23:49 +00:00
|
|
|
$authed_r->post('/account/privacy')->to('account#privacy');
|
2019-05-05 16:09:11 +00:00
|
|
|
$authed_r->post('/account/hooks')->to('account#webhook');
|
2019-05-20 17:15:21 +00:00
|
|
|
$authed_r->post('/account/insight')->to('account#insight');
|
2019-04-13 08:43:05 +00:00
|
|
|
$authed_r->post('/journey/add')->to('traveling#add_journey_form');
|
2019-12-06 20:40:51 +00:00
|
|
|
$authed_r->post('/journey/comment')->to('traveling#comment_form');
|
2019-04-07 18:20:37 +00:00
|
|
|
$authed_r->post('/journey/edit')->to('traveling#edit_journey');
|
2019-09-12 16:23:23 +00:00
|
|
|
$authed_r->post('/journey/passenger_rights/*filename')
|
2019-09-12 16:07:21 +00:00
|
|
|
->to('passengerrights#generate');
|
2019-05-03 16:57:24 +00:00
|
|
|
$authed_r->post('/account/password')->to('account#change_password');
|
|
|
|
$authed_r->post('/account/mail')->to('account#change_mail');
|
2019-03-22 15:57:24 +00:00
|
|
|
$authed_r->post('/delete')->to('account#delete');
|
|
|
|
$authed_r->post('/logout')->to('account#do_logout');
|
|
|
|
$authed_r->post('/set_token')->to('api#set_token');
|
2019-03-21 21:12:45 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
1;
|