2 files changed, 142 insertions, 6 deletions

diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm
index e264c89..1385389 100644
--- a/lib/Travelynx/Command/database.pm
+++ b/lib/Travelynx/Command/database.pm
@@ -10,6 +10,7 @@ use DateTime;
 use File::Slurp qw(read_file);
 use List::Util  qw();
 use JSON;
+use Travel::Status::DE::EFA;
 use Travel::Status::DE::HAFAS;
 use Travel::Status::DE::IRIS::Stations;
 use Travel::Status::MOTIS;
@@ -3023,6 +3024,19 @@ qq{select distinct checkout_station_id from in_transit where backend_id = 0;}
 			}
 		);
 	},
+
+	# v62 -> v63
+	# Add EFA backend support
+	sub {
+		my ($db) = @_;
+		$db->query(
+			qq{
+				alter table schema_version add column efa varchar(12);
+				update schema_version set version = 63;
+				update schema_version set efa = '0';
+			}
+		);
+	},
 );
 
 sub sync_stations {
@@ -3213,6 +3227,37 @@ sub sync_stations {
 	}
 }
 
+sub sync_backends_efa {
+	my ($db) = @_;
+	for my $service ( Travel::Status::DE::EFA::get_services() ) {
+		my $present = $db->select(
+			'backends',
+			'count(*) as count',
+			{
+				efa  => 1,
+				name => $service->{shortname}
+			}
+		)->hash->{count};
+		if ( not $present ) {
+			$db->insert(
+				'backends',
+				{
+					dbris => 0,
+					efa   => 1,
+					hafas => 0,
+					iris  => 0,
+					motis => 0,
+					name  => $service->{shortname},
+				},
+				{ on_conflict => undef }
+			);
+		}
+	}
+
+	$db->update( 'schema_version',
+		{ efa => $Travel::Status::DE::EFA::VERSION } );
+}
+
 sub sync_backends_hafas {
 	my ($db) = @_;
 	for my $service ( Travel::Status::DE::HAFAS::get_services() ) {
@@ -3228,10 +3273,11 @@ sub sync_backends_hafas {
 			$db->insert(
 				'backends',
 				{
-					iris  => 0,
-					hafas => 1,
-					efa   => 0,
 					dbris => 0,
+					efa   => 0,
+					hafas => 1,
+					iris  => 0,
+					motis => 0,
 					name  => $service->{shortname},
 				},
 				{ on_conflict => undef }
@@ -3258,10 +3304,10 @@ sub sync_backends_motis {
 			$db->insert(
 				'backends',
 				{
-					iris  => 0,
-					hafas => 0,
-					efa   => 0,
 					dbris => 0,
+					efa   => 0,
+					hafas => 0,
+					iris  => 0,
 					motis => 1,
 					name  => $service->{shortname},
 				},
@@ -3361,6 +3407,17 @@ sub migrate_db {
 		}
 	}
 
+	my $efa_version = get_schema_version( $db, 'efa' );
+	say "Found backend table for EFA v${efa_version}";
+	if ( $efa_version eq $Travel::Status::DE::EFA::VERSION ) {
+		say 'Backend table is up-to-date';
+	}
+	else {
+		say
+"Synchronizing with Travel::Status::DE::EFA $Travel::Status::DE::EFA::VERSION";
+		sync_backends_efa($db);
+	}
+
 	my $hafas_version = get_schema_version( $db, 'hafas' );
 	say "Found backend table for HAFAS v${hafas_version}";
 	if ( $hafas_version eq $Travel::Status::DE::HAFAS::VERSION ) {
diff --git a/lib/Travelynx/Command/work.pm b/lib/Travelynx/Command/work.pm
index 2b01cb2..5ea1810 100644
--- a/lib/Travelynx/Command/work.pm
+++ b/lib/Travelynx/Command/work.pm
@@ -185,6 +185,85 @@ sub run {
 			next;
 		}
 
+		if ( $entry->{is_efa} ) {
+			eval {
+				$self->app->efa->get_journey_p(
+					trip_id => $train_id,
+					service => $entry->{backend_name}
+				)->then(
+					sub {
+						my ($journey) = @_;
+
+						my $found_dep;
+						my $found_arr;
+						for my $stop ( $journey->route ) {
+							if ( $stop->id_num == $dep ) {
+								$found_dep = $stop;
+							}
+							if ( $arr and $stop->id_num == $arr ) {
+								$found_arr = $stop;
+								last;
+							}
+						}
+						if ( not $found_dep ) {
+							$self->app->log->debug(
+								"Did not find $dep within journey $train_id");
+							return;
+						}
+
+						if ( $found_dep->rt_dep ) {
+							$self->app->in_transit->update_departure_efa(
+								uid     => $uid,
+								journey => $journey,
+								stop    => $found_dep,
+								dep_eva => $dep,
+								arr_eva => $arr,
+								trip_id => $train_id,
+							);
+						}
+
+						if ( $found_arr and $found_arr->rt_arr ) {
+							$self->app->in_transit->update_arrival_efa(
+								uid     => $uid,
+								journey => $journey,
+								stop    => $found_arr,
+								dep_eva => $dep,
+								arr_eva => $arr,
+								trip_id => $train_id,
+							);
+						}
+					}
+				)->catch(
+					sub {
+						my ($err) = @_;
+						$backend_issues += 1;
+						$self->app->log->error(
+"work($uid) @ EFA $entry->{backend_name}: journey: $err"
+						);
+					}
+				)->wait;
+
+				if (    $arr
+					and $entry->{real_arr_ts}
+					and $now->epoch - $entry->{real_arr_ts} > 600 )
+				{
+					$self->app->checkout_p(
+						station => $arr,
+						force   => 2,
+						dep_eva => $dep,
+						arr_eva => $arr,
+						uid     => $uid
+					)->wait;
+				}
+			};
+			if ($@) {
+				$errors += 1;
+				$self->app->log->error(
+					"work($uid) @ EFA $entry->{backend_name}: $@");
+			}
+			next;
+		}
+
 		if ( $entry->{is_motis} ) {
 
 			eval {