From 0db552842dcfe515764090983dd5993249d61909 Mon Sep 17 00:00:00 2001
From: Birte Kristina Friesel <derf@finalrewind.org>
Date: Wed, 18 Dec 2024 17:43:17 +0100
Subject: Speed up history pages: Only build route datetimes when needed

---
 lib/Travelynx/Controller/Profile.pm   | 13 ++++++------
 lib/Travelynx/Controller/Traveling.pm | 40 +++++++++++++++++++----------------
 lib/Travelynx/Model/Journeys.pm       | 11 ++++++----
 3 files changed, 36 insertions(+), 28 deletions(-)

(limited to 'lib')

diff --git a/lib/Travelynx/Controller/Profile.pm b/lib/Travelynx/Controller/Profile.pm
index a5f394f..c35642d 100755
--- a/lib/Travelynx/Controller/Profile.pm
+++ b/lib/Travelynx/Controller/Profile.pm
@@ -231,12 +231,13 @@ sub journey_details {
 	}
 
 	my $journey = $self->journeys->get_single(
-		uid             => $user->{id},
-		journey_id      => $journey_id,
-		verbose         => 1,
-		with_datetime   => 1,
-		with_polyline   => 1,
-		with_visibility => 1,
+		uid                 => $user->{id},
+		journey_id          => $journey_id,
+		verbose             => 1,
+		with_datetime       => 1,
+		with_route_datetime => 1,
+		with_polyline       => 1,
+		with_visibility     => 1,
 	);
 
 	if ( not $journey ) {
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index 31cb550..f61d83d 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -1167,9 +1167,10 @@ sub redirect_to_station {
 sub cancelled {
 	my ($self) = @_;
 	my @journeys = $self->journeys->get(
-		uid           => $self->current_user->{id},
-		cancelled     => 1,
-		with_datetime => 1
+		uid                 => $self->current_user->{id},
+		cancelled           => 1,
+		with_datetime       => 1,
+		with_route_datetime => 1
 	);
 
 	$self->respond_to(
@@ -1696,12 +1697,13 @@ sub journey_details {
 	}
 
 	my $journey = $self->journeys->get_single(
-		uid             => $uid,
-		journey_id      => $journey_id,
-		verbose         => 1,
-		with_datetime   => 1,
-		with_polyline   => 1,
-		with_visibility => 1,
+		uid                 => $uid,
+		journey_id          => $journey_id,
+		verbose             => 1,
+		with_datetime       => 1,
+		with_route_datetime => 1,
+		with_polyline       => 1,
+		with_visibility     => 1,
 	);
 
 	if ($journey) {
@@ -1924,10 +1926,11 @@ sub edit_journey {
 	}
 
 	my $journey = $self->journeys->get_single(
-		uid           => $uid,
-		journey_id    => $journey_id,
-		verbose       => 1,
-		with_datetime => 1,
+		uid                 => $uid,
+		journey_id          => $journey_id,
+		verbose             => 1,
+		with_datetime       => 1,
+		with_route_datetime => 1,
 	);
 
 	if ( not $journey ) {
@@ -2028,11 +2031,12 @@ sub edit_journey {
 
 		if ( not $error ) {
 			$journey = $self->journeys->get_single(
-				uid           => $uid,
-				db            => $db,
-				journey_id    => $journey_id,
-				verbose       => 1,
-				with_datetime => 1,
+				uid                 => $uid,
+				db                  => $db,
+				journey_id          => $journey_id,
+				verbose             => 1,
+				with_datetime       => 1,
+				with_route_datetime => 1,
 			);
 			$error = $self->journeys->sanity_check($journey);
 		}
diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm
index b80a441..905c426 100755
--- a/lib/Travelynx/Model/Journeys.pm
+++ b/lib/Travelynx/Model/Journeys.pm
@@ -301,10 +301,11 @@ sub update {
 	my $rows;
 
 	my $journey = $self->get_single(
-		uid           => $uid,
-		db            => $db,
-		journey_id    => $journey_id,
-		with_datetime => 1,
+		uid                 => $uid,
+		db                  => $db,
+		journey_id          => $journey_id,
+		with_datetime       => 1,
+		with_route_datetime => 1,
 	);
 
 	eval {
@@ -656,6 +657,8 @@ sub get {
 			$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} );
+		}
+		if ( $opt{with_route_datetime} ) {
 			for my $stop ( @{ $ref->{route} } ) {
 				for my $k (qw(rt_arr rt_dep sched_arr sched_dep)) {
 					if ( $stop->[2]{$k} ) {
-- 
cgit v1.2.3