@fleetbase/fleetops-engine 0.6.55 → 0.6.56

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

@@ -0,0 +1,72 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+use Fleetbase\Support\Resolve;
+
+class Device 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),
+            'company_uuid'          => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'telematic_uuid'        => $this->when(Http::isInternalRequest(), $this->telematic_uuid),
+            'attachable_uuid'       => $this->when(Http::isInternalRequest(), $this->attachable_uuid),
+            'attachable_type'       => $this->when(Http::isInternalRequest(), $this->attachable_type ? Utils::toEmberResourceType($this->attachable_type) : null),
+            'warranty_uuid'         => $this->when(Http::isInternalRequest(), $this->warranty_uuid),
+            'photo_uuid'            => $this->when(Http::isInternalRequest(), $this->photo_uuid),
+            'telematic'             => $this->whenLoaded('telematic', fn () => $this->resolveLoadedRelation($this->telematic)),
+            'attachable'            => $this->whenLoaded('attachable', fn () => $this->resolveLoadedRelation($this->attachable)),
+            'warranty'              => $this->whenLoaded('warranty', fn () => $this->resolveLoadedRelation($this->warranty)),
+            'photo'                 => $this->whenLoaded('photo', fn () => $this->resolveLoadedRelation($this->photo)),
+            'type'                  => $this->type,
+            'device_id'             => $this->device_id,
+            'internal_id'           => $this->internal_id,
+            'imei'                  => $this->imei,
+            'imsi'                  => $this->imsi,
+            'firmware_version'      => $this->firmware_version,
+            'provider'              => $this->provider,
+            'name'                  => $this->name,
+            'model'                 => $this->model,
+            'location'              => $this->location,
+            'manufacturer'          => $this->manufacturer,
+            'serial_number'         => $this->serial_number,
+            'last_position'         => $this->last_position,
+            'installation_date'     => $this->installation_date,
+            'last_maintenance_date' => $this->last_maintenance_date,
+            'meta'                  => data_get($this, 'meta', Utils::createObject()),
+            'data'                  => data_get($this, 'data', Utils::createObject()),
+            'options'               => data_get($this, 'options', Utils::createObject()),
+            'online'                => $this->online,
+            'status'                => $this->status,
+            'data_frequency'        => $this->data_frequency,
+            'notes'                 => $this->notes,
+            'last_online_at'        => $this->last_online_at,
+            'warranty_name'         => $this->warranty_name,
+            'telematic_name'        => $this->telematic_name,
+            'is_online'             => $this->is_online,
+            'attached_to_name'      => $this->attached_to_name,
+            'connection_status'     => $this->connection_status,
+            'photo_url'             => $this->photo_url,
+            'sensors_count'         => $this->when(isset($this->sensors_count), $this->sensors_count),
+            'slug'                  => $this->slug,
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
+        ]);
+    }
+
+    protected function resolveLoadedRelation($model)
+    {
+        if (!$model) {
+            return null;
+        }
+
+        return Http::isInternalRequest() ? Resolve::httpResourceForModel($model) : $model->public_id;
+    }
+}

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

@@ -0,0 +1,57 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+use Fleetbase\Support\Resolve;
+
+class Equipment 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),
+            'company_uuid'       => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'warranty_uuid'      => $this->when(Http::isInternalRequest(), $this->warranty_uuid),
+            'photo_uuid'         => $this->when(Http::isInternalRequest(), $this->photo_uuid),
+            'equipable_uuid'     => $this->when(Http::isInternalRequest(), $this->equipable_uuid),
+            'equipable_type'     => $this->when(Http::isInternalRequest(), $this->equipable_type ? Utils::toEmberResourceType($this->equipable_type) : null),
+            'warranty'           => $this->whenLoaded('warranty', fn () => $this->resolveLoadedRelation($this->warranty)),
+            'photo'              => $this->whenLoaded('photo', fn () => $this->resolveLoadedRelation($this->photo)),
+            'equipable'          => $this->whenLoaded('equipable', fn () => $this->resolveLoadedRelation($this->equipable)),
+            'name'               => $this->name,
+            'code'               => $this->code,
+            'type'               => $this->type,
+            'status'             => $this->status,
+            'serial_number'      => $this->serial_number,
+            'manufacturer'       => $this->manufacturer,
+            'model'              => $this->model,
+            'purchased_at'       => $this->purchased_at,
+            'purchase_price'     => $this->purchase_price,
+            'currency'           => $this->currency,
+            'warranty_name'      => $this->warranty_name,
+            'photo_url'          => $this->photo_url,
+            'equipped_to_name'   => $this->equipped_to_name,
+            'is_equipped'        => $this->is_equipped,
+            'age_in_days'        => $this->age_in_days,
+            'depreciated_value'  => $this->depreciated_value,
+            'meta'               => data_get($this, 'meta', Utils::createObject()),
+            'slug'               => $this->slug,
+            'updated_at'         => $this->updated_at,
+            'created_at'         => $this->created_at,
+        ]);
+    }
+
+    protected function resolveLoadedRelation($model)
+    {
+        if (!$model) {
+            return null;
+        }
+
+        return Http::isInternalRequest() ? Resolve::httpResourceForModel($model) : $model->public_id;
+    }
+}

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+use Fleetbase\Support\Resolve;
+
+class FuelTransaction 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),
+            '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),
+            'connection'                    => $this->whenLoaded('connection', fn () => $this->resolveLoadedRelation($this->connection)),
+            'fuel_report'                   => $this->whenLoaded('fuelReport', fn () => $this->resolveLoadedRelation($this->fuelReport)),
+            'vehicle'                       => $this->whenLoaded('vehicle', fn () => $this->resolveLoadedRelation($this->vehicle)),
+            'driver'                        => $this->whenLoaded('driver', fn () => $this->resolveLoadedRelation($this->driver)),
+            'order'                         => $this->whenLoaded('order', fn () => $this->resolveLoadedRelation($this->order)),
+            '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->vehicle_name,
+            'driver_name'                   => $this->driver_name,
+            'fuel_report_id'                => $this->fuel_report_id,
+            '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,
+        ];
+    }
+
+    protected function resolveLoadedRelation($model)
+    {
+        if (!$model) {
+            return null;
+        }
+
+        return Http::isInternalRequest() ? Resolve::httpResourceForModel($model) : $model->public_id;
+    }
+}

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

@@ -0,0 +1,64 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+use Fleetbase\Support\Resolve;
+
+class Part 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),
+            'company_uuid'     => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'vendor_uuid'      => $this->when(Http::isInternalRequest(), $this->vendor_uuid),
+            'warranty_uuid'    => $this->when(Http::isInternalRequest(), $this->warranty_uuid),
+            'photo_uuid'       => $this->when(Http::isInternalRequest(), $this->photo_uuid),
+            'asset_uuid'       => $this->when(Http::isInternalRequest(), $this->asset_uuid),
+            'asset_type'       => $this->when(Http::isInternalRequest(), $this->asset_type ? Utils::toEmberResourceType($this->asset_type) : null),
+            'vendor'           => $this->whenLoaded('vendor', fn () => $this->resolveLoadedRelation($this->vendor)),
+            'warranty'         => $this->whenLoaded('warranty', fn () => $this->resolveLoadedRelation($this->warranty)),
+            'photo'            => $this->whenLoaded('photo', fn () => $this->resolveLoadedRelation($this->photo)),
+            'asset'            => $this->whenLoaded('asset', fn () => $this->resolveLoadedRelation($this->asset)),
+            'sku'              => $this->sku,
+            'name'             => $this->name,
+            'manufacturer'     => $this->manufacturer,
+            'model'            => $this->model,
+            'serial_number'    => $this->serial_number,
+            'barcode'          => $this->barcode,
+            'description'      => $this->description,
+            'quantity_on_hand' => $this->quantity_on_hand,
+            'unit_cost'        => $this->unit_cost,
+            'msrp'             => $this->msrp,
+            'currency'         => $this->currency,
+            'type'             => $this->type,
+            'status'           => $this->status,
+            'specs'            => data_get($this, 'specs', Utils::createObject()),
+            'meta'             => data_get($this, 'meta', Utils::createObject()),
+            'vendor_name'      => $this->vendor_name,
+            'warranty_name'    => $this->warranty_name,
+            'photo_url'        => $this->photo_url,
+            'total_value'      => $this->total_value,
+            'is_in_stock'      => $this->is_in_stock,
+            'is_low_stock'     => $this->is_low_stock,
+            'asset_name'       => $this->asset_name,
+            'slug'             => $this->slug,
+            'updated_at'       => $this->updated_at,
+            'created_at'       => $this->created_at,
+        ];
+    }
+
+    protected function resolveLoadedRelation($model)
+    {
+        if (!$model) {
+            return null;
+        }
+
+        return Http::isInternalRequest() ? Resolve::httpResourceForModel($model) : $model->public_id;
+    }
+}

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

@@ -0,0 +1,68 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+use Fleetbase\Support\Resolve;
+
+class Sensor 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),
+            'company_uuid'         => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'device_uuid'          => $this->when(Http::isInternalRequest(), $this->device_uuid),
+            'warranty_uuid'        => $this->when(Http::isInternalRequest(), $this->warranty_uuid),
+            'telematic_uuid'       => $this->when(Http::isInternalRequest(), $this->telematic_uuid),
+            'photo_uuid'           => $this->when(Http::isInternalRequest(), $this->photo_uuid),
+            'sensorable_uuid'      => $this->when(Http::isInternalRequest(), $this->sensorable_uuid),
+            'sensorable_type'      => $this->when(Http::isInternalRequest(), $this->sensorable_type ? Utils::toEmberResourceType($this->sensorable_type) : null),
+            'device'               => $this->whenLoaded('device', fn () => $this->resolveLoadedRelation($this->device)),
+            'warranty'             => $this->whenLoaded('warranty', fn () => $this->resolveLoadedRelation($this->warranty)),
+            'telematic'            => $this->whenLoaded('telematic', fn () => $this->resolveLoadedRelation($this->telematic)),
+            'photo'                => $this->whenLoaded('photo', fn () => $this->resolveLoadedRelation($this->photo)),
+            'sensorable'           => $this->whenLoaded('sensorable', fn () => $this->resolveLoadedRelation($this->sensorable)),
+            'name'                 => $this->name,
+            'type'                 => $this->type,
+            'internal_id'          => $this->internal_id,
+            'imei'                 => $this->imei,
+            'imsi'                 => $this->imsi,
+            'firmware_version'     => $this->firmware_version,
+            'serial_number'        => $this->serial_number,
+            'last_position'        => $this->last_position,
+            'unit'                 => $this->unit,
+            'min_threshold'        => $this->min_threshold,
+            'max_threshold'        => $this->max_threshold,
+            'threshold_inclusive'  => $this->threshold_inclusive,
+            'last_reading_at'      => $this->last_reading_at,
+            'last_value'           => $this->last_value,
+            'calibration'          => data_get($this, 'calibration', Utils::createObject()),
+            'report_frequency_sec' => $this->report_frequency_sec,
+            'status'               => $this->status,
+            'meta'                 => data_get($this, 'meta', Utils::createObject()),
+            'is_active'            => $this->is_active,
+            'threshold_status'     => $this->threshold_status,
+            'photo_url'            => $this->photo_url,
+            'device_name'          => $this->device_name,
+            'warranty_name'        => $this->warranty_name,
+            'attached_to_name'     => $this->attached_to_name,
+            'slug'                 => $this->slug,
+            'updated_at'           => $this->updated_at,
+            'created_at'           => $this->created_at,
+        ]);
+    }
+
+    protected function resolveLoadedRelation($model)
+    {
+        if (!$model) {
+            return null;
+        }
+
+        return Http::isInternalRequest() ? Resolve::httpResourceForModel($model) : $model->public_id;
+    }
+}

package/server/src/Jobs/SyncTelematicDevicesJob.php

@@ -28,8 +28,9 @@ class SyncTelematicDevicesJob implements ShouldQueue
     public Telematic $telematic;
     public array $options;
     public string $jobId;
-    public int $tries   = 1;
-    public int $timeout = 300;
+    public int $tries          = 1;
+    public int $timeout        = 3600;
+    public bool $failOnTimeout = true;
 
     /**
      * Create a new job instance.
@@ -79,12 +80,22 @@ class SyncTelematicDevicesJob implements ShouldQueue
             $cursor                     = null;
             $totalFetched               = 0;
             $totalLinked                = 0;
+            $totalLinkAttempts          = 0;
             $totalEvents                = 0;
             $totalSensors               = 0;
             $totalSkipped               = 0;
             $pageCount                  = 0;
             $lastProviderAllCount       = null;
             $lastProviderFiltersCount   = null;
+            $providerSyncMeta           = [];
+            $linkedDeviceKeys           = [];
+            $inventoryPayloads          = [];
+            $inventoryFetched           = 0;
+            $inventoryLinked            = 0;
+            $inventorySkipped           = 0;
+            $totalEnrichment            = 0;
+            $totalEnrichmentCompleted   = 0;
+            $totalEnrichmentFailures    = 0;
 
             try {
                 $provider = $registry->resolve($this->telematic->provider);
@@ -97,10 +108,12 @@ class SyncTelematicDevicesJob implements ShouldQueue
                         'filters' => $this->options['filters'] ?? [],
                     ]);
 
-                    $devices     = $response['devices'] ?? [];
-                    $pagination  = $response['pagination'] ?? [];
+                    $devices          = $response['devices'] ?? [];
+                    $pagination       = $response['pagination'] ?? [];
+                    $providerSyncMeta = array_merge($providerSyncMeta, $response['sync_meta'] ?? []);
                     $pageCount++;
                     $totalFetched += count($devices);
+                    $inventoryPayloads = array_merge($inventoryPayloads, $devices);
 
                     if (isset($pagination['allCount'])) {
                         $lastProviderAllCount = $pagination['allCount'];
@@ -128,10 +141,15 @@ class SyncTelematicDevicesJob implements ShouldQueue
                         $normalizedDevice = $provider->normalizeDevice($devicePayload);
                         try {
                             $result = $service->ingestDeviceSnapshot($this->telematic, $provider, $devicePayload);
-                            $totalLinked++;
-                            if ($result['event']) {
-                                $totalEvents++;
+                            $totalLinkAttempts++;
+                            $linkedDeviceKey = $this->resolveLinkedDeviceKey($result, $normalizedDevice);
+
+                            if ($linkedDeviceKey && !isset($linkedDeviceKeys[$linkedDeviceKey])) {
+                                $linkedDeviceKeys[$linkedDeviceKey] = true;
+                                $totalLinked++;
                             }
+
+                            $totalEvents += count($result['events'] ?? array_filter([$result['event'] ?? null]));
                             $totalSensors += $result['sensors'] ?? 0;
                         } catch (\Illuminate\Validation\ValidationException $e) {
                             $totalSkipped++;
@@ -152,6 +170,7 @@ class SyncTelematicDevicesJob implements ShouldQueue
                         'correlation_id' => $correlationId,
                         'fetched'        => $totalFetched,
                         'linked'         => $totalLinked,
+                        'link_attempts'  => $totalLinkAttempts,
                         'events'         => $totalEvents,
                         'sensors'        => $totalSensors,
                         'skipped'        => $totalSkipped,
@@ -161,10 +180,102 @@ class SyncTelematicDevicesJob implements ShouldQueue
                     // Broadcast progress (TODO: implement WebSocket broadcasting)
                 } while (($response['has_more'] ?? false) && $cursor);
 
+                $inventoryFetched = $totalFetched;
+                $inventoryLinked  = $totalLinked;
+                $inventorySkipped = $totalSkipped;
+
+                $this->telematic->status = 'synchronizing';
+                $this->telematic->meta   = array_merge($this->telematic->meta ?? [], $providerSyncMeta, [
+                    'last_sync_job_id'                   => $this->jobId,
+                    'last_sync_result'                   => 'inventory_synced',
+                    'last_sync_total'                    => $totalLinked,
+                    'last_sync_inventory_completed_at'   => now()->toDateTimeString(),
+                    'last_sync_inventory_total'          => $inventoryFetched,
+                    'last_sync_inventory_linked_total'   => $inventoryLinked,
+                    'last_sync_inventory_skipped_total'  => $inventorySkipped,
+                    'last_sync_fetched_total'            => $totalFetched,
+                    'last_sync_linked_total'             => $totalLinked,
+                    'last_sync_link_attempts_total'      => $totalLinkAttempts,
+                    '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,
+                ]);
+                $this->telematic->save();
+
+                Log::info($this->telematic->provider === 'safee' ? 'Safee inventory sync completed' : 'Telematics inventory sync completed', [
+                    'correlation_id'   => $correlationId,
+                    'telematic_uuid'   => $this->telematic->uuid,
+                    'provider'         => $this->telematic->provider,
+                    'inventory_total'  => $inventoryFetched,
+                    'inventory_linked' => $inventoryLinked,
+                    'skipped'          => $inventorySkipped,
+                ]);
+
+                if (method_exists($provider, 'fetchDeviceTelemetrySnapshots') && !empty($inventoryPayloads)) {
+                    Log::info($this->telematic->provider === 'safee' ? 'Safee telemetry enrichment started' : 'Telematics telemetry enrichment started', [
+                        'correlation_id' => $correlationId,
+                        'telematic_uuid' => $this->telematic->uuid,
+                        'provider'       => $this->telematic->provider,
+                        'device_count'   => count($inventoryPayloads),
+                    ]);
+
+                    $enrichmentResponse = $provider->fetchDeviceTelemetrySnapshots($inventoryPayloads, [
+                        'limit'   => $this->options['limit'] ?? null,
+                        'filters' => $this->options['filters'] ?? [],
+                    ]);
+                    $providerSyncMeta = array_merge($providerSyncMeta, $enrichmentResponse['sync_meta'] ?? []);
+                    $enrichedDevices  = $enrichmentResponse['devices'] ?? [];
+                    $totalEnrichment += count($enrichedDevices);
+
+                    foreach ($enrichedDevices as $devicePayload) {
+                        $normalizedDevice = $provider->normalizeDevice($devicePayload);
+                        try {
+                            $result = $service->ingestDeviceSnapshot($this->telematic, $provider, $devicePayload);
+                            $totalLinkAttempts++;
+                            $linkedDeviceKey = $this->resolveLinkedDeviceKey($result, $normalizedDevice);
+
+                            if ($linkedDeviceKey && !isset($linkedDeviceKeys[$linkedDeviceKey])) {
+                                $linkedDeviceKeys[$linkedDeviceKey] = true;
+                                $totalLinked++;
+                            }
+
+                            $totalEnrichmentCompleted++;
+                            $totalEvents += count($result['events'] ?? array_filter([$result['event'] ?? null]));
+                            $totalSensors += $result['sensors'] ?? 0;
+                        } catch (\Illuminate\Validation\ValidationException $e) {
+                            $totalSkipped++;
+                            $totalEnrichmentFailures++;
+                            Log::warning('Skipping telematics enrichment 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($this->telematic->provider === 'safee' ? 'Safee telemetry enrichment completed' : 'Telematics telemetry enrichment completed', [
+                        'correlation_id' => $correlationId,
+                        'telematic_uuid' => $this->telematic->uuid,
+                        'provider'       => $this->telematic->provider,
+                        'total'          => $totalEnrichment,
+                        'completed'      => $totalEnrichmentCompleted,
+                        'failures'       => $totalEnrichmentFailures,
+                    ]);
+                }
+
                 Log::info('Device discovery completed', [
                     'correlation_id'        => $correlationId,
                     'total_fetched'         => $totalFetched,
                     'total_linked'          => $totalLinked,
+                    'total_link_attempts'   => $totalLinkAttempts,
+                    'total_enrichment'      => $totalEnrichment,
+                    'enrichment_completed'  => $totalEnrichmentCompleted,
+                    'enrichment_failures'   => $totalEnrichmentFailures,
                     'total_events'          => $totalEvents,
                     'total_sensors'         => $totalSensors,
                     'total_skipped'         => $totalSkipped,
@@ -174,22 +285,29 @@ class SyncTelematicDevicesJob implements ShouldQueue
                 ]);
 
                 $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->meta   = array_merge($this->telematic->meta ?? [], $providerSyncMeta, [
+                    '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_link_attempts_total'     => $totalLinkAttempts,
+                    'last_sync_inventory_total'         => $inventoryFetched,
+                    'last_sync_inventory_linked_total'  => $inventoryLinked,
+                    'last_sync_inventory_skipped_total' => $inventorySkipped,
+                    'last_sync_enrichment_total'        => $totalEnrichment,
+                    'last_sync_enrichment_completed'    => $totalEnrichmentCompleted,
+                    'last_sync_enrichment_failures'     => $totalEnrichmentFailures,
+                    '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) {
@@ -205,21 +323,28 @@ class SyncTelematicDevicesJob implements ShouldQueue
 
                 $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(),
+                    'last_sync_job_id'                  => $this->jobId,
+                    'last_sync_result'                  => 'failed',
+                    'last_sync_fetched_total'           => $totalFetched,
+                    'last_sync_linked_total'            => $totalLinked,
+                    'last_sync_link_attempts_total'     => $totalLinkAttempts,
+                    'last_sync_inventory_total'         => $inventoryFetched,
+                    'last_sync_inventory_linked_total'  => $inventoryLinked,
+                    'last_sync_inventory_skipped_total' => $inventorySkipped,
+                    'last_sync_enrichment_total'        => $totalEnrichment,
+                    'last_sync_enrichment_completed'    => $totalEnrichmentCompleted,
+                    'last_sync_enrichment_failures'     => $totalEnrichmentFailures,
+                    '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();
 
@@ -238,6 +363,37 @@ class SyncTelematicDevicesJob implements ShouldQueue
         return $this->jobId;
     }
 
+    public function failed(\Throwable $e): void
+    {
+        $this->telematic->refresh();
+        $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'         => $this->safeSyncErrorMessage($e),
+            'last_sync_error_type'    => class_basename($e),
+            'last_sync_failed_at'     => now()->toDateTimeString(),
+            'last_sync_failed_reason' => $e instanceof \Illuminate\Queue\TimeoutExceededException ? 'job_timeout' : null,
+        ]);
+        $this->telematic->save();
+    }
+
+    protected function resolveLinkedDeviceKey(array $result, array $normalizedDevice): ?string
+    {
+        $device = $result['device'] ?? null;
+        $value  = null;
+
+        if (is_object($device)) {
+            $value = $device->uuid ?? $device->device_id ?? null;
+        }
+
+        $value ??= $normalizedDevice['device_id']
+            ?? $normalizedDevice['external_id']
+            ?? null;
+
+        return $value === null || $value === '' ? null : (string) $value;
+    }
+
     protected function safeSyncErrorMessage(\Throwable $e): string
     {
         $message = $e->getMessage();