summaryrefslogtreecommitdiff
path: root/lib/Travelynx
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Travelynx')
-rw-r--r--lib/Travelynx/Command/database.pm132
-rw-r--r--lib/Travelynx/Command/work.pm6
-rwxr-xr-xlib/Travelynx/Controller/Api.pm85
3 files changed, 135 insertions, 88 deletions
diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm
index 4b23692..cb5ffec 100644
--- a/lib/Travelynx/Command/database.pm
+++ b/lib/Travelynx/Command/database.pm
@@ -2,6 +2,7 @@ package Travelynx::Command::database;
use Mojo::Base 'Mojolicious::Command';
use DateTime;
+use Travel::Status::DE::IRIS::Stations;
has description => 'Initialize or upgrade database layout';
@@ -809,6 +810,137 @@ my @migrations = (
}
);
},
+
+ # v18 -> v19
+ sub {
+ my ($db) = @_;
+ say
+'Transitioning from travelynx station ID to EVA IDs, this may take a while ...';
+ $db->query(
+ qq{
+ alter table in_transit drop constraint in_transit_checkin_station_id_fkey;
+ alter table in_transit drop constraint in_transit_checkout_station_id_fkey;
+ alter table journeys drop constraint journeys_checkin_station_id_fkey;
+ alter table journeys drop constraint journeys_checkout_station_id_fkey;
+ }
+ );
+ for my $journey ( $db->select( 'in_transit_str', '*' )->hashes->each ) {
+ my ($s_dep)
+ = Travel::Status::DE::IRIS::Stations::get_station(
+ $journey->{dep_ds100} );
+ if ( $s_dep->[1] ne $journey->{dep_name} ) {
+ die(
+"$s_dep->[0] name mismatch: $s_dep->[1] vs. $journey->{dep_name}"
+ );
+ }
+ my $rows = $db->update(
+ 'in_transit',
+ { checkin_station_id => $s_dep->[2] },
+ { user_id => $journey->{user_id} }
+ )->rows;
+ if ( $rows != 1 ) {
+ die(
+"Update error at in_transit checkin_station_id UID $journey->{user_id}\n"
+ );
+ }
+ if ( $journey->{arr_ds100} ) {
+ my ($s_arr)
+ = Travel::Status::DE::IRIS::Stations::get_station(
+ $journey->{arr_ds100} );
+ if ( $s_arr->[1] ne $journey->{arr_name} ) {
+ die(
+"$s_arr->[0] name mismatch: $s_arr->[1] vs. $journey->{arr_name}"
+ );
+ }
+ my $rows = $db->update(
+ 'in_transit',
+ { checkout_station_id => $s_arr->[2] },
+ { user_id => $journey->{user_id} }
+ )->rows;
+ if ( $rows != 1 ) {
+ die(
+"Update error at in_transit checkout_station_id UID $journey->{user_id}\n"
+ );
+ }
+ }
+ }
+ for my $journey ( $db->select( 'journeys_str', '*' )->hashes->each ) {
+ my ($s_dep)
+ = Travel::Status::DE::IRIS::Stations::get_station(
+ $journey->{dep_ds100} );
+ my ($s_arr)
+ = Travel::Status::DE::IRIS::Stations::get_station(
+ $journey->{arr_ds100} );
+ if ( $s_dep->[1] ne $journey->{dep_name} ) {
+ die(
+"$s_dep->[0] name mismatch: $s_dep->[1] vs. $journey->{dep_name}"
+ );
+ }
+ my $rows = $db->update(
+ 'journeys',
+ { checkin_station_id => $s_dep->[2] },
+ { id => $journey->{journey_id} }
+ )->rows;
+ if ( $rows != 1 ) {
+ die(
+"While updating journeys#checkin_station_id for journey $journey->{id}: got $rows rows, expected 1\n"
+ );
+ }
+ if ( $s_arr->[1] ne $journey->{arr_name} ) {
+ die(
+"$s_arr->[0] name mismatch: $s_arr->[1] vs. $journey->{arr_name}"
+ );
+ }
+ $rows = $db->update(
+ 'journeys',
+ { checkout_station_id => $s_arr->[2] },
+ { id => $journey->{journey_id} }
+ )->rows;
+ if ( $rows != 1 ) {
+ die(
+"While updating journeys#checkout_station_id for journey $journey->{id}: got $rows rows, expected 1\n"
+ );
+ }
+ }
+ $db->query(
+ qq{
+ drop view journeys_str;
+ drop view in_transit_str;
+ create view journeys_str as select
+ journeys.id as journey_id, user_id,
+ train_type, train_line, train_no, train_id,
+ extract(epoch from checkin_time) as checkin_ts,
+ extract(epoch from sched_departure) as sched_dep_ts,
+ extract(epoch from real_departure) as real_dep_ts,
+ checkin_station_id as dep_eva,
+ extract(epoch from checkout_time) as checkout_ts,
+ extract(epoch from sched_arrival) as sched_arr_ts,
+ extract(epoch from real_arrival) as real_arr_ts,
+ checkout_station_id as arr_eva,
+ cancelled, edited, route, messages, user_data,
+ dep_platform, arr_platform
+ from journeys
+ ;
+ create or replace view in_transit_str as select
+ user_id,
+ train_type, train_line, train_no, train_id,
+ extract(epoch from checkin_time) as checkin_ts,
+ extract(epoch from sched_departure) as sched_dep_ts,
+ extract(epoch from real_departure) as real_dep_ts,
+ checkin_station_id as dep_eva,
+ extract(epoch from checkout_time) as checkout_ts,
+ extract(epoch from sched_arrival) as sched_arr_ts,
+ extract(epoch from real_arrival) as real_arr_ts,
+ checkout_station_id as arr_eva,
+ cancelled, route, messages, user_data,
+ dep_platform, arr_platform, data
+ from in_transit
+ ;
+ drop table stations;
+ update schema_version set version = 19;
+ }
+ );
+ },
);
sub setup_db {
diff --git a/lib/Travelynx/Command/work.pm b/lib/Travelynx/Command/work.pm
index 00eefc6..fbbf958 100644
--- a/lib/Travelynx/Command/work.pm
+++ b/lib/Travelynx/Command/work.pm
@@ -23,8 +23,8 @@ sub run {
{
my $uid = $entry->{user_id};
- my $dep = $entry->{dep_ds100};
- my $arr = $entry->{arr_ds100};
+ my $dep = $entry->{dep_eva};
+ my $arr = $entry->{arr_eva};
my $train_id = $entry->{train_id};
# Note: IRIS data is not always updated in real-time. Both departure and
@@ -72,7 +72,7 @@ sub run {
eval {
if (
- $entry->{arr_name}
+ $arr
and ( not $entry->{real_arr_ts}
or $now->epoch - $entry->{real_arr_ts} < 600 )
)
diff --git a/lib/Travelynx/Controller/Api.pm b/lib/Travelynx/Controller/Api.pm
index 427fa2e..4546292 100755
--- a/lib/Travelynx/Controller/Api.pm
+++ b/lib/Travelynx/Controller/Api.pm
@@ -27,91 +27,6 @@ sub documentation {
$self->render('api_documentation');
}
-sub get_v0 {
- my ($self) = @_;
-
- my $api_action = $self->stash('user_action');
- my $api_token = $self->stash('token');
- if ( $api_action !~ qr{ ^ (?: status | history | action ) $ }x ) {
- $self->render(
- json => {
- error => 'Invalid action',
- },
- );
- return;
- }
- if ( $api_token !~ qr{ ^ (?<id> \d+ ) - (?<token> .* ) $ }x ) {
- $self->render(
- json => {
- error => 'Malformed token',
- },
- );
- return;
- }
- my $uid = $+{id};
- $api_token = $+{token};
- my $token = $self->get_api_token($uid);
- if ( $api_token ne $token->{$api_action} ) {
- $self->render(
- json => {
- error => 'Invalid token',
- },
- );
- return;
- }
- if ( $api_action eq 'status' ) {
- my $status = $self->get_user_status($uid);
-
- my @station_descriptions;
- my $station_eva = undef;
- my $station_lon = undef;
- my $station_lat = undef;
-
- if ( $status->{arr_ds100} // $status->{dep_ds100} ) {
- @station_descriptions
- = Travel::Status::DE::IRIS::Stations::get_station(
- $status->{arr_ds100} // $status->{dep_ds100} );
- }
- if ( @station_descriptions == 1 ) {
- ( undef, undef, $station_eva, $station_lon, $station_lat )
- = @{ $station_descriptions[0] };
- }
- $self->render(
- json => {
- deprecated => \1,
- checked_in => (
- $status->{checked_in}
- or $status->{cancelled}
- ) ? \1 : \0,
- station => {
- ds100 => $status->{arr_ds100} // $status->{dep_ds100},
- name => $status->{arr_name} // $status->{dep_name},
- uic => $station_eva,
- longitude => $station_lon,
- latitude => $station_lat,
- },
- train => {
- type => $status->{train_type},
- line => $status->{train_line},
- no => $status->{train_no},
- },
- actionTime => $status->{timestamp}->epoch,
- scheduledTime => $status->{sched_arrival}->epoch
- || $status->{sched_departure}->epoch,
- realTime => $status->{real_arrival}->epoch
- || $status->{real_departure}->epoch,
- },
- );
- }
- else {
- $self->render(
- json => {
- error => 'not implemented',
- },
- );
- }
-}
-
sub get_v1 {
my ($self) = @_;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 20:08:39 +0000