From 7b0d8eda83cc03fca8b4228fb14795433c40f6dc Mon Sep 17 00:00:00 2001
From: Birte Kristina Friesel <derf@finalrewind.org>
Date: Wed, 18 Jun 2025 22:26:11 +0200
Subject: EFA: trip IDs should include a time, not just a date

Closes #243
---
 cpanfile                              | 2 +-
 lib/Travelynx/Controller/Traveling.pm | 3 ++-
 lib/Travelynx/Helper/EFA.pm           | 7 +++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cpanfile b/cpanfile
index 2c8979b..8292fb4 100644
--- a/cpanfile
+++ b/cpanfile
@@ -17,7 +17,7 @@ requires 'Mojolicious::Plugin::OAuth2';
 requires 'Mojo::Pg';
 requires 'Text::CSV';
 requires 'Text::Markdown';
-requires 'Travel::Status::DE::EFA', '>= 3.10';
+requires 'Travel::Status::DE::EFA', '>= 3.12';
 requires 'Travel::Status::MOTIS', '>= 0.01';
 requires 'Travel::Status::DE::DBRIS', '>= 0.10';
 requires 'Travel::Status::DE::HAFAS', '>= 6.20';
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index c044281..40802f4 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -49,7 +49,8 @@ sub get_connecting_trains_p {
 		# cases. But not reliably. Probably best to leave it out entirely then.
 		return $promise->reject;
 	}
-	if ($user->{backend_efa}) {
+	if ( $user->{backend_efa} ) {
+
 		# TODO
 		return $promise->reject;
 	}
diff --git a/lib/Travelynx/Helper/EFA.pm b/lib/Travelynx/Helper/EFA.pm
index ba11764..5cae51b 100644
--- a/lib/Travelynx/Helper/EFA.pm
+++ b/lib/Travelynx/Helper/EFA.pm
@@ -55,12 +55,15 @@ sub get_journey_p {
 	my $agent   = $self->{user_agent};
 	my $stopseq;
 
-	if ( $opt{trip_id} =~ m{ ^ ([^@]*) @ ([^@]*) [(] ([^)]*) [)] (.*)  $ }x ) {
+	if ( $opt{trip_id}
+		=~ m{ ^ ([^@]*) @ ([^@]*) [(] ([^T]*) T ([^)]*) [)] (.*) $ }x )
+	{
 		$stopseq = {
 			stateless => $1,
 			stop_id   => $2,
 			date      => $3,
-			key       => $4
+			time      => $4,
+			key       => $5
 		};
 	}
 	else {
-- 
cgit v1.2.3