From 07e0f8970681422a48fec9da5d14ad2a2b3735bd Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 1 Oct 2020 19:36:35 +0200 Subject: allow checking into traewelling --- lib/Travelynx/Helper/Traewelling.pm | 116 +++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 55 deletions(-) (limited to 'lib/Travelynx/Helper/Traewelling.pm') diff --git a/lib/Travelynx/Helper/Traewelling.pm b/lib/Travelynx/Helper/Traewelling.pm index 3c7bec2..d2ffadc 100644 --- a/lib/Travelynx/Helper/Traewelling.pm +++ b/lib/Travelynx/Helper/Traewelling.pm @@ -267,66 +267,72 @@ sub logout_p { } sub checkin { - my ( $self, $uid ) = @_; - if ( my $token = $self->get_traewelling_push_token($uid) ) { - my $user = $self->get_user_status; - -# TODO delete previous traewelling status if the train's destination has been changed -# TODO delete traewelling status when undoing a travelynx checkin - if ( $user->{checked_in} and $user->{extra_data}{trip_id} ) { - my $traewelling = $self->{model}->get($uid); - if ( $traewelling->{data}{trip_id} eq $user->{extra_data}{trip_id} ) - { + my ( $self, %opt ) = @_; + + my $header = { + 'User-Agent' => $self->{header}{'User-Agent'}, + 'Authorization' => "Bearer $opt{token}", + }; + + my $request = { + tripID => $opt{trip_id}, + start => q{} . $opt{dep_eva}, + destination => q{} . $opt{arr_eva}, + }; + my $trip_req = sprintf( + "tripID=%s&lineName=%s%%20%s&start=%s", + $opt{trip_id}, $opt{train_type}, $opt{train_line} // $opt{train_no}, + $opt{dep_eva} + ); + + $self->{user_agent}->request_timeout(20) + ->get_p( + "https://traewelling.de/api/v0/trains/trip?$trip_req" => $header ) + ->then( + sub { + return $self->{user_agent}->request_timeout(20) + ->post_p( "https://traewelling.de/api/v0/trains/checkin" => + $header => json => $request ); + } + )->then( + sub { + my ($tx) = @_; + if ( my $err = $tx->error ) { + my $err_msg = "HTTP $err->{code} $err->{message}"; + $self->{log}->debug("... error: $err_msg"); + $self->{model}->log( + uid => $opt{uid}, + message => + "Fehler bei $opt{train_type} $opt{train_no}: $err_msg", + is_error => 1 + ); return; } - my $header = { - 'User-Agent' => 'travelynx/' . $self->{version}, - 'Authorization' => "Bearer $token", - }; - - my $request = { - tripID => $user->{extra_data}{trip_id}, - start => q{} . $user->{dep_eva}, - destination => q{} . $user->{arr_eva}, - }; - my $trip_req = sprintf( - "tripID=%s&lineName=%s%%20%s&start=%s", - $user->{extra_data}{trip_id}, $user->{train_type}, - $user->{train_line} // $user->{train_no}, $user->{dep_eva} + $self->{log}->debug("... success!"); + $self->{model}->log( + uid => $opt{uid}, + message => "Eingecheckt in $opt{train_type} $opt{train_no}", + status_id => $tx->res->json->{statusId} + ); + $self->{model}->set_latest_push_ts( + uid => $opt{uid}, + ts => $opt{checkin_ts} ); - $self->{user_agent}->request_timeout(20) - ->get_p( - "https://traewelling.de/api/v0/trains/trip?$trip_req" => - $header )->then( - sub { - return $self->{user_agent}->request_timeout(20) - ->post_p( - "https://traewelling.de/api/v0/trains/checkin" => - $header => json => $request ); - } - )->then( - sub { - my ($tx) = @_; - if ( my $err = $tx->error ) { - my $err_msg = "HTTP $err->{code} $err->{message}"; - $self->mark_trwl_checkin_error( $uid, $user, $err_msg ); - } - else { - # TODO check for traewelling error ("error" key in response) - # TODO store ID of resulting status (request /user/{name} and store status ID) - $self->mark_trwl_checkin_success( $uid, $user ); - # mark success: checked into (trip_id, start, destination) - } - } - )->catch( - sub { - my ($err) = @_; - $self->mark_trwl_checkin_error( $uid, $user, $err ); - } - )->wait; + # TODO store status_id in in_transit object so that it can be shown + # on the user status page } - } + )->catch( + sub { + my ($err) = @_; + $self->{log}->debug("... error: $err"); + $self->{model}->log( + uid => $opt{uid}, + message => "Fehler bei $opt{train_type} $opt{train_no}: $err", + is_error => 1 + ); + } + )->wait; } 1; -- cgit v1.2.3