Mirrors/travelynx
2
0
Fork 0
mirror of https://github.com/derf/travelynx synced 2024-12-04 02:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

store related stations; respect them when looking up connections

Browse source
This commit is contained in:
Birte Kristina Friesel 2023-10-01 07:11:58 +02:00
parent 2638dd36fb
commit aaeb81a5d2
No known key found for this signature in database
GPG key ID: 19E6E524EBB177BA
4 changed files with 69 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/Travelynx/Command/database.pm
View file

@ -1929,6 +1929,23 @@ my @migrations = (
}
);
},
# v50 -> v51
# store related HAFAS stations
sub {
my ($db) = @_;
$db->query(
qq{
create table related_stations (
eva integer not null,
meta integer not null,
unique (eva, meta)
);
create index rel_eva on related_stations (eva);
update schema_version set version = 51;
}
);
},
);
sub sync_stations {

4
lib/Travelynx/Controller/Traveling.pm
View file

@ -960,6 +960,10 @@ sub station {
( $_->datetime // $_->sched_datetime )->epoch
< $now + 30 * 60
} $status->results;
$self->stations->add_meta(
eva => $status->station->{eva},
meta => $status->station->{evas}
);
$status = {
station_eva => $status->station->{eva},
station_name => (

27
lib/Travelynx/Model/Journeys.pm
View file

@ -1735,21 +1735,20 @@ sub get_connection_targets {
return;
}
my $res = $db->query(
qq{
select
count(checkout_station_id) as count,
checkout_station_id as dest
from journeys
where user_id = ?
and checkin_station_id = ?
and real_departure > ?
group by checkout_station_id
order by count desc;
my $dest_ids = [ $dest_id, $self->{stations}->get_meta( eva => $dest_id ) ];
my $res = $db->select(
'journeys',
'count(checkout_station_id) as count, checkout_station_id as dest',
{
user_id => $uid,
checkin_station_id => $dest_ids,
real_departure => { '>', $threshold }
},
$uid,
$dest_id,
$threshold
{
group_by => ['checkout_station_id'],
order_by => { -desc => 'count' }
}
);
my @destinations
= $res->hashes->grep( sub { shift->{count} >= $min_count } )

35
lib/Travelynx/Model/Stations.pm
View file

@ -50,6 +50,41 @@ sub add_or_update {
);
}
sub add_meta {
my ( $self, %opt ) = @_;
my $db = $opt{db} // $self->{pg}->db;
my $eva = $opt{eva};
my @meta = @{ $opt{meta} };
for my $meta (@meta) {
if ( $meta != $eva ) {
$db->insert(
'related_stations',
{
eva => $eva,
meta => $meta
},
{ on_conflict => undef }
);
}
}
}
sub get_meta {
my ( $self, %opt ) = @_;
my $db = $opt{db} // $self->{pg}->db;
my $eva = $opt{eva};
my $res = $db->select( 'related_stations', ['meta'], { eva => $eva } );
my @ret;
while ( my $row = $res->hash ) {
push( @ret, $row->{meta} );
}
return @ret;
}
sub get_for_autocomplete {
my ($self) = @_;