@fleetbase/fleetops-engine 0.6.53 → 0.6.55

package/server/src/Jobs/FinalizeInternalOrderCreation.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Fleetbase\FleetOps\Jobs;
+
+use Fleetbase\FleetOps\Events\OrderReady;
+use Fleetbase\FleetOps\Models\Order;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FinalizeInternalOrderCreation implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public function __construct(public string $orderUuid)
+    {
+    }
+
+    public function handle(): void
+    {
+        $order = Order::where('uuid', $this->orderUuid)->first();
+        if (!$order) {
+            return;
+        }
+
+        $order->notifyDriverAssigned();
+
+        event(new OrderReady($order));
+    }
+}

package/server/src/Jobs/NotifyBulkAssignedDriver.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Fleetbase\FleetOps\Jobs;
+
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Order;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class NotifyBulkAssignedDriver implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public function __construct(public array $orderUuids, public string $driverUuid)
+    {
+    }
+
+    public function handle(): void
+    {
+        $driver = Driver::where('uuid', $this->driverUuid)->first();
+        if (!$driver) {
+            return;
+        }
+
+        Order::whereIn('uuid', $this->orderUuids)
+            ->cursor()
+            ->each(function (Order $order) use ($driver): void {
+                $order->setRelation('driverAssigned', $driver);
+                $order->driver_assigned_uuid = $driver->uuid;
+
+                try {
+                    $order->notifyDriverAssigned();
+                } catch (\Throwable $e) {
+                    logger()->warning(
+                        'Failed notifying driver on order ' . $order->uuid,
+                        ['error' => $e->getMessage()]
+                    );
+                }
+            });
+    }
+}

package/server/src/Jobs/SyncTelematicDevicesJob.php

@@ -10,6 +10,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -27,7 +28,7 @@ class SyncTelematicDevicesJob implements ShouldQueue
     public Telematic $telematic;
     public array $options;
     public string $jobId;
-    public int $tries   = 3;
+    public int $tries   = 1;
     public int $timeout = 300;
 
     /**
@@ -46,141 +47,186 @@ class SyncTelematicDevicesJob implements ShouldQueue
     public function handle(TelematicProviderRegistry $registry, TelematicService $service): void
     {
         $correlationId = \Illuminate\Support\Str::uuid()->toString();
+        $lockKey       = 'fleetops:sync-telematic-devices:' . $this->telematic->uuid;
+        $lock          = Cache::lock($lockKey, $this->timeout + 60);
 
-        Log::info('Device discovery started', [
-            'correlation_id' => $correlationId,
-            'telematic_uuid' => $this->telematic->uuid,
-            'provider'       => $this->telematic->provider,
-        ]);
+        if (!$lock->get()) {
+            Log::info('Device discovery skipped because another sync is already running', [
+                'correlation_id' => $correlationId,
+                'telematic_uuid' => $this->telematic->uuid,
+                'provider'       => $this->telematic->provider,
+                'lock_key'       => $lockKey,
+            ]);
+
+            $this->telematic->meta = array_merge($this->telematic->meta ?? [], [
+                'last_sync_job_id'          => $this->jobId,
+                'last_sync_result'          => 'skipped',
+                'last_sync_skipped_reason'  => 'sync_already_running',
+                'last_sync_skipped_at'      => now()->toDateTimeString(),
+            ]);
+            $this->telematic->save();
 
-        $cursor                     = null;
-        $totalFetched               = 0;
-        $totalLinked                = 0;
-        $totalSkipped               = 0;
-        $pageCount                  = 0;
-        $lastProviderAllCount       = null;
-        $lastProviderFiltersCount   = null;
+            return;
+        }
 
         try {
-            $provider = $registry->resolve($this->telematic->provider);
-            $provider->connect($this->telematic);
-
-            do {
-                $response = $provider->fetchDevices([
-                    'limit'   => $this->options['limit'] ?? null,
-                    'cursor'  => $cursor,
-                    'filters' => $this->options['filters'] ?? [],
-                ]);
+            Log::info('Device discovery started', [
+                'correlation_id' => $correlationId,
+                'telematic_uuid' => $this->telematic->uuid,
+                'provider'       => $this->telematic->provider,
+            ]);
 
-                $devices     = $response['devices'] ?? [];
-                $pagination  = $response['pagination'] ?? [];
-                $pageCount++;
-                $totalFetched += count($devices);
-
-                if (isset($pagination['allCount'])) {
-                    $lastProviderAllCount = $pagination['allCount'];
-                }
-
-                if (isset($pagination['filtersCount'])) {
-                    $lastProviderFiltersCount = $pagination['filtersCount'];
-                }
-
-                Log::info('Device discovery page fetched', [
-                    'correlation_id' => $correlationId,
-                    'telematic_uuid' => $this->telematic->uuid,
-                    'provider'       => $this->telematic->provider,
-                    'page'           => $pageCount,
-                    'cursor'         => $cursor,
-                    'limit'          => $pagination['limit'] ?? ($this->options['limit'] ?? null),
-                    'result_count'   => count($devices),
-                    'all_count'      => $lastProviderAllCount,
-                    'filters_count'  => $lastProviderFiltersCount,
-                    'next_cursor'    => $response['next_cursor'] ?? null,
-                    'has_more'       => $response['has_more'] ?? false,
-                ]);
+            $cursor                     = null;
+            $totalFetched               = 0;
+            $totalLinked                = 0;
+            $totalEvents                = 0;
+            $totalSensors               = 0;
+            $totalSkipped               = 0;
+            $pageCount                  = 0;
+            $lastProviderAllCount       = null;
+            $lastProviderFiltersCount   = null;
+
+            try {
+                $provider = $registry->resolve($this->telematic->provider);
+                $provider->connect($this->telematic);
+
+                do {
+                    $response = $provider->fetchDevices([
+                        'limit'   => $this->options['limit'] ?? null,
+                        'cursor'  => $cursor,
+                        'filters' => $this->options['filters'] ?? [],
+                    ]);
+
+                    $devices     = $response['devices'] ?? [];
+                    $pagination  = $response['pagination'] ?? [];
+                    $pageCount++;
+                    $totalFetched += count($devices);
+
+                    if (isset($pagination['allCount'])) {
+                        $lastProviderAllCount = $pagination['allCount'];
+                    }
 
-                foreach ($devices as $devicePayload) {
-                    $normalizedDevice = $provider->normalizeDevice($devicePayload);
-                    try {
-                        $service->linkDevice($this->telematic, $normalizedDevice);
-                        $totalLinked++;
-                    } catch (\Illuminate\Validation\ValidationException $e) {
-                        $totalSkipped++;
-                        Log::warning('Skipping telematics device without provider identity', [
-                            'correlation_id'   => $correlationId,
-                            'provider'         => $this->telematic->provider,
-                            'provider_unit_id' => $devicePayload['_id'] ?? $devicePayload['id'] ?? null,
-                            'device_id'        => $normalizedDevice['device_id'] ?? null,
-                            'name'             => $normalizedDevice['name'] ?? $devicePayload['name'] ?? null,
-                            'imei'             => $devicePayload['imei'] ?? null,
-                        ]);
+                    if (isset($pagination['filtersCount'])) {
+                        $lastProviderFiltersCount = $pagination['filtersCount'];
                     }
-                }
 
-                $cursor = $response['next_cursor'] ?? null;
+                    Log::info('Device discovery page fetched', [
+                        'correlation_id' => $correlationId,
+                        'telematic_uuid' => $this->telematic->uuid,
+                        'provider'       => $this->telematic->provider,
+                        'page'           => $pageCount,
+                        'cursor'         => $cursor,
+                        'limit'          => $pagination['limit'] ?? ($this->options['limit'] ?? null),
+                        'result_count'   => count($devices),
+                        'all_count'      => $lastProviderAllCount,
+                        'filters_count'  => $lastProviderFiltersCount,
+                        'next_cursor'    => $response['next_cursor'] ?? null,
+                        'has_more'       => $response['has_more'] ?? false,
+                    ]);
+
+                    foreach ($devices as $devicePayload) {
+                        $normalizedDevice = $provider->normalizeDevice($devicePayload);
+                        try {
+                            $result = $service->ingestDeviceSnapshot($this->telematic, $provider, $devicePayload);
+                            $totalLinked++;
+                            if ($result['event']) {
+                                $totalEvents++;
+                            }
+                            $totalSensors += $result['sensors'] ?? 0;
+                        } catch (\Illuminate\Validation\ValidationException $e) {
+                            $totalSkipped++;
+                            Log::warning('Skipping telematics device without provider identity', [
+                                'correlation_id'   => $correlationId,
+                                'provider'         => $this->telematic->provider,
+                                'provider_unit_id' => $devicePayload['_id'] ?? $devicePayload['id'] ?? null,
+                                'device_id'        => $normalizedDevice['device_id'] ?? null,
+                                'name'             => $normalizedDevice['name'] ?? $devicePayload['name'] ?? null,
+                                'imei'             => $devicePayload['imei'] ?? null,
+                            ]);
+                        }
+                    }
 
-                Log::info('Device discovery progress', [
-                    'correlation_id' => $correlationId,
-                    'fetched'        => $totalFetched,
-                    'linked'         => $totalLinked,
-                    'skipped'        => $totalSkipped,
-                    'has_more'       => $response['has_more'] ?? false,
+                    $cursor = $response['next_cursor'] ?? null;
+
+                    Log::info('Device discovery progress', [
+                        'correlation_id' => $correlationId,
+                        'fetched'        => $totalFetched,
+                        'linked'         => $totalLinked,
+                        'events'         => $totalEvents,
+                        'sensors'        => $totalSensors,
+                        'skipped'        => $totalSkipped,
+                        'has_more'       => $response['has_more'] ?? false,
+                    ]);
+
+                    // Broadcast progress (TODO: implement WebSocket broadcasting)
+                } while (($response['has_more'] ?? false) && $cursor);
+
+                Log::info('Device discovery completed', [
+                    'correlation_id'        => $correlationId,
+                    'total_fetched'         => $totalFetched,
+                    'total_linked'          => $totalLinked,
+                    'total_events'          => $totalEvents,
+                    'total_sensors'         => $totalSensors,
+                    'total_skipped'         => $totalSkipped,
+                    'page_count'            => $pageCount,
+                    'provider_all_count'    => $lastProviderAllCount,
+                    'provider_filter_count' => $lastProviderFiltersCount,
                 ]);
 
-                // Broadcast progress (TODO: implement WebSocket broadcasting)
-            } while (($response['has_more'] ?? false) && $cursor);
-
-            Log::info('Device discovery completed', [
-                'correlation_id'        => $correlationId,
-                'total_fetched'         => $totalFetched,
-                'total_linked'          => $totalLinked,
-                'total_skipped'         => $totalSkipped,
-                'page_count'            => $pageCount,
-                'provider_all_count'    => $lastProviderAllCount,
-                'provider_filter_count' => $lastProviderFiltersCount,
-            ]);
-
-            $this->telematic->status = 'active';
-            $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
-                'last_sync_job_id'                 => $this->jobId,
-                'last_sync_completed_at'           => now()->toDateTimeString(),
-                'last_sync_result'                 => 'success',
-                'last_sync_total'                  => $totalLinked,
-                'last_sync_fetched_total'          => $totalFetched,
-                'last_sync_linked_total'           => $totalLinked,
-                'last_sync_skipped_total'          => $totalSkipped,
-                'last_sync_page_count'             => $pageCount,
-                'last_sync_provider_total'         => $lastProviderFiltersCount ?? $lastProviderAllCount,
-                'last_sync_provider_all_count'     => $lastProviderAllCount,
-                'last_sync_provider_filters_count' => $lastProviderFiltersCount,
-                'last_sync_error'                  => null,
-            ]);
-            $this->telematic->save();
-        } catch (\Exception $e) {
-            Log::error('Device discovery failed', [
-                'correlation_id' => $correlationId,
-                'error'          => $e->getMessage(),
-                'exception'      => get_class($e),
-            ]);
+                $this->telematic->status = 'active';
+                $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
+                    'last_sync_job_id'                 => $this->jobId,
+                    'last_sync_completed_at'           => now()->toDateTimeString(),
+                    'last_sync_result'                 => 'success',
+                    'last_sync_total'                  => $totalLinked,
+                    'last_sync_fetched_total'          => $totalFetched,
+                    'last_sync_linked_total'           => $totalLinked,
+                    'last_sync_events_total'           => $totalEvents,
+                    'last_sync_sensors_total'          => $totalSensors,
+                    'last_sync_skipped_total'          => $totalSkipped,
+                    'last_sync_page_count'             => $pageCount,
+                    'last_sync_provider_total'         => $lastProviderFiltersCount ?? $lastProviderAllCount,
+                    'last_sync_provider_all_count'     => $lastProviderAllCount,
+                    'last_sync_provider_filters_count' => $lastProviderFiltersCount,
+                    'last_sync_error'                  => null,
+                    'last_sync_error_context'          => null,
+                ]);
+                $this->telematic->save();
+            } catch (\Exception $e) {
+                $failureContext = method_exists($e, 'context') ? $e->context() : [];
+                $failureMessage = $this->safeSyncErrorMessage($e);
+
+                Log::error('Device discovery failed', [
+                    'correlation_id'   => $correlationId,
+                    'error'            => $failureMessage,
+                    'exception'        => get_class($e),
+                    'provider_context' => $failureContext,
+                ]);
 
-            $this->telematic->status = 'error';
-            $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
-                'last_sync_job_id'                 => $this->jobId,
-                'last_sync_result'                 => 'failed',
-                'last_sync_fetched_total'          => $totalFetched,
-                'last_sync_linked_total'           => $totalLinked,
-                'last_sync_skipped_total'          => $totalSkipped,
-                'last_sync_page_count'             => $pageCount,
-                'last_sync_provider_total'         => $lastProviderFiltersCount ?? $lastProviderAllCount,
-                'last_sync_provider_all_count'     => $lastProviderAllCount,
-                'last_sync_provider_filters_count' => $lastProviderFiltersCount,
-                'last_sync_error'                  => 'Device sync failed. Review the provider connection and server logs, then try again.',
-                'last_sync_error_type'             => class_basename($e),
-                'last_sync_failed_at'              => now()->toDateTimeString(),
-            ]);
-            $this->telematic->save();
+                $this->telematic->status = 'error';
+                $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
+                    'last_sync_job_id'                 => $this->jobId,
+                    'last_sync_result'                 => 'failed',
+                    'last_sync_fetched_total'          => $totalFetched,
+                    'last_sync_linked_total'           => $totalLinked,
+                    'last_sync_events_total'           => $totalEvents,
+                    'last_sync_sensors_total'          => $totalSensors,
+                    'last_sync_skipped_total'          => $totalSkipped,
+                    'last_sync_page_count'             => $pageCount,
+                    'last_sync_provider_total'         => $lastProviderFiltersCount ?? $lastProviderAllCount,
+                    'last_sync_provider_all_count'     => $lastProviderAllCount,
+                    'last_sync_provider_filters_count' => $lastProviderFiltersCount,
+                    'last_sync_error'                  => $failureMessage,
+                    'last_sync_error_type'             => class_basename($e),
+                    'last_sync_error_context'          => $failureContext,
+                    'last_sync_failed_at'              => now()->toDateTimeString(),
+                ]);
+                $this->telematic->save();
 
-            throw $e;
+                throw $e;
+            }
+        } finally {
+            $lock->release();
         }
     }
 
@@ -191,4 +237,15 @@ class SyncTelematicDevicesJob implements ShouldQueue
     {
         return $this->jobId;
     }
+
+    protected function safeSyncErrorMessage(\Throwable $e): string
+    {
+        $message = $e->getMessage();
+
+        if (!$message || preg_match('/(token=|password|client_secret|authorization|bearer\s+[a-z0-9._-]+)/i', $message)) {
+            return 'Device sync failed. Review the provider connection and safe sync metadata, then try again.';
+        }
+
+        return $message;
+    }
 }

package/server/src/Models/Device.php

@@ -74,7 +74,23 @@ class Device extends Model
      *
      * @var array
      */
-    protected $filterParams = ['status', 'attachment_state', 'warranty_uuid', 'attachable_type', 'attachable_uuid', 'telematic', 'telematic_uuid', 'provider'];
+    protected $filterParams = [
+        'status',
+        'attachment_state',
+        'vehicle',
+        'connection_status',
+        'device_id',
+        'type',
+        'serial_number',
+        'last_online_at',
+        'updated_at',
+        'warranty_uuid',
+        'attachable_type',
+        'attachable_uuid',
+        'telematic',
+        'telematic_uuid',
+        'provider',
+    ];
 
     /**
      * The attributes that are mass assignable.

package/server/src/Models/DeviceEvent.php

@@ -65,7 +65,7 @@ class DeviceEvent extends Model
      *
      * @var array
      */
-    protected $filterParams = ['event_type', 'severity', 'device_uuid', 'provider', 'code'];
+    protected $filterParams = ['event_type', 'severity', 'device_uuid', 'provider', 'code', 'processed', 'occurred_at', 'created_at', 'updated_at', 'telematic'];
 
     /**
      * The attributes that are mass assignable.
@@ -103,6 +103,15 @@ class DeviceEvent extends Model
      */
     protected $appends = [
         'device_name',
+        'device_id',
+        'device_imei',
+        'device_serial_number',
+        'device_connection_status',
+        'device_status',
+        'device_photo_url',
+        'telematic_uuid',
+        'telematic_name',
+        'provider_descriptor',
         'is_processed',
         'age_minutes',
         'processing_delay_minutes',
@@ -208,6 +217,78 @@ class DeviceEvent extends Model
         return $this->device?->name;
     }
 
+    /**
+     * Get the provider device identifier.
+     */
+    public function getDeviceIdAttribute(): ?string
+    {
+        return $this->device?->device_id ?? $this->ident;
+    }
+
+    /**
+     * Get the device IMEI.
+     */
+    public function getDeviceImeiAttribute(): ?string
+    {
+        return $this->device?->imei;
+    }
+
+    /**
+     * Get the device serial number.
+     */
+    public function getDeviceSerialNumberAttribute(): ?string
+    {
+        return $this->device?->serial_number;
+    }
+
+    /**
+     * Get the device connection status.
+     */
+    public function getDeviceConnectionStatusAttribute(): ?string
+    {
+        return $this->device?->connection_status;
+    }
+
+    /**
+     * Get the device operational status.
+     */
+    public function getDeviceStatusAttribute(): ?string
+    {
+        return $this->device?->status;
+    }
+
+    /**
+     * Get the device photo URL.
+     */
+    public function getDevicePhotoUrlAttribute(): ?string
+    {
+        return $this->device?->photo_url;
+    }
+
+    /**
+     * Get the related telematic UUID.
+     */
+    public function getTelematicUuidAttribute(): ?string
+    {
+        return $this->device?->telematic_uuid;
+    }
+
+    /**
+     * Get the related telematic name.
+     */
+    public function getTelematicNameAttribute(): ?string
+    {
+        return $this->device?->telematic?->name;
+    }
+
+    /**
+     * Get the related telematic provider descriptor.
+     */
+    public function getProviderDescriptorAttribute(): array
+    {
+        return $this->device?->telematic?->provider_descriptor ?? [];
+    }
+
     /**
      * Check if the event has been processed.
      */

package/server/src/Models/Driver.php

@@ -32,6 +32,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -235,6 +236,21 @@ class Driver extends Model
         static::addGlobalScope(new DriverScope());
     }
 
+    public function setLicenseExpiryAttribute($value): void
+    {
+        if (empty($value)) {
+            if ($this->exists && !empty($this->getOriginal('license_expiry'))) {
+                return;
+            }
+
+            $this->attributes['license_expiry'] = null;
+
+            return;
+        }
+
+        $this->attributes['license_expiry'] = Carbon::parse($value)->toDateString();
+    }
+
     /**
      * @return BelongsTo
      */