@fleetbase/fleetops-engine 0.6.51 → 0.6.52

package/server/src/Http/Filter/FuelProviderTransactionFilter.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Filter\Filter;
+use Illuminate\Support\Str;
+
+class FuelProviderTransactionFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+
+    public function provider(?string $provider)
+    {
+        $this->builder->where('provider', $provider);
+    }
+
+    public function syncStatus($status)
+    {
+        if (Str::contains($status, ',')) {
+            $status = explode(',', $status);
+        }
+
+        if (is_array($status)) {
+            $this->builder->whereIn('sync_status', $status);
+        } else {
+            $this->builder->where('sync_status', $status);
+        }
+    }
+
+    public function vehicle(?string $vehicle)
+    {
+        $this->builder->where('vehicle_uuid', $vehicle);
+    }
+
+    public function connection(?string $connection)
+    {
+        $this->builder->where('fuel_provider_connection_uuid', $connection);
+    }
+
+    public function transactionAt($transactionAt)
+    {
+        $transactionAt = Utils::dateRange($transactionAt);
+
+        if (is_array($transactionAt)) {
+            $this->builder->whereBetween('transaction_at', $transactionAt);
+        } else {
+            $this->builder->whereDate('transaction_at', $transactionAt);
+        }
+    }
+}

package/server/src/Http/Filter/FuelReportFilter.php

@@ -111,4 +111,14 @@ class FuelReportFilter extends Filter
             $this->builder->where('status', $status);
         }
     }
+
+    public function source(?string $source)
+    {
+        $this->builder->where('meta->source', $source);
+    }
+
+    public function provider(?string $provider)
+    {
+        $this->builder->where('meta->provider', $provider);
+    }
 }

package/server/src/Http/Resources/v1/Driver.php

@@ -45,6 +45,8 @@ class Driver extends FleetbaseResource
             'vehicle_name'                  => $this->when(Http::isInternalRequest(), $this->vehicle_name),
             'vehicle_avatar'                => $this->vehicle_avatar,
             'vendor_name'                   => $this->when(Http::isInternalRequest(), $this->vendor_name),
+            'assigned_orders_count'         => $this->when(Http::isInternalRequest(), $this->assignedOrdersCount()),
+            'current_order_reference'       => $this->when(Http::isInternalRequest(), $this->currentOrderReference()),
             'vehicle'                       => $this->whenLoaded('vehicle', fn () => new VehicleWithoutDriver($this->vehicle)),
             'current_job'                   => $this->whenLoaded('currentJob', fn () => new Order($this->currentJob)),
             'current_job_id'                => $this->when(Http::isInternalRequest(), data_get($this, 'currentJob.tracking')),
@@ -68,6 +70,19 @@ class Driver extends FleetbaseResource
         ]);
     }
 
+    protected function assignedOrdersCount(): int
+    {
+        return $this->orders()->count();
+    }
+
+    protected function currentOrderReference(): ?string
+    {
+        $this->loadMissing('currentOrder');
+        $order = data_get($this, 'currentOrder');
+
+        return data_get($order, 'tracking') ?? data_get($order, 'public_id');
+    }
+
     public function getJobs(): AnonymousResourceCollection|FleetbaseResourceCollection
     {
         return Order::collection(

package/server/src/Http/Resources/v1/FuelProviderConnection.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class FuelProviderConnection extends FleetbaseResource
+{
+    public function toArray($request)
+    {
+        return [
+            'id'              => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'       => $this->when(Http::isInternalRequest(), $this->public_id),
+            'provider'        => $this->provider,
+            'name'            => $this->name,
+            'environment'     => $this->environment,
+            'status'          => $this->status,
+            'sync_settings'   => $this->sync_settings,
+            'last_sync_state' => $this->last_sync_state,
+            'last_synced_at'  => $this->last_synced_at,
+            'last_tested_at'  => $this->last_tested_at,
+            'last_error'      => $this->last_error,
+            'meta'            => $this->meta,
+            'updated_at'      => $this->updated_at,
+            'created_at'      => $this->created_at,
+        ];
+    }
+}

package/server/src/Http/Resources/v1/FuelProviderSyncRun.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class FuelProviderSyncRun extends FleetbaseResource
+{
+    public function toArray($request)
+    {
+        return [
+            'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                     => $this->when(Http::isInternalRequest(), $this->public_id),
+            'fuel_provider_connection_uuid' => $this->when(Http::isInternalRequest(), $this->fuel_provider_connection_uuid),
+            'provider'                      => $this->provider,
+            'status'                        => $this->status,
+            'from'                          => $this->from,
+            'to'                            => $this->to,
+            'imported'                      => $this->imported,
+            'matched'                       => $this->matched,
+            'unmatched'                     => $this->unmatched,
+            'fuel_reports_created'          => $this->fuel_reports_created,
+            'liters'                        => $this->liters,
+            'amount'                        => $this->amount,
+            'started_at'                    => $this->started_at,
+            'finished_at'                   => $this->finished_at,
+            'error'                         => $this->error,
+            'summary'                       => $this->summary,
+            'meta'                          => $this->meta,
+            'updated_at'                    => $this->updated_at,
+            'created_at'                    => $this->created_at,
+        ];
+    }
+}

package/server/src/Http/Resources/v1/FuelProviderTransaction.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class FuelProviderTransaction extends FleetbaseResource
+{
+    public function toArray($request)
+    {
+        return [
+            'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                     => $this->when(Http::isInternalRequest(), $this->public_id),
+            'fuel_provider_connection_uuid' => $this->when(Http::isInternalRequest(), $this->fuel_provider_connection_uuid),
+            'fuel_report_uuid'              => $this->when(Http::isInternalRequest(), $this->fuel_report_uuid),
+            'fuel_report_id'                => $this->when(Http::isInternalRequest(), $this->fuel_report_id),
+            'vehicle_uuid'                  => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'driver_uuid'                   => $this->when(Http::isInternalRequest(), $this->driver_uuid),
+            'order_uuid'                    => $this->when(Http::isInternalRequest(), $this->order_uuid),
+            'provider'                      => $this->provider,
+            'provider_transaction_id'       => $this->provider_transaction_id,
+            'provider_vehicle_id'           => $this->provider_vehicle_id,
+            'vehicle_card_id'               => $this->vehicle_card_id,
+            'internal_number'               => $this->internal_number,
+            'structure_number'              => $this->structure_number,
+            'plate_number'                  => $this->plate_number,
+            'vin'                           => $this->vin,
+            'serial_number'                 => $this->serial_number,
+            'call_sign'                     => $this->call_sign,
+            'trip_number'                   => $this->trip_number,
+            'station_name'                  => $this->station_name,
+            'station_latitude'              => $this->station_latitude,
+            'station_longitude'             => $this->station_longitude,
+            'station_location'              => $this->station_location,
+            'transaction_at'                => $this->transaction_at,
+            'volume'                        => $this->volume,
+            'metric_unit'                   => $this->metric_unit,
+            'amount'                        => $this->amount,
+            'currency'                      => $this->currency,
+            'odometer'                      => $this->odometer,
+            'sync_status'                   => $this->sync_status,
+            'matched_at'                    => $this->matched_at,
+            'vehicle_name'                  => $this->when(Http::isInternalRequest(), $this->vehicle_name),
+            'driver_name'                   => $this->when(Http::isInternalRequest(), $this->driver_name),
+            'normalized_payload'            => $this->when(Http::isInternalRequest(), $this->normalized_payload),
+            'raw_payload'                   => $this->when(Http::isInternalRequest(), $this->raw_payload),
+            'meta'                          => $this->when(Http::isInternalRequest(), $this->meta),
+            'updated_at'                    => $this->updated_at,
+            'created_at'                    => $this->created_at,
+        ];
+    }
+}

package/server/src/Http/Resources/v1/FuelReport.php

@@ -18,28 +18,32 @@ class FuelReport extends FleetbaseResource
     public function toArray($request)
     {
         return $this->withCustomFields([
-            'id'                => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'              => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'         => $this->when(Http::isInternalRequest(), $this->public_id),
-            'reported_by_uuid'  => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
-            'driver_uuid'       => $this->when(Http::isInternalRequest(), $this->driver_uuid),
-            'vehicle_uuid'      => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
-            'reporter_name'     => $this->when(Http::isInternalRequest(), $this->reporter_name),
-            'driver_name'       => $this->when(Http::isInternalRequest(), $this->driver_name),
-            'vehicle_name'      => $this->when(Http::isInternalRequest(), $this->vehicle_name),
-            'reporter'          => $this->whenLoaded('reporter', fn () => $this->reporter),
-            'vehicle'           => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
-            'driver'            => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
-            'odometer'          => $this->odometer,
-            'amount'            => $this->amount,
-            'currency'          => $this->currency,
-            'volume'            => $this->volume,
-            'metric_unit'       => $this->metric_unit,
-            'type'              => $this->type,
-            'status'            => $this->status,
-            'location'          => $this->location ?? new Point(0, 0),
-            'updated_at'        => $this->updated_at,
-            'created_at'        => $this->created_at,
+            'id'                             => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                           => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                      => $this->when(Http::isInternalRequest(), $this->public_id),
+            'reported_by_uuid'               => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
+            'driver_uuid'                    => $this->when(Http::isInternalRequest(), $this->driver_uuid),
+            'vehicle_uuid'                   => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'reporter_name'                  => $this->when(Http::isInternalRequest(), $this->reporter_name),
+            'driver_name'                    => $this->when(Http::isInternalRequest(), $this->driver_name),
+            'vehicle_name'                   => $this->when(Http::isInternalRequest(), $this->vehicle_name),
+            'reporter'                       => $this->whenLoaded('reporter', fn () => $this->reporter),
+            'vehicle'                        => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
+            'driver'                         => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
+            'odometer'                       => $this->odometer,
+            'amount'                         => $this->amount,
+            'currency'                       => $this->currency,
+            'volume'                         => $this->volume,
+            'metric_unit'                    => $this->metric_unit,
+            'type'                           => $this->type,
+            'status'                         => $this->status,
+            'source'                         => $this->when(Http::isInternalRequest(), $this->source),
+            'provider'                       => $this->when(Http::isInternalRequest(), $this->provider),
+            'fuel_provider_transaction_uuid' => $this->when(Http::isInternalRequest(), $this->fuel_provider_transaction_uuid),
+            'meta'                           => $this->when(Http::isInternalRequest(), $this->meta),
+            'location'                       => $this->location ?? new Point(0, 0),
+            'updated_at'                     => $this->updated_at,
+            'created_at'                     => $this->created_at,
         ]);
     }
 
@@ -63,6 +67,8 @@ class FuelReport extends FleetbaseResource
             'metric_unit'        => $this->metric_unit,
             'type'               => $this->type,
             'status'             => $this->status,
+            'source'             => $this->source,
+            'provider'           => $this->provider,
             'location'           => $this->location ?? new Point(0, 0),
             'updated_at'         => $this->updated_at,
             'created_at'         => $this->created_at,

package/server/src/Http/Resources/v1/Index/Driver.php

@@ -23,26 +23,27 @@ class Driver extends FleetbaseResource
         $isInternal = Http::isInternalRequest();
 
         return [
-            'id'              => $this->when($isInternal, $this->id, $this->public_id),
-            'uuid'            => $this->when($isInternal, $this->uuid),
-            'public_id'       => $this->when($isInternal, $this->public_id),
-            'company_uuid'    => $this->when($isInternal, $this->company_uuid),
-            'user_uuid'       => $this->when($isInternal, $this->user_uuid),
-            'vehicle_uuid'    => $this->when($isInternal, $this->vehicle_uuid),
-            'vendor_uuid'     => $this->when($isInternal, $this->vendor_uuid),
-            'current_job_uuid'=> $this->when($isInternal, $this->current_job_uuid),
-            'name'            => $this->name,
-            'vehicle_name'    => $this->when($isInternal, $this->vehicle_name),
-            'email'           => $this->email,
-            'phone'           => $this->phone,
-            'photo_url'       => $this->photo_url,
-            'status'          => $this->status,
-            'location'        => $this->wasRecentlyCreated ? new Point(0, 0) : Utils::castPoint($this->location),
-            'heading'         => (int) data_get($this, 'heading', 0),
-            'altitude'        => (int) data_get($this, 'altitude', 0),
-            'speed'           => (int) data_get($this, 'speed', 0),
-            'online'          => data_get($this, 'online', false),
-            'meta'            => [
+            'id'                    => $this->when($isInternal, $this->id, $this->public_id),
+            'uuid'                  => $this->when($isInternal, $this->uuid),
+            'public_id'             => $this->when($isInternal, $this->public_id),
+            'company_uuid'          => $this->when($isInternal, $this->company_uuid),
+            'user_uuid'             => $this->when($isInternal, $this->user_uuid),
+            'vehicle_uuid'          => $this->when($isInternal, $this->vehicle_uuid),
+            'vendor_uuid'           => $this->when($isInternal, $this->vendor_uuid),
+            'current_job_uuid'      => $this->when($isInternal, $this->current_job_uuid),
+            'assigned_orders_count' => $this->when($isInternal, $this->assignedOrdersCount()),
+            'name'                  => $this->name,
+            'vehicle_name'          => $this->when($isInternal, $this->vehicle_name),
+            'email'                 => $this->email,
+            'phone'                 => $this->phone,
+            'photo_url'             => $this->photo_url,
+            'status'                => $this->status,
+            'location'              => $this->wasRecentlyCreated ? new Point(0, 0) : Utils::castPoint($this->location),
+            'heading'               => (int) data_get($this, 'heading', 0),
+            'altitude'              => (int) data_get($this, 'altitude', 0),
+            'speed'                 => (int) data_get($this, 'speed', 0),
+            'online'                => data_get($this, 'online', false),
+            'meta'                  => [
                 '_index_resource'         => true,
                 'location_coordinates'    => $this->locationCoordinates(),
                 'current_order_reference' => $this->currentOrderReference(),
@@ -53,6 +54,11 @@ class Driver extends FleetbaseResource
         ];
     }
 
+    protected function assignedOrdersCount(): int
+    {
+        return $this->orders()->count();
+    }
+
     protected function currentOrderReference(): ?string
     {
         $this->loadMissing('currentOrder');

package/server/src/Http/Resources/v1/Index/Vehicle.php

@@ -23,28 +23,30 @@ class Vehicle extends FleetbaseResource
         $isInternal = Http::isInternalRequest();
 
         return [
-            'id'              => $this->when($isInternal, $this->id, $this->public_id),
-            'uuid'            => $this->when($isInternal, $this->uuid),
-            'public_id'       => $this->when($isInternal, $this->public_id),
-            'company_uuid'    => $this->when($isInternal, $this->company_uuid),
-            'vendor_uuid'     => $this->when($isInternal, $this->vendor_uuid),
-            'photo_uuid'      => $this->when($isInternal, $this->photo_uuid),
-            'internal_id'     => $this->internal_id,
-            'display_name'    => $this->display_name,
-            'driver_name'     => $this->driver_name,
-            'plate_number'    => $this->plate_number,
-            'serial_number'   => $this->serial_number,
-            'vin'             => $this->vin,
-            'make'            => $this->make,
-            'model'           => $this->model,
-            'year'            => $this->year,
-            'photo_url'       => $this->photo_url,
-            'status'          => $this->status,
-            'location'        => Utils::castPoint($this->location),
-            'heading'         => (int) data_get($this, 'heading', 0),
-            'altitude'        => (int) data_get($this, 'altitude', 0),
-            'speed'           => (int) data_get($this, 'speed', 0),
-            'online'          => (bool) data_get($this, 'online', false),
+            'id'                    => $this->when($isInternal, $this->id, $this->public_id),
+            'uuid'                  => $this->when($isInternal, $this->uuid),
+            'public_id'             => $this->when($isInternal, $this->public_id),
+            'company_uuid'          => $this->when($isInternal, $this->company_uuid),
+            'vendor_uuid'           => $this->when($isInternal, $this->vendor_uuid),
+            'photo_uuid'            => $this->when($isInternal, $this->photo_uuid),
+            'internal_id'           => $this->internal_id,
+            'display_name'          => $this->display_name,
+            'driver_name'           => $this->driver_name,
+            'plate_number'          => $this->plate_number,
+            'serial_number'         => $this->serial_number,
+            'fuel_card_number'      => $this->fuel_card_number,
+            'vin'                   => $this->vin,
+            'make'                  => $this->make,
+            'model'                 => $this->model,
+            'year'                  => $this->year,
+            'photo_url'             => $this->photo_url,
+            'status'                => $this->status,
+            'location'              => Utils::castPoint($this->location),
+            'heading'               => (int) data_get($this, 'heading', 0),
+            'altitude'              => (int) data_get($this, 'altitude', 0),
+            'speed'                 => (int) data_get($this, 'speed', 0),
+            'online'                => (bool) data_get($this, 'online', false),
+            'assigned_orders_count' => $this->when($isInternal, $this->assignedOrdersCount()),
 
             // Meta flag to indicate this is an index resource
             'meta'            => [
@@ -58,6 +60,11 @@ class Vehicle extends FleetbaseResource
         ];
     }
 
+    protected function assignedOrdersCount(): int
+    {
+        return Order::where('vehicle_assigned_uuid', $this->uuid)->count();
+    }
+
     protected function currentOrderReference(): ?string
     {
         $this->loadMissing('driver.currentOrder');

package/server/src/Http/Resources/v1/Vehicle.php

@@ -39,6 +39,8 @@ class Vehicle extends FleetbaseResource
             'description'            => $this->description,
             'driver_name'            => $this->when(Http::isInternalRequest(), $this->driver_name),
             'vendor_name'            => $this->when(Http::isInternalRequest(), $this->vendor_name),
+            'assigned_orders_count'  => $this->when(Http::isInternalRequest(), $this->assignedOrdersCount()),
+            'current_order_reference'=> $this->when(Http::isInternalRequest(), $this->currentOrderReference()),
             // Relationships
             'driver'                 => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
             'devices'                => $this->whenLoaded('devices', fn () => $this->devices),
@@ -54,6 +56,7 @@ class Vehicle extends FleetbaseResource
             'serial_number'          => $this->serial_number,
             'plate_number'           => $this->plate_number,
             'call_sign'              => $this->call_sign,
+            'fuel_card_number'       => $this->fuel_card_number,
             // VIN & specs blobs
             'vin'                    => $this->vin ?? null,
             'vin_data'               => data_get($this, 'vin_data', Utils::createObject()),
@@ -142,6 +145,19 @@ class Vehicle extends FleetbaseResource
         ]);
     }
 
+    protected function assignedOrdersCount(): int
+    {
+        return \Fleetbase\FleetOps\Models\Order::where('vehicle_assigned_uuid', $this->uuid)->count();
+    }
+
+    protected function currentOrderReference(): ?string
+    {
+        $this->loadMissing('driver.currentOrder');
+        $order = data_get($this, 'driver.currentOrder');
+
+        return data_get($order, 'tracking') ?? data_get($order, 'public_id');
+    }
+
     /**
      * Transform the resource into a webhook payload.
      *
@@ -161,6 +177,7 @@ class Vehicle extends FleetbaseResource
             'vin'                        => $this->vin,
             'plate_number'               => $this->plate_number,
             'serial_number'              => $this->serial_number,
+            'fuel_card_number'           => $this->fuel_card_number,
             'make'                       => $this->make,
             'model'                      => $this->model,
             'model_type'                 => $this->model_type,

package/server/src/Http/Resources/v1/VehicleWithoutDriver.php

@@ -53,6 +53,7 @@ class VehicleWithoutDriver extends FleetbaseResource
             'serial_number'          => $this->serial_number,
             'plate_number'           => $this->plate_number,
             'call_sign'              => $this->call_sign,
+            'fuel_card_number'       => $this->fuel_card_number,
             // VIN & specs blobs
             'vin'                    => $this->vin ?? null,
             'vin_data'               => data_get($this, 'vin_data', Utils::createObject()),
@@ -160,6 +161,7 @@ class VehicleWithoutDriver extends FleetbaseResource
             'vin'                        => $this->vin,
             'plate_number'               => $this->plate_number,
             'serial_number'              => $this->serial_number,
+            'fuel_card_number'           => $this->fuel_card_number,
             'make'                       => $this->make,
             'model'                      => $this->model,
             'model_type'                 => $this->model_type,

package/server/src/Jobs/SyncFuelProviderTransactionsJob.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Fleetbase\FleetOps\Jobs;
+
+use Fleetbase\FleetOps\Models\FuelProviderConnection;
+use Fleetbase\FleetOps\Models\FuelProviderSyncRun;
+use Fleetbase\FleetOps\Support\FuelProviders\FuelProviderService;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
+
+class SyncFuelProviderTransactionsJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public function __construct(public string $connectionUuid, public ?string $from = null, public ?string $to = null, public array $options = [], public ?string $syncRunUuid = null)
+    {
+    }
+
+    public function handle(FuelProviderService $fuelProviderService): void
+    {
+        $connection = FuelProviderConnection::where('uuid', $this->connectionUuid)->firstOrFail();
+        $syncRun    = $this->syncRunUuid ? FuelProviderSyncRun::where('uuid', $this->syncRunUuid)->first() : null;
+
+        try {
+            $fuelProviderService->syncTransactions(
+                $connection,
+                $this->from ? Carbon::parse($this->from) : null,
+                $this->to ? Carbon::parse($this->to) : null,
+                $this->options,
+                $syncRun
+            );
+        } catch (\Throwable $e) {
+            $syncRun?->update([
+                'status'      => 'error',
+                'finished_at' => now(),
+                'error'       => $e->getMessage(),
+            ]);
+            $connection->update([
+                'status'          => 'error',
+                'last_error'      => $e->getMessage(),
+                'last_sync_state' => [
+                    'failed_at' => now()->toIso8601String(),
+                    'message'   => $e->getMessage(),
+                ],
+            ]);
+
+            throw $e;
+        }
+    }
+}

package/server/src/Jobs/SyncTelematicDevicesJob.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Jobs;
 
 use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Support\Telematics\TelematicProviderRegistry;
 use Fleetbase\FleetOps\Support\Telematics\TelematicService;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -25,23 +26,24 @@ class SyncTelematicDevicesJob implements ShouldQueue
 
     public Telematic $telematic;
     public array $options;
+    public string $jobId;
     public int $tries   = 3;
     public int $timeout = 300;
 
     /**
      * Create a new job instance.
      */
-    public function __construct(Telematic $telematic, array $options = [])
+    public function __construct(Telematic $telematic, array $options = [], ?string $jobId = null)
     {
         $this->telematic = $telematic;
         $this->options   = $options;
-        $this->queue     = 'telematics-sync';
+        $this->jobId     = $jobId ?? \Illuminate\Support\Str::uuid()->toString();
     }
 
     /**
      * Execute the job.
      */
-    public function handle(ProviderRegistry $registry, TelematicService $service): void
+    public function handle(TelematicProviderRegistry $registry, TelematicService $service): void
     {
         $correlationId = \Illuminate\Support\Str::uuid()->toString();
 
@@ -67,8 +69,15 @@ class SyncTelematicDevicesJob implements ShouldQueue
 
                 foreach ($response['devices'] as $devicePayload) {
                     $normalizedDevice = $provider->normalizeDevice($devicePayload);
-                    $service->linkDevice($this->telematic, $normalizedDevice);
-                    $totalSynced++;
+                    try {
+                        $service->linkDevice($this->telematic, $normalizedDevice);
+                        $totalSynced++;
+                    } catch (\Illuminate\Validation\ValidationException $e) {
+                        Log::warning('Skipping telematics device without provider identity', [
+                            'correlation_id' => $correlationId,
+                            'provider'       => $this->telematic->provider,
+                        ]);
+                    }
                 }
 
                 $cursor = $response['next_cursor'];
@@ -86,11 +95,32 @@ class SyncTelematicDevicesJob implements ShouldQueue
                 'correlation_id' => $correlationId,
                 'total_synced'   => $totalSynced,
             ]);
+
+            $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'        => $totalSynced,
+                '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 = 'error';
+            $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
+                'last_sync_job_id'     => $this->jobId,
+                'last_sync_result'     => 'failed',
+                '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();
 
             throw $e;
         }
@@ -101,6 +131,6 @@ class SyncTelematicDevicesJob implements ShouldQueue
      */
     public function getJobId(): string
     {
-        return $this->job->getJobId() ?? \Illuminate\Support\Str::uuid()->toString();
+        return $this->jobId;
     }
 }