🐛 Fix a few bugs (#3611)

Author: HerrLevin

app/DataProviders/Motis.php

@@ -258,6 +258,11 @@ private function fetchJourney(string $tripId): array|null {
             }
 
         } catch (Exception $exception) {
+            if (!empty($response) && str_contains(strtolower($response->body()), 'trip not found')) {
+                Log::debug('MOTIS Trip not found', ['tripId' => $tripId]);
+                return null;
+            }
+
             CacheKey::increment(HCK::TRIPS_FAILURE);
             Log::error('Unknown HAFAS Error (fetchJourney)', [
                 'status' => $response->status(),

app/DataProviders/Repositories/MotisLicenseRepository.php

@@ -14,7 +14,7 @@ public function getLicense(string $gtfsSource, DataProvider $source): ?MotisSour
         $name    = $matches['name'] ?? '';
         $country = $matches['country'] ?? '';
         if (empty($name) || empty($country)) {
-            Log::error('no matching license format found in ' . $gtfsSource);
+            Log::warning('no matching license format found in ' . $gtfsSource);
             return null;
         }
 

app/Http/Controllers/API/v1/TripController.php

@@ -31,7 +31,6 @@ public function createTrip(ManualTripCreationRequest $request): TripResource|Jso
             $creator = new ManualTripCreator();
             $creator->setCategory(HafasTravelType::from($validated['category']))
                     ->setLine($validated['lineName'], $validated['journeyNumber'])
-                    ->setOperator(HafasOperator::find($validated['operatorId']))
                     ->setOrigin(
                         Station::findOrFail($validated['originId']),
                         Carbon::parse($validated['originDeparturePlanned']),
@@ -43,6 +42,11 @@ public function createTrip(ManualTripCreationRequest $request): TripResource|Jso
                         isset($validated['destinationArrivalReal']) ? Carbon::parse($validated['destinationArrivalReal']) : null
                     );
 
+            if (isset($validated['operatorId'])) {
+                $operator = HafasOperator::findOrFail($validated['operatorId']);
+                $creator->setOperator($operator);
+            }
+
             foreach ($validated['stopovers'] ?? [] as $stopover) {
                 $creator->addStopover(
                     Station::findOrFail($stopover['stationId']),

app/Http/Controllers/API/v1/WebhookController.php

@@ -3,13 +3,10 @@
 namespace App\Http\Controllers\API\v1;
 
 use App\Http\Controllers\API\v1\Controller as APIController;
-use App\Http\Controllers\Backend\WebhookController as WebhookBackend;
 use App\Http\Resources\WebhookResource;
 use App\Models\Webhook;
 use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
 class WebhookController extends Controller
@@ -135,7 +132,7 @@ private function getWebhookForUserAndCurrentClient(int $webhookId): ?Webhook {
 
         $query = Webhook::where('user_id', auth()->id());
         if ($currentClient !== null) { // null = Traewelling itself or personal access token
-            $query->where('client_id', $currentClient->id);
+            $query->where('oauth_client_id', $currentClient->id);
         }
 
         return $query->where('id', '=', $webhookId)->first();

app/Http/Controllers/Backend/Support/LocationController.php

@@ -231,8 +231,8 @@ private function createPolylineFromStopovers(): FeatureCollection {
                 $coordinate = new Coordinate($stopover->station->latitude, $stopover->station->longitude);
                 $feature    = Feature::fromCoordinate($coordinate);
                 $feature->setStationId($stopover->station->id);
-                $feature->setDeparturePlanned($stopover->departure_planned->toIso8601ZuluString());
-                $feature->setArrivalPlanned($stopover->arrival_planned->toIso8601ZuluString());
+                $feature->setDeparturePlanned($stopover->departure_planned?->toIso8601ZuluString());
+                $feature->setArrivalPlanned($stopover->arrival_planned?->toIso8601ZuluString());
                 $coordinates[] = $feature;
 
 

app/Http/Controllers/Backend/Transport/ManualTripCreator.php

@@ -23,7 +23,7 @@ class ManualTripCreator extends Controller
     private HafasTravelType $category;
     private string          $lineName;
     private ?int            $journeyNumber;
-    private ?HafasOperator  $operator;
+    private ?HafasOperator  $operator  = null;
     private Station         $origin;
     private Carbon          $originDeparturePlanned;
     private ?Carbon         $originDepartureReal;

app/Http/Controllers/SitemapController.php

@@ -66,7 +66,7 @@ private function addEvents(Sitemap $sitemap): void {
 
         $eventIdsWithCheckins = Status::whereNotNull('event_id')->select('event_id');
         $events               = Event::whereIn('id', $eventIdsWithCheckins)
-                                     ->orWhere('end', '>=', DB::raw('CURRENT_TIMESTAMP'))
+                                     ->orWhere('event_end', '>=', DB::raw('CURRENT_TIMESTAMP'))
                                      ->get();
 
         foreach ($events as $event) {

lang/de.json

@@ -618,6 +618,7 @@
   "stats.stations.description": "Karte deiner durchfahrenen Stationen",
   "stats.stations.passed": "Durchgefahrene Station",
   "stats.stations.changed": "Einstieg / Ausstieg / Umstieg",
+  "stats.daily": "Tägliche Fahrten",
   "stats.daily.description": "Tagebuch deiner Fahrten inkl. Karte",
   "warning.insecure-performance": "Die Ladezeit dieser Seite ist ggfs. bei vielen Daten sehr langsam.",
   "year-review": "Jahresrückblick",

lang/en.json

@@ -621,6 +621,7 @@
   "stats.stations.description": "Map of your passed stations",
   "stats.stations.passed": "Passed station",
   "stats.stations.changed": "Entry / Exit / Change",
+  "stats.daily": "Daily statistics",
   "stats.daily.description": "Diary of your journeys incl. map",
   "warning.insecure-performance": "The loading time of this page may be very slow if there is a lot of data.",
   "year-review": "Year in review",