1 files changed, 43 insertions, 11 deletions

diff --git a/lib/DBInfoscreen/Helper/Wagonorder.pm b/lib/DBInfoscreen/Helper/Wagonorder.pm
index 5cdee40..9981244 100644
--- a/lib/DBInfoscreen/Helper/Wagonorder.pm
+++ b/lib/DBInfoscreen/Helper/Wagonorder.pm
@@ -8,6 +8,7 @@ use strict;
 use warnings;
 use 5.020;
 
+use DateTime;
 use Mojo::Promise;
 
 sub new {
@@ -25,21 +26,50 @@ sub new {
 }
 
 sub get_p {
-	my ( $self, $train_no, $api_ts ) = @_;
+	my ( $self, %opt ) = @_;
 
-	my $url
-	  = "https://ist-wr.noncd.db.de/wagenreihung/1.0/${train_no}/${api_ts}";
+	my %param;
 
-	my $cache = $self->{realtime_cache};
+	if ( $opt{param} ) {
+		%param = %{ $opt{param} };
+		delete $param{e};
+	}
+	else {
+		my $datetime = $opt{datetime}->clone->set_time_zone('UTC');
+		%param = (
+			administrationId => 80,
+			category         => $opt{train_type},
+			date             => $datetime->strftime('%Y-%m-%d'),
+			evaNumber        => $opt{eva},
+			number           => $opt{train_number},
+			time             => $datetime->rfc3339 =~ s{(?=Z)}{.000}r
+		);
+	}
+
+	my $url = sprintf( '%s?%s',
+'https://www.bahn.de/web/api/reisebegleitung/wagenreihung/vehicle-sequence',
+		join( '&', map { $_ . '=' . $param{$_} } sort keys %param ) );
 
 	my $promise = Mojo::Promise->new;
 
-	if ( my $content = $cache->thaw($url) ) {
+	if ( my $content = $self->{main_cache}->thaw($url) ) {
 		$self->{log}->debug("wagonorder->get_p($url): cached");
 		if ( $content->{error} ) {
-			return $promise->reject($content);
+			return $promise->reject(
+"GET $url: HTTP $content->{error}{code} $content->{error}{message} (cachd)"
+			);
 		}
-		return $promise->resolve($content);
+		return $promise->resolve( $content, \%param );
+	}
+
+	if ( my $content = $self->{realtime_cache}->thaw($url) ) {
+		$self->{log}->debug("wagonorder->get_p($url): cached");
+		if ( $content->{error} ) {
+			return $promise->reject(
+"GET $url: HTTP $content->{error}{code} $content->{error}{message} (cachd)"
+			);
+		}
+		return $promise->resolve( $content, \%param );
 	}
 
 	$self->{user_agent}->request_timeout(10)->get_p( $url => $self->{header} )
@@ -57,16 +87,18 @@ sub get_p {
 				$self->{log}->debug(
 					"wagonorder->get_p($url): HTTP $err->{code} $err->{message}"
 				);
-				$cache->freeze( $url, $json );
-				$promise->reject($json);
+				$self->{realtime_cache}->freeze( $url, $json );
+				$promise->reject("GET $url: HTTP $err->{code} $err->{message}");
 				return;
 			}
 
 			$self->{log}->debug("wagonorder->get_p($url): OK");
 			my $json = $tx->res->json;
+			$json->{ts} = DateTime->now( time_zone => 'Europe/Berlin' )
+			  ->strftime('%d.%m.%Y %H:%M');
 
-			$cache->freeze( $url, $json );
-			$promise->resolve($json);
+			$self->{main_cache}->freeze( $url, $json );
+			$promise->resolve( $json, \%param );
 			return;
 		}
 	)->catch(