From 6cbbc2b16f059a0d2b1f65a371e3c1e1f4c11fde Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Thu, 13 Feb 2020 18:35:42 +0100
Subject: avoid stale data when marking cancelled arrivals

---
 lib/Travelynx/Command/work.pm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'lib/Travelynx/Command/work.pm')

diff --git a/lib/Travelynx/Command/work.pm b/lib/Travelynx/Command/work.pm
index 9658ff6..04ea95b 100644
--- a/lib/Travelynx/Command/work.pm
+++ b/lib/Travelynx/Command/work.pm
@@ -136,9 +136,26 @@ sub run {
 				);
 				if ( $train->arrival_is_cancelled ) {
 
+					# depending on the amount of users in transit, some time may
+					# have passed between fetching $entry from the database and
+					# now. Ensure that the user is still checked into this train
+					# before calling checkout to mark the cancellation.
+					if (
+						$db->select(
+							'in_transit',
+							'count(*) as count',
+							{
+								user_id             => $uid,
+								train_no            => $train->train_no,
+								checkout_station_id => $arr
+							}
+						)->hash->{count}
+					  )
+					{
                   # check out (adds a cancelled journey and resets journey state
                   # to destination selection)
-					$self->app->checkout( $arr, 0, $uid );
+						$self->app->checkout( $arr, 0, $uid );
+					}
 				}
 				else {
 					$self->app->add_route_timestamps( $uid, $train, 0 );
-- 
cgit v1.2.3