@fleetbase/fleetops-engine 0.6.58 → 0.6.59

package/server/src/Console/Commands/ReplayVehicleLocations.php

@@ -44,7 +44,7 @@ class ReplayVehicleLocations extends Command
         $sleep           = $this->option('sleep') ? (int) $this->option('sleep') : null;
 
         // Validate file exists
-        if (!file_exists($filePath)) {
+        if (!$this->fileExists($filePath)) {
             $this->error("File not found: {$filePath}");
 
             return Command::FAILURE;
@@ -69,32 +69,22 @@ class ReplayVehicleLocations extends Command
             $this->warn('Sleep delays disabled - sending all events immediately');
         }
 
-        // Load and parse JSON data
         $this->info('Loading location data...');
-        $jsonContent    = file_get_contents($filePath);
-        $locationEvents = json_decode($jsonContent, true);
-
-        if (json_last_error() !== JSON_ERROR_NONE) {
-            $this->error('Failed to parse JSON: ' . json_last_error_msg());
+        [$locationEvents, $parseError] = $this->loadLocationEventsFromFile($filePath);
+        if ($parseError) {
+            $this->error($parseError);
 
             return Command::FAILURE;
         }
 
-        if (!is_array($locationEvents) || empty($locationEvents)) {
+        if (empty($locationEvents)) {
             $this->error('Invalid or empty location data');
 
             return Command::FAILURE;
         }
 
-        // Filter by vehicle if specified
-        if ($vehicleFilter) {
-            $locationEvents = array_filter($locationEvents, function ($event) use ($vehicleFilter) {
-                return isset($event['data']['id']) && $event['data']['id'] === $vehicleFilter;
-            });
-            $locationEvents = array_values($locationEvents); // Re-index array
-        }
-
-        $totalEvents = count($locationEvents);
+        $locationEvents = $this->filterEventsForVehicle($locationEvents, $vehicleFilter);
+        $totalEvents    = count($locationEvents);
 
         if ($totalEvents === 0) {
             $this->warn('No events found matching the criteria');
@@ -102,22 +92,19 @@ class ReplayVehicleLocations extends Command
             return Command::SUCCESS;
         }
 
-        // Apply limit if specified
-        if ($limit && $limit < $totalEvents) {
-            $locationEvents = array_slice($locationEvents, 0, $limit);
-            $totalEvents    = $limit;
-        }
+        $locationEvents = $this->applyEventLimit($locationEvents, $limit);
+        $totalEvents    = count($locationEvents);
 
         $this->info("Total events to process: {$totalEvents}");
         $this->newLine();
 
         // Initialize SocketCluster client
-        $socketClusterClient = new SocketClusterService();
+        $socketClusterClient = $this->socketClusterClient();
 
         // Statistics tracking
         $successCount      = 0;
         $errorCount        = 0;
-        $startTime         = microtime(true);
+        $startTime         = $this->currentMicrotime();
         $previousTimestamp = null;
 
         // Process each location event
@@ -128,7 +115,7 @@ class ReplayVehicleLocations extends Command
             $createdAt   = $event['created_at'] ?? null;
 
             // Get vehicle record
-            $vehicle = Vehicle::where('public_id', $vehicleId)->first();
+            $vehicle = $this->vehicleForPublicId($vehicleId);
             if (!$vehicle) {
                 continue;
             }
@@ -136,24 +123,19 @@ class ReplayVehicleLocations extends Command
             // Calculate sleep duration based on timestamp difference
             if (!$skipSleep && $previousTimestamp !== null && $createdAt !== null) {
                 try {
-                    $currentTime   = Carbon::parse($createdAt);
-                    $previousTime  = Carbon::parse($previousTimestamp);
-                    $diffInSeconds = $currentTime->diffInSeconds($previousTime);
-
-                    // Apply speed multiplier
-                    $sleepDuration = $diffInSeconds / $speedMultiplier;
+                    [$diffInSeconds, $sleepDuration] = $this->calculateReplayDelay($previousTimestamp, $createdAt, $speedMultiplier);
 
                     if ($sleep) {
                         $this->info("[{$eventNumber}/{$totalEvents}] Waiting {$sleep}s (real: {$diffInSeconds}s)...");
-                        sleep((int) $sleep);
+                        $this->sleepSeconds((int) $sleep);
                     } elseif ($sleepDuration > 0) {
                         $this->info("[{$eventNumber}/{$totalEvents}] Waiting {$sleepDuration}s (real: {$diffInSeconds}s)...");
-                        sleep((int) $sleepDuration);
+                        $this->sleepSeconds((int) $sleepDuration);
 
                         // Handle fractional seconds
                         $fractional = $sleepDuration - floor($sleepDuration);
                         if ($fractional > 0) {
-                            usleep((int) ($fractional * 1000000));
+                            $this->sleepMicroseconds((int) ($fractional * 1000000));
                         }
                     }
                 } catch (\Exception $e) {
@@ -164,37 +146,22 @@ class ReplayVehicleLocations extends Command
             // Update previous timestamp
             $previousTimestamp = $createdAt;
 
-            // Prepare channel names
-            $channels = ["vehicle.{$vehicleId}", "vehicle.{$vehicle->uuid}"];
+            $channels = $this->channelsForVehicle($vehicleId, $vehicle);
 
             foreach ($channels as $channel) {
                 // Send event via SocketCluster
                 try {
                     $sent = $socketClusterClient->send($channel, $event);
 
-                    $location = $event['data']['location']['coordinates'] ?? ['N/A', 'N/A'];
-                    $speed    = $event['data']['speed'] ?? 'N/A';
-                    $heading  = $event['data']['heading'] ?? 'N/A';
-
-                    $this->line(sprintf(
-                        "[{$eventNumber}/{$totalEvents}] ✓ Sent event %s for vehicle %s | Channel: %s | Coords: [%.6f, %.6f] | Speed: %s | Heading: %s | Time: %s",
-                        $eventId,
-                        $vehicleId,
-                        $channel,
-                        $location[0],
-                        $location[1],
-                        $speed,
-                        $heading,
-                        $createdAt ?? 'N/A'
-                    ));
+                    $this->line($this->formatSentLine($eventNumber, $totalEvents, $eventId, $vehicleId, $channel, $event, $createdAt));
 
                     $successCount++;
-                } catch (\WebSocket\ConnectionException $e) {
-                    $this->error("[{$eventNumber}/{$totalEvents}] ✗ Connection error for event {$eventId}: {$e->getMessage()}");
-                    $errorCount++;
                 } catch (\WebSocket\TimeoutException $e) {
                     $this->error("[{$eventNumber}/{$totalEvents}] ✗ Timeout error for event {$eventId}: {$e->getMessage()}");
                     $errorCount++;
+                } catch (\WebSocket\ConnectionException $e) {
+                    $this->error("[{$eventNumber}/{$totalEvents}] ✗ Connection error for event {$eventId}: {$e->getMessage()}");
+                    $errorCount++;
                 } catch (\Throwable $e) {
                     $this->error("[{$eventNumber}/{$totalEvents}] ✗ Error for event {$eventId}: {$e->getMessage()}");
                     $errorCount++;
@@ -203,7 +170,7 @@ class ReplayVehicleLocations extends Command
         }
 
         // Summary
-        $endTime  = microtime(true);
+        $endTime  = $this->currentMicrotime();
         $duration = round($endTime - $startTime, 2);
 
         $this->newLine();
@@ -222,4 +189,102 @@ class ReplayVehicleLocations extends Command
 
         return $errorCount > 0 ? Command::FAILURE : Command::SUCCESS;
     }
+
+    protected function loadLocationEventsFromFile(string $filePath): array
+    {
+        $locationEvents = json_decode(file_get_contents($filePath), true);
+
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return [[], 'Failed to parse JSON: ' . json_last_error_msg()];
+        }
+
+        if (!is_array($locationEvents)) {
+            return [[], null];
+        }
+
+        return [$locationEvents, null];
+    }
+
+    protected function fileExists(string $filePath): bool
+    {
+        return file_exists($filePath);
+    }
+
+    protected function socketClusterClient(): mixed
+    {
+        return new SocketClusterService();
+    }
+
+    protected function vehicleForPublicId(string $vehicleId): ?Vehicle
+    {
+        return Vehicle::where('public_id', $vehicleId)->first();
+    }
+
+    protected function sleepSeconds(int $seconds): void
+    {
+        sleep($seconds);
+    }
+
+    protected function sleepMicroseconds(int $microseconds): void
+    {
+        usleep($microseconds);
+    }
+
+    protected function currentMicrotime(): float
+    {
+        return microtime(true);
+    }
+
+    protected function filterEventsForVehicle(array $locationEvents, ?string $vehicleFilter): array
+    {
+        if (!$vehicleFilter) {
+            return array_values($locationEvents);
+        }
+
+        return array_values(array_filter($locationEvents, function ($event) use ($vehicleFilter) {
+            return isset($event['data']['id']) && $event['data']['id'] === $vehicleFilter;
+        }));
+    }
+
+    protected function applyEventLimit(array $locationEvents, ?int $limit): array
+    {
+        if ($limit && $limit < count($locationEvents)) {
+            return array_slice($locationEvents, 0, $limit);
+        }
+
+        return $locationEvents;
+    }
+
+    protected function calculateReplayDelay(string $previousTimestamp, string $createdAt, float $speedMultiplier): array
+    {
+        $currentTime   = Carbon::parse($createdAt);
+        $previousTime  = Carbon::parse($previousTimestamp);
+        $diffInSeconds = $currentTime->diffInSeconds($previousTime);
+
+        return [$diffInSeconds, $diffInSeconds / $speedMultiplier];
+    }
+
+    protected function channelsForVehicle(string $vehicleId, Vehicle $vehicle): array
+    {
+        return ["vehicle.{$vehicleId}", "vehicle.{$vehicle->uuid}"];
+    }
+
+    protected function formatSentLine(int $eventNumber, int $totalEvents, string $eventId, string $vehicleId, string $channel, array $event, ?string $createdAt): string
+    {
+        $location = $event['data']['location']['coordinates'] ?? ['N/A', 'N/A'];
+        $speed    = $event['data']['speed'] ?? 'N/A';
+        $heading  = $event['data']['heading'] ?? 'N/A';
+
+        return sprintf(
+            "[{$eventNumber}/{$totalEvents}] ✓ Sent event %s for vehicle %s | Channel: %s | Coords: [%.6f, %.6f] | Speed: %s | Heading: %s | Time: %s",
+            $eventId,
+            $vehicleId,
+            $channel,
+            $location[0],
+            $location[1],
+            $speed,
+            $heading,
+            $createdAt ?? 'N/A'
+        );
+    }
 }

package/server/src/Console/Commands/SendDriverNotification.php

@@ -51,7 +51,7 @@ class SendDriverNotification extends Command
         }
 
         // Attempt to find the order
-        $order = Order::where('public_id', $orderId)->first();
+        $order = $this->findOrder($orderId);
         if (!$order) {
             $this->error('Order not found!');
 
@@ -88,11 +88,11 @@ class SendDriverNotification extends Command
             // Handle order ping notification which requires distance of pickup point from driver
             if ($event === 'ping') {
                 $destination = $order->payload->getPickupOrFirstWaypoint();
-                $matrix      = Utils::calculateDrivingDistanceAndTime($order->driverAssigned->location, $destination);
-                $order->driverAssigned->notify(new $notificationClass($order, $matrix->distance));
+                $matrix      = $this->calculateDrivingDistanceAndTime($order->driverAssigned->location, $destination);
+                $this->notifyDriver($order->driverAssigned, $notificationClass, $order, $matrix->distance);
             } else {
                 // Trigger notification
-                $order->driverAssigned->notify(new $notificationClass($order));
+                $this->notifyDriver($order->driverAssigned, $notificationClass, $order);
             }
         } catch (\Exception $e) {
             $this->error($e->getMessage());
@@ -104,4 +104,25 @@ class SendDriverNotification extends Command
 
         return 0;
     }
+
+    protected function findOrder(string $orderId): ?Order
+    {
+        return Order::where('public_id', $orderId)->first();
+    }
+
+    protected function calculateDrivingDistanceAndTime(mixed $origin, mixed $destination): object
+    {
+        return Utils::calculateDrivingDistanceAndTime($origin, $destination);
+    }
+
+    protected function notifyDriver($driver, string $notificationClass, Order $order, mixed $distance = null): void
+    {
+        if ($distance !== null) {
+            $driver->notify(new $notificationClass($order, $distance));
+
+            return;
+        }
+
+        $driver->notify(new $notificationClass($order));
+    }
 }

package/server/src/Console/Commands/SendMaintenanceReminders.php

@@ -6,6 +6,7 @@ use Fleetbase\FleetOps\Mail\MaintenanceScheduleReminder;
 use Fleetbase\FleetOps\Models\MaintenanceSchedule;
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Mail;
 
@@ -54,15 +55,7 @@ class SendMaintenanceReminders extends Command
         //   - a non-null next_due_date (reminders are date-based only)
         //   - a non-null reminder_offsets JSON array
         //   - a default_assignee configured
-        $schedules = MaintenanceSchedule::on($conn)
-            ->withoutGlobalScopes()
-            ->where('status', 'active')
-            ->whereNotNull('next_due_date')
-            ->whereNotNull('reminder_offsets')
-            ->whereNotNull('default_assignee_uuid')
-            ->whereNull('deleted_at')
-            ->with(['subject', 'defaultAssignee'])
-            ->get();
+        $schedules = $this->schedules($conn);
 
         foreach ($schedules as $schedule) {
             $offsets     = $schedule->reminder_offsets;
@@ -95,12 +88,7 @@ class SendMaintenanceReminders extends Command
                 }
 
                 // Check whether we already sent this reminder for this cycle
-                $alreadySent = DB::connection($conn)
-                    ->table('maintenance_schedule_reminders')
-                    ->where('schedule_uuid', $schedule->uuid)
-                    ->where('offset_days', $offsetDays)
-                    ->where('due_date_snapshot', $dueDateSnapshot)
-                    ->exists();
+                $alreadySent = $this->reminderAlreadySent($conn, $schedule, $offsetDays, $dueDateSnapshot);
 
                 if ($alreadySent) {
                     continue;
@@ -109,14 +97,8 @@ class SendMaintenanceReminders extends Command
                 $this->line("Sending reminder: schedule {$schedule->public_id} ({$schedule->name}) — {$offsetDays} days before {$dueDateSnapshot} → {$email}");
 
                 if (!$dryRun) {
-                    Mail::to($email)->send(new MaintenanceScheduleReminder($schedule, $offsetDays));
-
-                    DB::connection($conn)->table('maintenance_schedule_reminders')->insert([
-                        'schedule_uuid'     => $schedule->uuid,
-                        'offset_days'       => $offsetDays,
-                        'due_date_snapshot' => $dueDateSnapshot,
-                        'sent_at'           => Carbon::now(),
-                    ]);
+                    $this->sendReminder($email, $schedule, $offsetDays);
+                    $this->recordReminder($conn, $schedule, $offsetDays, $dueDateSnapshot);
                 }
 
                 $sent++;
@@ -125,4 +107,42 @@ class SendMaintenanceReminders extends Command
 
         $this->info("Sent {$sent} reminder(s)" . ($dryRun ? ' (dry run — no emails sent)' : '.'));
     }
+
+    protected function schedules(string $conn): Collection
+    {
+        return MaintenanceSchedule::on($conn)
+            ->withoutGlobalScopes()
+            ->where('status', 'active')
+            ->whereNotNull('next_due_date')
+            ->whereNotNull('reminder_offsets')
+            ->whereNotNull('default_assignee_uuid')
+            ->whereNull('deleted_at')
+            ->with(['subject', 'defaultAssignee'])
+            ->get();
+    }
+
+    protected function reminderAlreadySent(string $conn, MaintenanceSchedule $schedule, int $offsetDays, string $dueDateSnapshot): bool
+    {
+        return DB::connection($conn)
+            ->table('maintenance_schedule_reminders')
+            ->where('schedule_uuid', $schedule->uuid)
+            ->where('offset_days', $offsetDays)
+            ->where('due_date_snapshot', $dueDateSnapshot)
+            ->exists();
+    }
+
+    protected function sendReminder(string $email, MaintenanceSchedule $schedule, int $offsetDays): void
+    {
+        Mail::to($email)->send(new MaintenanceScheduleReminder($schedule, $offsetDays));
+    }
+
+    protected function recordReminder(string $conn, MaintenanceSchedule $schedule, int $offsetDays, string $dueDateSnapshot): void
+    {
+        DB::connection($conn)->table('maintenance_schedule_reminders')->insert([
+            'schedule_uuid'     => $schedule->uuid,
+            'offset_days'       => $offsetDays,
+            'due_date_snapshot' => $dueDateSnapshot,
+            'sent_at'           => Carbon::now(),
+        ]);
+    }
 }

package/server/src/Console/Commands/SimulateOrderRouteNavigation.php

@@ -36,7 +36,7 @@ class SimulateOrderRouteNavigation extends Command
         ini_set('max_execution_time', 0);
 
         $orderId = $this->argument('order');
-        $order   = Order::where('public_id', $orderId)->orWhere('uuid', $orderId)->first();
+        $order   = $this->findOrder($orderId);
         $driver  = null;
         if (!$order) {
             return $this->error('Order not found to simulate driving for.');
@@ -45,7 +45,7 @@ class SimulateOrderRouteNavigation extends Command
         // If driver provided
         $driverId = $this->argument('driver');
         if ($driverId) {
-            $driver = Driver::where('public_id', $driverId)->orWhere('uuid', $driverId)->first();
+            $driver = $this->findDriver($driverId);
             if (!$driver) {
                 $this->error('The driver specified was not found, defaulting to driver assigned to order.');
             }
@@ -75,7 +75,7 @@ class SimulateOrderRouteNavigation extends Command
         $this->info('Found route starting point: ' . (string) $start . ' and route ending point: ' . (string) $end);
 
         // Send points to OSRM
-        $route = OSRM::getRoute($start, $end);
+        $route = $this->getRoute($start, $end);
         $this->info('Requesting route from OSRM.');
 
         // Create simulation events
@@ -85,7 +85,7 @@ class SimulateOrderRouteNavigation extends Command
             $this->info('Received route geometry from OSRM.');
 
             // Decode the waypoints if needed
-            $waypoints = OSRM::decodePolyline($routeGeometry);
+            $waypoints = $this->decodePolyline($routeGeometry);
             $this->info('Decoded OSRM route geometry.');
 
             // Loop through waypoints to calculate the heading for each point
@@ -107,8 +107,8 @@ class SimulateOrderRouteNavigation extends Command
                 }
 
                 $this->info('Simulating driver reaching waypoint #' . ($index + 1) . ' at ' . (string) $waypoint);
-                event(new DriverSimulatedLocationChanged($driver, $waypoint, $additionalData));
-                sleep(3);
+                $this->dispatchLocationChanged($driver, $waypoint, $additionalData);
+                $this->pauseBetweenWaypoints();
             }
         }
 
@@ -128,4 +128,34 @@ class SimulateOrderRouteNavigation extends Command
             'order' => 'Which order ID should be used to simulate driving the route for?',
         ];
     }
+
+    protected function findOrder(string $orderId): ?Order
+    {
+        return Order::where('public_id', $orderId)->orWhere('uuid', $orderId)->first();
+    }
+
+    protected function findDriver(string $driverId): ?Driver
+    {
+        return Driver::where('public_id', $driverId)->orWhere('uuid', $driverId)->first();
+    }
+
+    protected function getRoute(mixed $start, mixed $end): array
+    {
+        return OSRM::getRoute($start, $end);
+    }
+
+    protected function decodePolyline(string $routeGeometry): array
+    {
+        return OSRM::decodePolyline($routeGeometry);
+    }
+
+    protected function dispatchLocationChanged(Driver $driver, mixed $waypoint, array $additionalData): void
+    {
+        event(new DriverSimulatedLocationChanged($driver, $waypoint, $additionalData));
+    }
+
+    protected function pauseBetweenWaypoints(): void
+    {
+        sleep(3);
+    }
 }

package/server/src/Console/Commands/TrackOrderDistanceAndTime.php

@@ -69,7 +69,7 @@ class TrackOrderDistanceAndTime extends Command
             }
 
             $this->alert('Found ' . number_format($total) . ' orders to update. Current Time: ' . Carbon::now()->toDateTimeString());
-            $bar = $this->output->createProgressBar($total);
+            $bar = $this->createProgressBar($total);
             $bar->start();
 
             $updated = 0;
@@ -136,4 +136,9 @@ class TrackOrderDistanceAndTime extends Command
             ->where('created_at', '>=', $cutoff)
             ->whereHas('payload');
     }
+
+    protected function createProgressBar(int $total)
+    {
+        return $this->output->createProgressBar($total);
+    }
 }

package/server/src/Events/DriverLocationChanged.php

@@ -6,7 +6,7 @@ use Fleetbase\FleetOps\Models\Driver;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/DriverSimulatedLocationChanged.php

@@ -7,7 +7,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/EntityActivityChanged.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Order;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/EntityCompleted.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Order;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/EntityDriverAssigned.php

@@ -5,7 +5,7 @@ namespace Fleetbase\FleetOps\Events;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class EntityDriverAssigned implements ShouldBroadcast

package/server/src/Events/FuelProviderTransactionImported.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionImported

package/server/src/Events/FuelProviderTransactionMatched.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionMatched

package/server/src/Events/FuelProviderTransactionUnmatched.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionUnmatched

package/server/src/Events/FuelReportCreatedFromProvider.php

@@ -4,7 +4,7 @@ namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
 use Fleetbase\FleetOps\Models\FuelReport;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelReportCreatedFromProvider

package/server/src/Events/GeofenceDwelled.php

@@ -7,7 +7,7 @@ use Fleetbase\FleetOps\Models\Vehicle;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

package/server/src/Events/GeofenceEntered.php

@@ -8,7 +8,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

package/server/src/Events/GeofenceExited.php

@@ -8,7 +8,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

package/server/src/Events/VehicleLocationChanged.php

@@ -6,7 +6,7 @@ use Fleetbase\FleetOps\Models\Vehicle;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/WaypointActivityChanged.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Waypoint;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/WaypointCompleted.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Waypoint;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;