@fleetbase/fleetops-engine 0.6.52 → 0.6.53

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

@@ -0,0 +1,74 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Filter\Filter;
+
+class DeviceFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->queryForInternal();
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+
+    public function status(string|array $status)
+    {
+        $status = Utils::arrayFrom($status);
+
+        if ($status) {
+            $this->builder->whereIn('status', $status);
+        }
+    }
+
+    public function telematic(?string $telematic)
+    {
+        $this->builder->where('telematic_uuid', $telematic);
+    }
+
+    public function telematicUuid(?string $telematic)
+    {
+        $this->telematic($telematic);
+    }
+
+    public function provider(?string $provider)
+    {
+        $this->builder->where('provider', $provider);
+    }
+
+    public function warrantyUuid(?string $warranty)
+    {
+        $this->builder->where('warranty_uuid', $warranty);
+    }
+
+    public function attachableType(?string $attachableType)
+    {
+        $this->builder->where('attachable_type', $attachableType);
+    }
+
+    public function attachableUuid(?string $attachable)
+    {
+        $this->builder->where('attachable_uuid', $attachable);
+    }
+
+    public function attachmentState(?string $attachmentState)
+    {
+        if ($attachmentState === 'attached') {
+            $this->builder->whereNotNull('attachable_uuid');
+        }
+
+        if ($attachmentState === 'unattached') {
+            $this->builder->whereNull('attachable_uuid');
+        }
+    }
+}

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

@@ -70,6 +70,12 @@ class DriverFilter extends Filter
 
     public function vehicle(string $vehicle)
     {
+        if ($vehicle === 'unassigned') {
+            $this->builder->whereNull('vehicle_uuid');
+
+            return;
+        }
+
         if (Str::isUuid($vehicle)) {
             $this->builder->where('vehicle_uuid', $vehicle);
         } else {

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

@@ -59,6 +59,12 @@ class VehicleFilter extends Filter
 
     public function driver(?string $driverId)
     {
+        if ($driverId === 'unassigned') {
+            $this->builder->whereDoesntHave('driver');
+
+            return;
+        }
+
         $this->builder->whereHas(
             'driver',
             function ($query) use ($driverId) {

package/server/src/Jobs/SyncTelematicDevicesJob.php

@@ -53,56 +53,107 @@ class SyncTelematicDevicesJob implements ShouldQueue
             'provider'       => $this->telematic->provider,
         ]);
 
+        $cursor                     = null;
+        $totalFetched               = 0;
+        $totalLinked                = 0;
+        $totalSkipped               = 0;
+        $pageCount                  = 0;
+        $lastProviderAllCount       = null;
+        $lastProviderFiltersCount   = null;
+
         try {
             $provider = $registry->resolve($this->telematic->provider);
             $provider->connect($this->telematic);
 
-            $cursor      = null;
-            $totalSynced = 0;
-
             do {
                 $response = $provider->fetchDevices([
-                    'limit'   => $this->options['limit'] ?? 100,
+                    'limit'   => $this->options['limit'] ?? null,
                     'cursor'  => $cursor,
                     'filters' => $this->options['filters'] ?? [],
                 ]);
 
-                foreach ($response['devices'] as $devicePayload) {
+                $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,
+                ]);
+
+                foreach ($devices as $devicePayload) {
                     $normalizedDevice = $provider->normalizeDevice($devicePayload);
                     try {
                         $service->linkDevice($this->telematic, $normalizedDevice);
-                        $totalSynced++;
+                        $totalLinked++;
                     } catch (\Illuminate\Validation\ValidationException $e) {
+                        $totalSkipped++;
                         Log::warning('Skipping telematics device without provider identity', [
-                            'correlation_id' => $correlationId,
-                            'provider'       => $this->telematic->provider,
+                            '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,
                         ]);
                     }
                 }
 
-                $cursor = $response['next_cursor'];
+                $cursor = $response['next_cursor'] ?? null;
 
                 Log::info('Device discovery progress', [
                     'correlation_id' => $correlationId,
-                    'synced'         => $totalSynced,
-                    'has_more'       => $response['has_more'],
+                    'fetched'        => $totalFetched,
+                    'linked'         => $totalLinked,
+                    'skipped'        => $totalSkipped,
+                    'has_more'       => $response['has_more'] ?? false,
                 ]);
 
                 // Broadcast progress (TODO: implement WebSocket broadcasting)
-            } while ($response['has_more'] && $cursor);
+            } while (($response['has_more'] ?? false) && $cursor);
 
             Log::info('Device discovery completed', [
-                'correlation_id' => $correlationId,
-                'total_synced'   => $totalSynced,
+                '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'        => $totalSynced,
-                'last_sync_error'        => null,
+                '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) {
@@ -114,11 +165,18 @@ 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_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(),
+                '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();
 

package/server/src/Models/Device.php

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

package/server/src/Models/Driver.php

@@ -196,7 +196,7 @@ class Driver extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid', 'avatar_value'];
+    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'vehicle', 'photo_uuid', 'avatar_uuid', 'avatar_value'];
 
     /**
      * The session-agnostic columns for the model.

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -7,6 +7,7 @@ use Brick\Geo\Engine\GEOSEngine;
 use Fleetbase\Providers\CoreServiceProvider;
 use Fleetbase\Support\NotificationRegistry;
 use Fleetbase\Support\Utils;
+use Illuminate\Database\Eloquent\Relations\Relation;
 
 if (!Utils::classExists(CoreServiceProvider::class)) {
     throw new \Exception('FleetOps cannot be loaded without `fleetbase/core-api` installed!');
@@ -129,6 +130,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
      */
     public function boot()
     {
+        $this->registerMorphMap();
         $this->registerObservers();
         $this->registerCommands();
         $this->scheduleCommands(function ($schedule) {
@@ -194,6 +196,14 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         }
     }
 
+    public function registerMorphMap(): void
+    {
+        Relation::morphMap([
+            'Fleetbase\\Models\\Vehicle'   => \Fleetbase\FleetOps\Models\Vehicle::class,
+            '\\Fleetbase\\Models\\Vehicle' => \Fleetbase\FleetOps\Models\Vehicle::class,
+        ]);
+    }
+
     public function registerNotifications()
     {
         // Register Notifications

package/server/src/Support/Telematics/Providers/AfaqyProvider.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Support\Telematics\Providers;
 
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 
 /**
  * AFAQY telematics provider implementation.
@@ -40,7 +41,7 @@ class AfaqyProvider extends AbstractProvider
                     'projection' => ['_id', 'name', 'imei', 'last_update'],
                     'filters'    => new \stdClass(),
                 ],
-            ]);
+            ], true);
 
             return [
                 'success'  => true,
@@ -61,13 +62,20 @@ class AfaqyProvider extends AbstractProvider
 
     public function fetchDevices(array $options = []): array
     {
-        $limit  = (int) ($options['limit'] ?? 100);
-        $offset = (int) ($options['cursor'] ?? 0);
+        $limit   = max(1, min((int) ($options['limit'] ?? 500), 500));
+        $offset  = (int) ($options['cursor'] ?? 0);
+        $filters = $options['filters'] ?? new \stdClass();
+
+        if (is_array($filters) && empty($filters)) {
+            $filters = new \stdClass();
+        }
 
         $response = $this->afaqyPost('/units/lists', [
             'data' => [
                 'address'    => $options['address'] ?? false,
-                'filters'    => $options['filters'] ?? new \stdClass(),
+                'filters'    => $filters,
+                'limit'      => $limit,
+                'offset'     => $offset,
                 'projection' => $options['projection'] ?? [
                     '_id',
                     'name',
@@ -82,19 +90,42 @@ class AfaqyProvider extends AbstractProvider
                     'sensors_last_val',
                 ],
             ],
-            'limit'  => $limit,
-            'offset' => $offset,
+        ], true);
+
+        $devices     = $response['data'] ?? [];
+        $pagination  = $response['pagination'] ?? [];
+        $pageOffset  = (int) ($pagination['offset'] ?? $offset);
+        $pageLimit   = (int) ($pagination['limit'] ?? $limit);
+        $resultCount = (int) ($pagination['resultCount'] ?? count($devices));
+        $total       = (int) ($pagination['filtersCount'] ?? $pagination['allCount'] ?? count($devices));
+        $advanceBy   = $resultCount > 0 ? $resultCount : max($pageLimit, count($devices), 1);
+        $nextCursor  = ($pageOffset + $advanceBy) < $total ? $pageOffset + $advanceBy : null;
+
+        Log::info('AFAQY units page fetched', [
+            'telematic_uuid'        => $this->telematic?->uuid,
+            'requested_offset'      => $offset,
+            'requested_limit'       => $limit,
+            'provider_offset'       => $pageOffset,
+            'provider_limit'        => $pageLimit,
+            'provider_result_count' => $resultCount,
+            'result_count'          => count($devices),
+            'all_count'             => $pagination['allCount'] ?? null,
+            'filters_count'         => $pagination['filtersCount'] ?? null,
+            'next_cursor'           => $nextCursor,
+            'has_more'              => $nextCursor !== null,
         ]);
 
-        $devices    = $response['data'] ?? [];
-        $pagination = $response['pagination'] ?? [];
-        $total      = (int) ($pagination['filtersCount'] ?? $pagination['allCount'] ?? count($devices));
-        $nextCursor = ($offset + $limit) < $total ? $offset + $limit : null;
-
         return [
             'devices'     => $devices,
             'next_cursor' => $nextCursor,
             'has_more'    => $nextCursor !== null,
+            'pagination'  => [
+                'allCount'     => $pagination['allCount'] ?? null,
+                'filtersCount' => $pagination['filtersCount'] ?? null,
+                'resultCount'  => $resultCount,
+                'offset'       => $pageOffset,
+                'limit'        => $pageLimit,
+            ],
         ];
     }
 
@@ -252,11 +283,18 @@ class AfaqyProvider extends AbstractProvider
         return $token;
     }
 
-    protected function afaqyPost(string $endpoint, array $payload = []): array
+    protected function afaqyPost(string $endpoint, array $payload = [], bool $tokenInQuery = false): array
     {
+        $url  = $this->baseUrl . $endpoint;
+        $body = $tokenInQuery ? $payload : array_merge(['token' => $this->credentials['token']], $payload);
+
+        if ($tokenInQuery) {
+            $url .= (str_contains($url, '?') ? '&' : '?') . http_build_query(['token' => $this->credentials['token']]);
+        }
+
         $response = Http::withHeaders($this->headers)
             ->timeout(30)
-            ->post($this->baseUrl . $endpoint, array_merge(['token' => $this->credentials['token']], $payload));
+            ->post($url, $body);
 
         if ($response->failed()) {
             throw new \RuntimeException('AFAQY API request failed with status ' . $response->status());

package/server/src/routes.php

@@ -305,6 +305,8 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                         ],
                     ],
                     function ($router) {
+                        $router->get('search', 'SearchController@search');
+
                         $router->fleetbaseRoutes(
                             'contacts',
                             function ($router, $controller) {
@@ -671,6 +673,13 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                         $router->get('live-fleet', 'AnalyticsController@liveFleet');
                                     }
                                 );
+                                $router->group(
+                                    ['prefix' => 'hubs'],
+                                    function ($router) {
+                                        $router->get('resources', 'HubController@resources');
+                                        $router->get('maintenance', 'HubController@maintenance');
+                                    }
+                                );
                                 $router->group(
                                     ['prefix' => 'getting-started'],
                                     function ($router) {

package/server/tests/HubRoutesTest.php

@@ -0,0 +1,62 @@
+<?php
+
+test('hub routes are registered', function () {
+    $routes = file_get_contents(dirname(__DIR__) . '/src/routes.php');
+
+    expect($routes)
+        ->toContain("['prefix' => 'hubs']")
+        ->toContain("\$router->get('resources', 'HubController@resources');")
+        ->toContain("\$router->get('maintenance', 'HubController@maintenance');");
+});
+
+test('hub controller exposes resources and maintenance contracts', function () {
+    $controller = file_get_contents(dirname(__DIR__) . '/src/Http/Controllers/Internal/v1/HubController.php');
+
+    expect($controller)
+        ->toContain('public function resources(Request $request)')
+        ->toContain('public function maintenance(Request $request)')
+        ->toContain("'kpis'")
+        ->toContain("'actions'")
+        ->toContain("'sections'")
+        ->toContain("'docs'");
+});
+
+test('resources hub action queue includes cross workflow resource actions', function () {
+    $controller = file_get_contents(dirname(__DIR__) . '/src/Http/Controllers/Internal/v1/HubController.php');
+
+    expect($controller)
+        ->toContain("'drivers_without_vehicles'")
+        ->toContain("'vehicles_without_drivers'")
+        ->toContain("'vehicles_without_devices'")
+        ->toContain("'unattached_devices'")
+        ->toContain("'resource_issues'")
+        ->toContain("'overdue_vehicle_schedules'")
+        ->toContain("'open_resource_work_orders'")
+        ->toContain("'low_stock_parts'")
+        ->toContain("'unmatched_fuel_transactions'")
+        ->toContain("'assign_vehicles_to_drivers', 'Assign vehicles to drivers'")
+        ->toContain("'assign_drivers_to_vehicles', 'Assign drivers to vehicles'")
+        ->toContain("'attach_devices_to_vehicles', 'Attach devices to vehicles'")
+        ->toContain("'prepare_vehicle_maintenance', 'Prepare upcoming maintenance'")
+        ->toContain("'close_overdue_work_orders', 'Close overdue work orders'")
+        ->toContain("'replenish_low_stock_parts', 'Replenish low-stock parts'")
+        ->toContain("'review_unmatched_fuel_transactions', 'Review unmatched fuel transactions'")
+        ->toContain("'add_operating_places', 'Add operating places'")
+        ->toContain("'add_service_vendors', 'Add vendors for service work'")
+        ->toContain("'Core resources look ready'");
+});
+
+test('resource action target filters are supported', function () {
+    $deviceFilter  = file_get_contents(dirname(__DIR__) . '/src/Http/Filter/DeviceFilter.php');
+    $driverFilter  = file_get_contents(dirname(__DIR__) . '/src/Http/Filter/DriverFilter.php');
+    $vehicleFilter = file_get_contents(dirname(__DIR__) . '/src/Http/Filter/VehicleFilter.php');
+
+    expect($deviceFilter)
+        ->toContain('public function attachmentState')
+        ->toContain("attachmentState === 'unattached'")
+        ->toContain('public function status')
+        ->toContain('public function telematic');
+
+    expect($driverFilter)->toContain("\$vehicle === 'unassigned'");
+    expect($vehicleFilter)->toContain("\$driverId === 'unassigned'");
+});

package/server/tests/TelematicsHardeningTest.php

@@ -129,7 +129,7 @@ test('device event mark processed action is routed and company scoped', function
         ->toContain("'Event was already processed.'");
 });
 
-test('afaqy sync stores compact device diagnostics and does not leak token URLs', function () {
+test('afaqy sync stores compact device diagnostics and paginates complete units lists', function () {
     $provider = file_get_contents(__DIR__ . '/../src/Support/Telematics/Providers/AfaqyProvider.php');
 
     expect($provider)
@@ -139,9 +139,53 @@ test('afaqy sync stores compact device diagnostics and does not leak token URLs'
         ->toContain("'capabilities'")
         ->not->toContain("'raw'          => \$payload")
         ->not->toContain("'sensors',")
-        ->not->toContain("?token=' . urlencode")
         ->toContain("'Authorization' => 'Bearer ' . \$token")
-        ->toContain("array_merge(['token' => \$this->credentials['token']], \$payload)");
+        ->toContain('?? 500), 500')
+        ->toContain('if (is_array($filters) && empty($filters))')
+        ->toContain('$filters = new \stdClass();')
+        ->toContain("'limit'      => \$limit")
+        ->toContain("'offset'     => \$offset")
+        ->not->toContain("\n            'limit'  => \$limit,\n            'offset' => \$offset,")
+        ->toContain("\$this->afaqyPost('/units/lists', [")
+        ->toContain('], true);')
+        ->toContain("http_build_query(['token' => \$this->credentials['token']])")
+        ->toContain("\$body = \$tokenInQuery ? \$payload : array_merge(['token' => \$this->credentials['token']], \$payload)")
+        ->toContain('$pageOffset  = (int) ($pagination[\'offset\'] ?? $offset);')
+        ->toContain('$pageLimit   = (int) ($pagination[\'limit\'] ?? $limit);')
+        ->toContain('$advanceBy   = $resultCount > 0 ? $resultCount : max($pageLimit, count($devices), 1);')
+        ->toContain('$nextCursor  = ($pageOffset + $advanceBy) < $total ? $pageOffset + $advanceBy : null;')
+        ->toContain("'requested_limit'")
+        ->toContain("'provider_limit'")
+        ->toContain("'provider_result_count'")
+        ->toContain("'pagination'  => [")
+        ->toContain("'allCount'")
+        ->toContain("'filtersCount'")
+        ->toContain("'resultCount'");
+});
+
+test('telematics device sync records provider pagination and skipped device counts', function () {
+    $job        = file_get_contents(__DIR__ . '/../src/Jobs/SyncTelematicDevicesJob.php');
+    $controller = file_get_contents(__DIR__ . '/../src/Http/Controllers/Internal/v1/TelematicController.php');
+
+    expect($controller)
+        ->toContain("'limit'   => \$request->input('limit')")
+        ->not->toContain("'limit'   => \$request->input('limit', 100)");
+
+    expect($job)
+        ->toContain("'limit'   => \$this->options['limit'] ?? null")
+        ->toContain('$totalFetched')
+        ->toContain('$totalLinked')
+        ->toContain('$totalSkipped')
+        ->toContain('$pageCount')
+        ->toContain('Device discovery page fetched')
+        ->toContain("'provider_unit_id'")
+        ->toContain("'last_sync_fetched_total'")
+        ->toContain("'last_sync_linked_total'")
+        ->toContain("'last_sync_skipped_total'")
+        ->toContain("'last_sync_page_count'")
+        ->toContain("'last_sync_provider_total'")
+        ->toContain("'last_sync_provider_all_count'")
+        ->toContain("'last_sync_provider_filters_count'");
 });
 
 test('native endpoint fields are advanced optional overrides with provider defaults', function () {
@@ -260,6 +304,53 @@ test('telematics overview attention items render as full width stacked alerts',
         ->not->toContain('lg:grid-cols-2');
 });
 
+test('device attachment morph types are normalized and legacy aliases are tolerated', function () {
+    $migration       = file_get_contents(__DIR__ . '/../migrations/2026_06_15_000001_normalize_device_attachable_vehicle_morph_types.php');
+    $command         = file_get_contents(__DIR__ . '/../src/Console/Commands/FixInvalidPolymorphicRelationTypeNamespaces.php');
+    $serviceProvider = file_get_contents(__DIR__ . '/../src/Providers/FleetOpsServiceProvider.php');
+
+    expect($migration)
+        ->toContain("whereNotNull('attachable_uuid')")
+        ->toContain("'Fleetbase\\\\Models\\\\Vehicle'")
+        ->toContain("'\\\\Fleetbase\\\\Models\\\\Vehicle'")
+        ->toContain("'attachable_type' => Vehicle::class")
+        ->toContain('Intentionally do not restore invalid legacy morph class names.');
+
+    expect($command)
+        ->toContain('\\Fleetbase\\FleetOps\\Models\\Device::class')
+        ->toContain("'columns' => ['attachable_type']");
+
+    expect($serviceProvider)
+        ->toContain('use Illuminate\Database\Eloquent\Relations\Relation;')
+        ->toContain('$this->registerMorphMap();')
+        ->toContain("'Fleetbase\\\\Models\\\\Vehicle'   => \\Fleetbase\\FleetOps\\Models\\Vehicle::class")
+        ->toContain("'\\\\Fleetbase\\\\Models\\\\Vehicle' => \\Fleetbase\\FleetOps\\Models\\Vehicle::class");
+});
+
+test('internal device attachment endpoints return specific api errors instead of raw model misses', function () {
+    $vehicleController = file_get_contents(__DIR__ . '/../src/Http/Controllers/Internal/v1/VehicleController.php');
+    $deviceController  = file_get_contents(__DIR__ . '/../src/Http/Controllers/Internal/v1/DeviceController.php');
+
+    expect($vehicleController)
+        ->toContain('$vehicle  = $this->resolveVehicle($id);')
+        ->toContain('$device   = $this->resolveDevice($deviceId);')
+        ->toContain('Vehicle not found or not available for this organization.')
+        ->toContain('Device not found or not available for this organization.')
+        ->toContain('Unable to attach device to vehicle. Please try again or contact support.')
+        ->toContain('Unable to detach device from vehicle. Please try again or contact support.')
+        ->toContain('logDeviceAttachmentLookupFailure')
+        ->toContain('logDeviceAttachmentFailure');
+
+    expect($deviceController)
+        ->toContain('$device    = $this->resolveDevice($id);')
+        ->toContain('$vehicle   = $this->resolveVehicle($vehicleId);')
+        ->toContain('Vehicle not found or not available for this organization.')
+        ->toContain('Device not found or not available for this organization.')
+        ->toContain('Unable to attach device to vehicle. Please try again or contact support.')
+        ->toContain('Unable to detach device from vehicle. Please try again or contact support.')
+        ->not->toContain('firstOrFail();');
+});
+
 function telematics_activity_log_method(string $model): string
 {
     preg_match('/public function getActivitylogOptions\(\): LogOptions\s+\{(?P<body>.*?)\n    \}/s', $model, $matches);

package/translations/ar-ae.yml

@@ -1051,7 +1051,7 @@ fleet-ops:
       more-waypoints: المزيد من نقاط الطريق
     settings-window:
       success-message: تم حفظ الإعدادات بنجاح.
-      title: إعدادات FleetOps
+      title: إعدادات Fleet-Ops
       save: حفظ التغييرات
       name: مسافة التنبيه الافتراضية للطلبات الفورية
       name-text: يحدد هذا الإعداد المسافة الافتراضية بالأمتار التي يجب أن تنبه الطلبات الفورية السائقين ضمن محيط نقطة استلام الطلب.

package/translations/vi-vn.yaml

@@ -1054,7 +1054,7 @@ fleet-ops:
       more-waypoints: thêm điểm dừng
     settings-window:
       success-message: Cài đặt đã được lưu thành công.
-      title: Cài đặt FleetOps
+      title: Cài đặt Fleet-Ops
       save: Lưu Thay đổi
       name: Khoảng cách Ping Adhoc Mặc định
       name-text: Cài đặt này xác định khoảng cách mặc định tính bằng mét mà các đơn hàng adhoc nên ping tài xế trong khu vực của điểm đón đơn hàng.