@fleetbase/fleetops-engine 0.6.64 → 0.6.65

package/server/src/Models/Trailer.php

@@ -0,0 +1,181 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\Models\Model;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+class Trailer extends Asset
+{
+    public const ASSET_CLASS = 'trailer';
+
+    /**
+     * Lifecycle statuses. Attachment and connectivity are derived separately.
+     */
+    public const STATUSES = ['available', 'in_use', 'maintenance', 'out_of_service', 'retired'];
+
+    /**
+     * Stable trailer classification values shared by validation, import and the console.
+     */
+    public const TYPES = ['dry_van', 'reefer', 'flatbed', 'step_deck', 'lowboy', 'tanker', 'bulk', 'dump', 'chassis', 'curtain_side', 'car_carrier', 'livestock', 'logging', 'dolly', 'specialty', 'other'];
+
+    /**
+     * Ownership arrangements accepted for a trailer.
+     */
+    public const OWNERSHIP_TYPES = ['owned', 'leased', 'financed', 'rented'];
+
+    /**
+     * Keep the API payload identity independent from the shared assets table.
+     */
+    protected string $payloadKey = 'trailer';
+
+    protected $publicIdType = 'trailer';
+
+    protected $appends = ['category_name', 'vendor_name', 'warranty_name', 'current_location', 'photo_url', 'display_name', 'is_online', 'last_maintenance', 'next_maintenance_due', 'attachment_state', 'connectivity_status'];
+
+    protected $fillable = [
+        'company_uuid', 'category_uuid', 'vendor_uuid', 'warranty_uuid', 'telematic_uuid', 'current_place_uuid', 'photo_uuid',
+        'name', 'description', 'code', 'type', 'body_type', 'location', 'speed', 'heading', 'altitude', 'status', 'online', 'last_online_at',
+        'usage_type', 'vin', 'plate_number', 'make', 'model', 'year', 'color', 'serial_number', 'measurement_system', 'odometer', 'odometer_unit',
+        'ownership_type', 'engine_hours', 'length', 'width', 'height', 'tare_weight', 'gvwr', 'payload_capacity', 'cargo_volume', 'axle_count',
+        'tire_count', 'door_count', 'coupling_type', 'brake_type', 'abs_equipped', 'ebs_equipped', 'refrigerated', 'temperature_min',
+        'temperature_max', 'reefer_engine_hours', 'acquisition_cost', 'current_value', 'depreciation_rate', 'insurance_value', 'currency',
+        'financing_status', 'purchased_at', 'lease_expires_at', 'capacity', 'specs', 'attributes', 'telematics', 'notes', 'slug',
+    ];
+
+    protected $casts = [
+        'year'           => 'integer', 'odometer' => 'integer', 'engine_hours' => 'integer', 'axle_count' => 'integer', 'tire_count' => 'integer',
+        'door_count'     => 'integer', 'online' => 'boolean', 'abs_equipped' => 'boolean', 'ebs_equipped' => 'boolean', 'refrigerated' => 'boolean',
+        'last_online_at' => 'datetime', 'purchased_at' => 'date', 'lease_expires_at' => 'date', 'location' => \Fleetbase\FleetOps\Casts\Point::class,
+        'capacity'       => \Fleetbase\Casts\Json::class, 'specs' => \Fleetbase\Casts\Json::class, 'attributes' => \Fleetbase\Casts\Json::class,
+        'telematics'     => \Fleetbase\Casts\Json::class,
+    ];
+
+    protected static function booted(): void
+    {
+        static::addGlobalScope('trailer', fn (Builder $query) => $query->where($query->qualifyColumn('asset_class'), static::ASSET_CLASS));
+        static::creating(function (Trailer $trailer) {
+            $trailer->asset_class = static::ASSET_CLASS;
+            $trailer->status ??= 'available';
+        });
+        static::saving(fn (Trailer $trailer) => $trailer->asset_class = static::ASSET_CLASS);
+    }
+
+    /**
+     * Bulk removal never deletes a trailer that is still coupled to a vehicle: the
+     * active towing connection would be orphaned. Attached trailers are skipped, and
+     * the operation is refused outright when every selected trailer is attached.
+     */
+    public function bulkRemove($ids = [])
+    {
+        $ids      = array_values(array_filter(array_map('strval', (array) $ids), 'strlen'));
+        $selected = static::where('company_uuid', session('company'))
+            ->where(fn ($query) => $query->whereIn('uuid', $ids)->orWhereIn('public_id', $ids))
+            ->get(['uuid', 'public_id']);
+        $attachedUuids = AssetConnection::where('company_uuid', session('company'))
+            ->whereIn('active_connected_uuid', $selected->pluck('uuid'))
+            ->pluck('active_connected_uuid')
+            ->all();
+        $blocked = $selected
+            ->filter(fn (Trailer $trailer) => in_array($trailer->uuid, $attachedUuids, true))
+            ->flatMap(fn (Trailer $trailer) => [$trailer->uuid, $trailer->public_id])
+            ->all();
+        $deletable = array_values(array_filter($ids, fn ($id) => !in_array($id, $blocked, true)));
+
+        if (empty($deletable)) {
+            throw new \RuntimeException('Detach the selected trailers from their vehicles before deleting them.');
+        }
+
+        return parent::bulkRemove($deletable);
+    }
+
+    public function currentConnection(): HasOne
+    {
+        return $this->hasOne(AssetConnection::class, 'connected_uuid', 'uuid')
+            ->where('connected_type', static::class)->whereNotNull('active_connected_uuid')->whereNull('disconnected_at');
+    }
+
+    public function devices(): HasMany
+    {
+        return $this->hasMany(Device::class, 'attachable_uuid', 'uuid')->where('attachable_type', static::class);
+    }
+
+    public function equipments(): HasMany
+    {
+        return $this->hasMany(Equipment::class, 'equipable_uuid', 'uuid')->where('equipable_type', static::class);
+    }
+
+    public function positions(): HasMany
+    {
+        return $this->hasMany(Position::class, 'subject_uuid', 'uuid')->where('subject_type', static::class);
+    }
+
+    public function maintenances(): HasMany
+    {
+        return $this->hasMany(Maintenance::class, 'maintainable_uuid', 'uuid')->where('maintainable_type', static::class);
+    }
+
+    public function maintenanceSchedules(): HasMany
+    {
+        return $this->hasMany(MaintenanceSchedule::class, 'subject_uuid', 'uuid')->where('subject_type', static::class);
+    }
+
+    public function workOrders(): HasMany
+    {
+        return $this->hasMany(WorkOrder::class, 'target_uuid', 'uuid')->where('target_type', static::class);
+    }
+
+    public function connections(): HasMany
+    {
+        return $this->hasMany(AssetConnection::class, 'connected_uuid', 'uuid')->where('connected_type', static::class)->latest('connected_at');
+    }
+
+    public function createPosition(array $attributes = [], Model|string|null $destination = null): ?Position
+    {
+        $latitude  = $attributes['latitude'] ?? null;
+        $longitude = $attributes['longitude'] ?? null;
+        if ($latitude === null || $longitude === null) {
+            return null;
+        }
+
+        return Position::create([
+            'company_uuid'     => $this->company_uuid,
+            'subject_uuid'     => $this->uuid,
+            'subject_type'     => static::class,
+            'destination_uuid' => $destination instanceof Model ? $destination->uuid : $destination,
+            'coordinates'      => new Point((float) $latitude, (float) $longitude),
+            'heading'          => $attributes['heading'] ?? null,
+            'bearing'          => $attributes['bearing'] ?? null,
+            'speed'            => $attributes['speed'] ?? null,
+            'altitude'         => $attributes['altitude'] ?? null,
+        ]);
+    }
+
+    public function getCurrentVehicleAttribute(): ?Vehicle
+    {
+        return $this->currentConnection?->vehicle;
+    }
+
+    public function getAttachmentStateAttribute(): string
+    {
+        return $this->currentConnection ? 'attached' : 'detached';
+    }
+
+    public function getConnectivityStatusAttribute(): string
+    {
+        if (!$this->last_online_at) {
+            return 'never_connected';
+        }
+        if ($this->last_online_at->gte(now()->subMinutes(10))) {
+            return 'online';
+        }
+        if ($this->last_online_at->gte(now()->subDay())) {
+            return 'recently_offline';
+        }
+
+        return 'offline';
+    }
+}

package/server/src/Models/Vehicle.php

@@ -375,6 +375,19 @@ class Vehicle extends Model
         return $this->hasMany(Equipment::class, 'equipable_uuid', 'uuid')->where('equipable_type', static::class);
     }
 
+    public function trailerConnections(): HasMany
+    {
+        return $this->hasMany(AssetConnection::class, 'connector_uuid', 'uuid')->where('connector_type', static::class)->latest('connected_at');
+    }
+
+    public function currentTrailers(): HasManyThrough
+    {
+        return $this->hasManyThrough(Trailer::class, AssetConnection::class, 'connector_uuid', 'uuid', 'uuid', 'connected_uuid')
+            ->where('asset_connections.connector_type', static::class)
+            ->where('asset_connections.connected_type', Trailer::class)
+            ->whereNull('asset_connections.disconnected_at');
+    }
+
     public function maintenances(): HasMany
     {
         return $this->hasMany(Maintenance::class, 'maintainable_uuid', 'uuid')->where('maintainable_type', static::class);

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -214,8 +214,10 @@ 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,
+            'Fleetbase\\Models\\Vehicle'    => \Fleetbase\FleetOps\Models\Vehicle::class,
+            '\\Fleetbase\\Models\\Vehicle'  => \Fleetbase\FleetOps\Models\Vehicle::class,
+            'fleet-ops:vehicle'             => \Fleetbase\FleetOps\Models\Vehicle::class,
+            'fleet-ops:trailer'             => \Fleetbase\FleetOps\Models\Trailer::class,
         ]);
     }
 

package/server/src/Support/Ai/FleetOpsAiQueryResources.php

@@ -9,6 +9,7 @@ use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Fleet;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\ServiceArea;
+use Fleetbase\FleetOps\Models\Trailer;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Models\Zone;
 
@@ -82,6 +83,27 @@ class FleetOpsAiQueryResources
             maxLimit: 500,
         ));
 
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.trailers',
+            label: 'Fleet-Ops trailers',
+            module: 'fleet-ops',
+            modelClass: Trailer::class,
+            permission: 'fleet-ops see trailer',
+            aliases: ['trailers', 'trailer'],
+            fields: [
+                'online'         => ['column' => 'online', 'type' => 'boolean'],
+                'status'         => ['column' => 'status', 'type' => 'string'],
+                'type'           => ['column' => 'type', 'type' => 'string'],
+                'plate_number'   => ['column' => 'plate_number', 'type' => 'string'],
+                'last_online_at' => ['column' => 'last_online_at', 'type' => 'datetime'],
+                'updated_at'     => ['column' => 'updated_at', 'type' => 'datetime'],
+            ],
+            sampleFields: ['public_id', 'name', 'type', 'status', 'online', 'plate_number', 'last_online_at'],
+            locationField: 'location',
+            directivePermission: 'fleet-ops list trailer',
+            maxLimit: 500,
+        ));
+
         $registry->register(new AiQueryableResource(
             key: 'fleet-ops.orders',
             label: 'Fleet-Ops orders',

package/server/src/Support/Reporting/FleetOpsReportSchema.php

@@ -24,6 +24,9 @@ class FleetOpsReportSchema implements ReportSchema
         // Register Vehicles table
         $registry->registerTable($this->createVehiclesTable());
 
+        // Assets includes first-class trailers; filter asset_class = trailer for trailer reports.
+        $registry->registerTable($this->createAssetsTable());
+
         // Register Places table
         $registry->registerTable($this->createPlacesTable());
 
@@ -592,6 +595,41 @@ class FleetOpsReportSchema implements ReportSchema
             ]);
     }
 
+    /**
+     * Create the independently managed assets definition, including Trailers.
+     */
+    protected function createAssetsTable(): Table
+    {
+        return Table::make('assets')
+            ->label('Trailers and Assets')
+            ->description('Independently managed fleet assets; Trailer rows use asset_class trailer')
+            ->category('Fleet')
+            ->extension('fleet-ops')
+            ->excludeColumns(['uuid', 'company_uuid', 'deleted_at', 'meta', 'attributes'])
+            ->maxRows(10000)
+            ->columns([
+                Column::make('public_id', 'string')->label('Asset ID')->searchable()->filterable()->sortable(),
+                Column::make('asset_class', 'string')->label('Asset Class')->filterable()->aggregatable(),
+                Column::make('name', 'string')->label('Name')->searchable()->filterable()->sortable(),
+                Column::make('code', 'string')->label('Code')->searchable()->filterable()->sortable(),
+                Column::make('type', 'string')->label('Trailer Type')->filterable()->aggregatable(),
+                Column::make('status', 'string')->label('Lifecycle Status')->filterable()->aggregatable(),
+                Column::make('plate_number', 'string')->label('Plate Number')->searchable()->filterable(),
+                Column::make('make', 'string')->label('Make')->filterable()->aggregatable(),
+                Column::make('model', 'string')->label('Model')->filterable()->aggregatable(),
+                Column::make('year', 'integer')->label('Year')->filterable()->sortable(),
+                Column::make('gvwr', 'decimal')->label('GVWR')->filterable()->sortable()->aggregatable(),
+                Column::make('payload_capacity', 'decimal')->label('Payload Capacity')->filterable()->sortable()->aggregatable(),
+                Column::make('axle_count', 'integer')->label('Axle Count')->filterable()->sortable(),
+                Column::make('online', 'boolean')->label('Online')->filterable()->aggregatable(),
+                Column::make('last_online_at', 'datetime')->label('Last Online')->filterable()->sortable(),
+                Column::make('created_at', 'datetime')->label('Created')->filterable()->sortable(),
+            ])
+            ->computedColumns([
+                Column::count('total_assets', 'id')->label('Total Assets')->description('Count of selected trailer or asset rows'),
+            ]);
+    }
+
     /**
      * Create the Places table definition.
      */

package/server/src/Support/Telematics/TelematicService.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Support\Telematics;
 
 use Fleetbase\FleetOps\Contracts\TelematicProviderInterface;
+use Fleetbase\FleetOps\Events\TrailerLocationChanged;
 use Fleetbase\FleetOps\Events\VehicleLocationChanged;
 use Fleetbase\FleetOps\Jobs\SyncTelematicDevicesJob;
 use Fleetbase\FleetOps\Jobs\TestTelematicConnectionJob;
@@ -10,6 +11,7 @@ use Fleetbase\FleetOps\Models\Device;
 use Fleetbase\FleetOps\Models\DeviceEvent;
 use Fleetbase\FleetOps\Models\Sensor;
 use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Models\Trailer;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
 use Illuminate\Support\Carbon;
@@ -654,9 +656,42 @@ class TelematicService
         $attachable = $device?->attachable;
         if ($attachable instanceof Vehicle) {
             $this->updateVehicleTelemetry($attachable, $location, $eventData, $event);
+        } elseif ($attachable instanceof Trailer) {
+            $this->updateTrailerTelemetry($attachable, $location, $eventData, $event);
         }
     }
 
+    protected function updateTrailerTelemetry(Trailer $trailer, array $location, array $eventData, DeviceEvent $event): void
+    {
+        $observedAt = $event->occurred_at ?? $event->created_at ?? now();
+        $currentAt  = data_get($trailer->telematics, 'last_event_at');
+        if ($currentAt && $observedAt->lt(Carbon::parse($currentAt))) {
+            return;
+        }
+
+        $trailer->location       = new SpatialPoint($location['latitude'], $location['longitude']);
+        $trailer->online         = array_key_exists('online', $eventData) && $eventData['online'] !== null ? (bool) $eventData['online'] : true;
+        $trailer->last_online_at = $observedAt;
+        foreach (['speed', 'heading', 'altitude', 'odometer', 'reefer_engine_hours'] as $field) {
+            if (array_key_exists($field, $eventData) && $eventData[$field] !== null) {
+                $trailer->{$field} = $eventData[$field];
+            }
+        }
+
+        $trailer->telematics = array_merge($trailer->telematics ?? [], [
+            'last_event_uuid'     => $event->uuid,
+            'last_event_id'       => $event->public_id,
+            'last_event_type'     => $event->event_type,
+            'last_event_at'       => $observedAt->toISOString(),
+            'last_device_uuid'    => $event->device_uuid,
+            'last_provider'       => $event->provider,
+            'last_telemetry_data' => array_filter($eventData, fn ($value) => $value !== null),
+        ]);
+        $trailer->save();
+
+        broadcast(new TrailerLocationChanged($trailer, ['source' => 'telematics', 'device_event_uuid' => $event->uuid, 'provider' => $event->provider]));
+    }
+
     protected function updateVehicleTelemetry(Vehicle $vehicle, array $location, array $eventData, DeviceEvent $event): void
     {
         $vehicle->location = new SpatialPoint($location['latitude'], $location['longitude']);

package/server/src/Support/TrailerSummary.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support;
+
+/**
+ * Compact towing summary of a trailer for parent payloads (vehicle listings and map
+ * popovers) that only need identity, classification and connectivity.
+ */
+class TrailerSummary
+{
+    public static function compact($trailer): array
+    {
+        return [
+            'id'                  => $trailer->uuid,
+            'uuid'                => $trailer->uuid,
+            'public_id'           => $trailer->public_id,
+            'name'                => $trailer->name,
+            'display_name'        => $trailer->display_name,
+            'type'                => $trailer->type,
+            'plate_number'        => $trailer->plate_number,
+            'status'              => $trailer->status,
+            'attachment_state'    => 'attached',
+            'connectivity_status' => $trailer->connectivity_status,
+            'online'              => (bool) $trailer->online,
+        ];
+    }
+
+    /**
+     * Compact every trailer in a loaded collection.
+     */
+    public static function collection(iterable $trailers): array
+    {
+        return collect($trailers)->map(fn ($trailer) => static::compact($trailer))->values()->all();
+    }
+}

package/server/src/routes.php

@@ -133,6 +133,8 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                 $router->get('{id}', 'EquipmentController@find');
                 $router->put('{id}', 'EquipmentController@update');
                 $router->delete('{id}', 'EquipmentController@delete');
+                $router->post('{id}/attach', 'EquipmentController@attach');
+                $router->post('{id}/detach', 'EquipmentController@detach');
             });
             // parts routes
             $router->group(['prefix' => 'parts'], function () use ($router) {
@@ -297,6 +299,19 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                 $router->put('{id}', 'VehicleController@update');
                 $router->delete('{id}', 'VehicleController@delete');
                 $router->match(['put', 'patch', 'post'], '{id}/track', 'VehicleController@track');
+                $router->get('{id}/trailers', 'TrailerController@vehicleTrailers');
+            });
+            // trailer routes
+            $router->group(['prefix' => 'trailers'], function () use ($router) {
+                $router->post('/', 'TrailerController@create');
+                $router->get('/', 'TrailerController@query');
+                $router->get('{id}', 'TrailerController@find');
+                $router->put('{id}', 'TrailerController@update');
+                $router->delete('{id}', 'TrailerController@delete');
+                $router->match(['put', 'patch', 'post'], '{id}/track', 'TrailerController@track');
+                $router->post('{id}/attach', 'TrailerController@attach');
+                $router->post('{id}/detach', 'TrailerController@detach');
+                $router->get('{id}/connections', 'TrailerController@connections');
             });
             // fleets routes
             $router->group(['prefix' => 'fleets'], function () use ($router) {
@@ -563,10 +578,24 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->post('{id}/unassign-orders', $controller('unassignOrders'));
                                 $router->post('{id}/attach-device', $controller('attachDevice'));
                                 $router->post('{id}/detach-device', $controller('detachDevice'));
+                                $router->post('{id}/attach-equipment', $controller('attachEquipment'));
+                                $router->post('{id}/detach-equipment', $controller('detachEquipment'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->post('import', $controller('import'));
                             }
                         );
+                        $router->fleetbaseRoutes('trailers', function ($router, $controller) {
+                            $router->get('statuses', $controller('statuses'));
+                            $router->get('types', $controller('types'));
+                            $router->post('{id}/attach', $controller('attach'));
+                            $router->post('{id}/detach', $controller('detach'));
+                            $router->post('{id}/attach-device', $controller('attachDevice'));
+                            $router->post('{id}/detach-device', $controller('detachDevice'));
+                            $router->post('{id}/attach-equipment', $controller('attachEquipment'));
+                            $router->post('{id}/detach-equipment', $controller('detachEquipment'));
+                            $router->match(['get', 'post'], 'export', $controller('export'));
+                            $router->post('import', $controller('import'));
+                        });
                         $router->fleetbaseRoutes('vehicle-devices');
                         $router->fleetbaseRoutes(
                             'vendors',

package/server/tests/CompactResourceSerializationTest.php

@@ -526,6 +526,20 @@ test('index vehicle resource returns compact fleet state metadata', function ()
         'altitude'         => 20,
         'speed'            => 54,
         'online'           => 1,
+    ], [
+        'currentTrailers' => new Collection([
+            (object) [
+                'uuid'                => 'trailer-uuid',
+                'public_id'           => 'trailer_public',
+                'name'                => 'Dry Van 7',
+                'display_name'        => 'Dry Van 7',
+                'type'                => 'dry_van',
+                'plate_number'        => 'TRL-7',
+                'status'              => 'in_use',
+                'connectivity_status' => 'never_connected',
+                'online'              => 0,
+            ],
+        ]),
     ]);
 
     $payload = (new TestFleetOpsIndexVehicleResource($vehicle))->resolve($request);
@@ -546,6 +560,21 @@ test('index vehicle resource returns compact fleet state metadata', function ()
         'altitude'              => 20,
         'speed'                 => 54,
         'online'                => true,
+        'trailers'              => [
+            [
+                'id'                  => 'trailer-uuid',
+                'uuid'                => 'trailer-uuid',
+                'public_id'           => 'trailer_public',
+                'name'                => 'Dry Van 7',
+                'display_name'        => 'Dry Van 7',
+                'type'                => 'dry_van',
+                'plate_number'        => 'TRL-7',
+                'status'              => 'in_use',
+                'attachment_state'    => 'attached',
+                'connectivity_status' => 'never_connected',
+                'online'              => false,
+            ],
+        ],
         'assigned_orders_count' => 6,
         'meta'                  => [
             '_index_resource'         => true,
@@ -2563,6 +2592,10 @@ test('internal vehicle vendor and waypoint resources expose internal compact fie
         'status_code'          => 'arrived',
     ]);
 
+    $vehicle->setRelation('currentTrailers', new Collection([
+        (object) ['uuid' => 'trailer-uuid', 'public_id' => 'trailer_public', 'name' => 'Reefer 12', 'display_name' => 'Reefer 12', 'type' => 'reefer', 'plate_number' => 'TRL-12', 'status' => 'in_use', 'connectivity_status' => 'online', 'online' => 1],
+    ]));
+
     expect((new InternalVehicleResource($vehicle))->resolve($request))->toMatchArray([
         'id'                 => 101,
         'uuid'               => 'fixture-uuid',
@@ -2591,6 +2624,9 @@ test('internal vehicle vendor and waypoint resources expose internal compact fie
         'altitude'           => 4,
         'speed'              => 18,
         'meta'               => ['yard' => 'east'],
+        'trailers'           => [
+            ['id' => 'trailer-uuid', 'uuid' => 'trailer-uuid', 'public_id' => 'trailer_public', 'name' => 'Reefer 12', 'display_name' => 'Reefer 12', 'type' => 'reefer', 'plate_number' => 'TRL-12', 'status' => 'in_use', 'attachment_state' => 'attached', 'connectivity_status' => 'online', 'online' => true],
+        ],
     ])
         ->and((new VehicleWithoutDriverResource($vehicle))->toWebhookPayload())->toMatchArray([
             'id'                 => 'fixture_public',

package/server/tests/ControllerFilterContractsTest.php

@@ -559,6 +559,8 @@ test('vehicle filter records identity relationship fleet and telematic filters',
     $filter->vehicleYear('2026');
     $filter->driver('unassigned');
     $filter->driver($publicIds['drivers']);
+    // The console's multi-select sends several drivers at once.
+    $filter->driver([$publicIds['drivers'], 'driver_missing']);
     $filter->vendor(null);
     $filter->vendor($publicIds['vendors']);
     $filter->driverUuid('driver-uuid');
@@ -568,6 +570,33 @@ test('vehicle filter records identity relationship fleet and telematic filters',
     $filter->createdAt(['2026-01-01', '2026-01-31']);
     $filter->updatedAt('2026-02-01');
 
+    // Batch scans: a comma-separated list of internal ids is an exact match on each.
+    $filter->internalId('VEH-1, VEH-2');
+
+    // Towing, device and presence filters back the console's vehicle index filters.
+    $schema = Illuminate\Database\Eloquent\Model::resolveConnection()->getSchemaBuilder();
+    foreach (['assets' => 'trailer_filterone', 'devices' => 'device_filterone'] as $table => $publicId) {
+        $schema->create($table, function ($blueprint) {
+            $blueprint->increments('id');
+            foreach (['uuid', 'public_id', 'internal_id', 'company_uuid', 'asset_class', 'name'] as $column) {
+                $blueprint->string($column)->nullable();
+            }
+            $blueprint->timestamps();
+            $blueprint->timestamp('deleted_at')->nullable();
+        });
+        Illuminate\Database\Eloquent\Model::resolveConnection()->table($table)->insert(['uuid' => $table . '-filter-uuid', 'public_id' => $publicId, 'company_uuid' => 'company-uuid', 'asset_class' => 'trailer', 'name' => $table]);
+    }
+    $filter->trailer('trailer_filterone');
+    $filter->device(['device_filterone']);
+    $filter->hasTrailer('true');
+    $filter->hasDriver('false');
+    $filter->hasDevice('');
+
+    expect($query->calls)->toContain(['whereIn', 'internal_id', ['VEH-1', 'VEH-2']])
+        ->and($query->calls)->toContain(['whereDoesntHave', 'driver'])
+        ->and(collect($query->calls)->where(0, 'whereHas')->pluck(1)->all())->toContain('currentTrailers')
+        ->and(collect($query->calls)->where(0, 'whereHas')->flatMap(fn ($call) => $call[2])->values()->all())->toContain(['whereIn', 'assets.uuid', ['assets-filter-uuid']], ['whereIn', 'uuid', ['devices-filter-uuid']]);
+
     expect($query->calls)->toContain(['where', ['company_uuid', 'company-uuid']])
         ->and($query->calls)->toContain(['search', 'van'])
         ->and($query->calls)->toContain(['searchWhere', ['year', 'make', 'model', 'plate_number'], 'sprinter'])

package/server/tests/Feature/Http/Api/DeviceControllerContractsTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Fleetbase\FleetOps\Exceptions\DeviceAlreadyAttachedException;
 use Fleetbase\FleetOps\Http\Controllers\Api\v1\DeviceController;
 use Fleetbase\FleetOps\Http\Requests\CreateDeviceRequest;
 use Fleetbase\FleetOps\Http\Requests\UpdateDeviceRequest;
@@ -82,22 +83,23 @@ class FleetOpsApiDeviceControllerEndpointProbe extends DeviceController
         $this->lookupLogs[] = [$action, $deviceId, $vehicleId];
     }
 
-    protected function logDeviceAttachmentFailure(string $action, Device $device, ?Vehicle $vehicle, Throwable $exception): void
+    protected function logDeviceAttachmentFailure(string $action, Device $device, ?EloquentModel $attachable, Throwable $exception): void
     {
-        $this->failureLogs[] = [$action, $device->uuid, $vehicle?->uuid, $exception->getMessage()];
+        $this->failureLogs[] = [$action, $device->uuid, $attachable?->uuid, $exception->getMessage()];
     }
 }
 
 class FleetOpsApiDeviceEndpointFake extends Device
 {
-    public array $loads       = [];
-    public array $loadCounts  = [];
-    public array $updates     = [];
-    public array $attachments = [];
-    public array $detaches    = [];
-    public bool $deleted      = false;
-    public bool $throwAttach  = false;
-    public bool $throwDetach  = false;
+    public array $loads               = [];
+    public array $loadCounts          = [];
+    public array $updates             = [];
+    public array $attachments         = [];
+    public array $detaches            = [];
+    public bool $deleted              = false;
+    public bool $throwAttach          = false;
+    public bool $throwDetach          = false;
+    public bool $throwAlreadyAttached = false;
 
     public function load($relations)
     {
@@ -139,6 +141,10 @@ class FleetOpsApiDeviceEndpointFake extends Device
             throw new RuntimeException('attach exploded');
         }
 
+        if ($this->throwAlreadyAttached) {
+            throw DeviceAlreadyAttachedException::for(null);
+        }
+
         $this->attachments[] = [$attachable::class, $attachable->uuid];
 
         return true;
@@ -316,6 +322,15 @@ test('api device controller attaches detaches and reports failures', function ()
     ];
     $attachFailure = $attachFailureController->attach(new Request(['attachable' => 'vehicle_public']), 'attach_failure')->getData(true);
 
+    $attachConflictDevice                       = fleetopsApiDeviceEndpointDevice('attach-conflict');
+    $attachConflictDevice->throwAlreadyAttached = true;
+    $attachConflictController                   = fleetopsApiDeviceControllerEndpoint();
+    $attachConflictController->models           = [
+        Device::class . ':attach_conflict'  => $attachConflictDevice,
+        Vehicle::class . ':vehicle_public'  => $vehicle,
+    ];
+    $attachConflict = $attachConflictController->attach(new Request(['attachable' => 'vehicle_public']), 'attach_conflict');
+
     $detachFailureDevice              = fleetopsApiDeviceEndpointDevice('detach-failure');
     $detachFailureDevice->throwDetach = true;
     $detachFailureController          = fleetopsApiDeviceControllerEndpoint();
@@ -339,9 +354,11 @@ test('api device controller attaches detaches and reports failures', function ()
         ])
         ->and($device->detaches)->toBe(['device-uuid'])
         ->and($missing)->toBe(['error' => 'Device resource not found.'])
-        ->and($attachFailure)->toBe(['error' => 'Unable to attach device to vehicle.'])
+        ->and($attachFailure)->toBe(['error' => 'Unable to attach device to resource.'])
+        ->and($attachConflict->getData(true))->toBe(['error' => 'Device is already attached to another asset. Detach it before attaching it elsewhere.'])
+        ->and($attachConflict->getStatusCode())->toBe(409)
         ->and($attachFailureController->failureLogs)->toBe([['attach', 'attach-failure', 'vehicle-uuid', 'attach exploded']])
-        ->and($detachFailure)->toBe(['error' => 'Unable to detach device from vehicle.'])
+        ->and($detachFailure)->toBe(['error' => 'Unable to detach device from resource.'])
         ->and($detachFailureController->failureLogs)->toBe([['detach', 'detach-failure', null, 'detach exploded']])
-        ->and($lookupFailure)->toBe(['error' => 'Device or vehicle resource not found.']);
+        ->and($lookupFailure)->toBe(['error' => 'Device or attachable resource not found.']);
 });