Updated scheduled tasks

app/Http/Controllers/Api/UserApiController.php

@@ -13,7 +13,7 @@ class UserApiController extends ApiController
 {
     public function nextFlight(?User $user): JsonResponse
     {
-        $user = $user ?? auth()->user();
+        $user = $user?->exists ? $user : auth()->user();
 
         if (!$user->id) {
             return response()->json(['message' => 'User not found'], 404);
@@ -48,8 +48,8 @@ class UserApiController extends ApiController
             'arrivalTime'           => $arrival->format('H:i'),
             'arrivalDateUtc'      => $flight->arrival_date,
             'flightNumber'          => $flight->flight_number,
-            'airlineName'           => $flight->airline->name,
-            'aircraftType'          => $flight->aircraft->manufacturer_code . ' ' . $flight->aircraft->model_full_name,
+            'airlineName'           => $flight->airline?->name,
+            'aircraftType'          => $flight->aircraft?->manufacturer_code . ' ' . $flight->aircraft?->model_full_name,
             'logoUrl'               => $flight->airline?->logo_url ?? '',
         ]);
     }

app/Http/Controllers/FlightController.php

@@ -64,11 +64,14 @@ class FlightController extends Controller
     public function lookup(Request $request)
     {
         $number = strtoupper(trim($request->query('number', '')));
-
-        preg_match('/^([A-Z]{2,3})(\d+)/', $number, $matches);
+        preg_match(
+            '/^([A-Z]{3}|[A-Z]{2}|[A-Z]\d|\d[A-Z])(\d+)$/',
+            $number,
+            $matches
+        );
         $code         = $matches[1] ?? null;
         $flightNumber = $matches[2] ?? null;
-        $isIata       = strlen($code) === 2;
+        $isIata       = $code !== null && strlen($code) === 2;
         $codeColumn   = $isIata ? 'iata_code' : 'icao_code';
 
         $apiAirlineCodes = [];