From 89e709d8d593939ab528b81d125fd37d303c4fa9 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 30 Sep 2020 19:12:29 +0200
Subject: Allow linking a Träwelling account, auto-sync Träwelling→travelynx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

travelynx→Träwelling is still work-in-progress

Squashed commit of the following:

commit 97faa6e2e6c8d20fba30f2d0f6e78187ceeb72e6
Author: Daniel Friesel <derf@finalrewind.org>
Date:   Wed Sep 30 18:50:05 2020 +0200

    improve traewelling log and tx handling

commit 487d7dd728b9d45b731bdc7098cf3358ea2e206e
Author: Daniel Friesel <derf@finalrewind.org>
Date:   Wed Sep 30 18:02:41 2020 +0200

    add missing traewelling template

commit 0148da2f48d9a52dcddc0ab81f83d8f8ac3062ab
Author: Daniel Friesel <derf@finalrewind.org>
Date:   Wed Sep 30 18:02:35 2020 +0200

    improve traewelling pull sync

commit 4861a9750f9f2d7621043361d0af6b0a8869a0df
Author: Daniel Friesel <derf@finalrewind.org>
Date:   Tue Sep 29 22:14:24 2020 +0200

    wip checkin from traewelling

commit f6aeb6f06998a2a7a80f63a7b1b688b1a26b66bd
Author: Daniel Friesel <derf@finalrewind.org>
Date:   Tue Sep 29 18:37:53 2020 +0200

    refactor traewelling integration. login and logout are less of a hack now.

    checkin and checkout are not supported at the moment.
---
 lib/Travelynx/Controller/Traveling.pm | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'lib/Travelynx/Controller/Traveling.pm')

diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index f5e3255..4df1558 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -424,8 +424,10 @@ sub log_action {
 
 	if ( $params->{action} eq 'checkin' ) {
 
-		my ( $train, $error )
-		  = $self->checkin( $params->{station}, $params->{train} );
+		my ( $train, $error ) = $self->checkin(
+			station  => $params->{station},
+			train_id => $params->{train}
+		);
 		my $destination = $params->{dest};
 
 		if ($error) {
@@ -447,8 +449,10 @@ sub log_action {
 		else {
 			# Silently ignore errors -- if they are permanent, the user will see
 			# them when selecting the destination manually.
-			my ( $still_checked_in, undef )
-			  = $self->checkout( $destination, 0 );
+			my ( $still_checked_in, undef ) = $self->checkout(
+				station => $destination,
+				force   => 0
+			);
 			my $station_link = '/s/' . $destination;
 			$self->render(
 				json => {
@@ -459,8 +463,10 @@ sub log_action {
 		}
 	}
 	elsif ( $params->{action} eq 'checkout' ) {
-		my ( $still_checked_in, $error )
-		  = $self->checkout( $params->{station}, $params->{force} );
+		my ( $still_checked_in, $error ) = $self->checkout(
+			station => $params->{station},
+			force   => $params->{force}
+		);
 		my $station_link = '/s/' . $params->{station};
 
 		if ($error) {
@@ -505,8 +511,10 @@ sub log_action {
 		}
 	}
 	elsif ( $params->{action} eq 'cancelled_from' ) {
-		my ( undef, $error )
-		  = $self->checkin( $params->{station}, $params->{train} );
+		my ( undef, $error ) = $self->checkin(
+			station  => $params->{station},
+			train_id => $params->{train}
+		);
 
 		if ($error) {
 			$self->render(
@@ -526,8 +534,10 @@ sub log_action {
 		}
 	}
 	elsif ( $params->{action} eq 'cancelled_to' ) {
-		my ( undef, $error )
-		  = $self->checkout( $params->{station}, 1 );
+		my ( undef, $error ) = $self->checkout(
+			station => $params->{station},
+			force   => 1
+		);
 
 		if ($error) {
 			$self->render(
-- 
cgit v1.2.3