@fleetbase/fleetops-engine 0.6.63 → 0.6.65

package/app/components/trailer/form.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/trailer/form';

package/app/components/trailer/panel-header.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/trailer/panel-header';

package/app/components/trailer/pill.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/trailer/pill';

package/app/components/vehicle/details/equipment.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vehicle/details/equipment';

package/app/components/vehicle/details/trailers.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vehicle/details/trailers';

package/app/components/vendor/card.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vendor/card';

package/app/controllers/management/trailers/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/trailers/index/details';

package/app/controllers/management/trailers/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/trailers/index/edit';

package/app/controllers/management/trailers/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/trailers/index/new';

package/app/controllers/management/trailers/index.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/trailers/index';

package/app/helpers/placeholder-image.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/helpers/placeholder-image';

package/app/helpers/resource-image.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/helpers/resource-image';

package/app/helpers/trailer-placeholder-image.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/helpers/trailer-placeholder-image';

package/app/routes/management/trailers/index/details/connections.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details/connections';

package/app/routes/management/trailers/index/details/devices.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details/devices';

package/app/routes/management/trailers/index/details/equipment.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details/equipment';

package/app/routes/management/trailers/index/details/index.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details/index';

package/app/routes/management/trailers/index/details/maintenance-history.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details/maintenance-history';

package/app/routes/management/trailers/index/details/positions.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details/positions';

package/app/routes/management/trailers/index/details/schedules.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details/schedules';

package/app/routes/management/trailers/index/details/work-orders.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details/work-orders';

package/app/routes/management/trailers/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/details';

package/app/routes/management/trailers/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/edit';

package/app/routes/management/trailers/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index/new';

package/app/routes/management/trailers/index.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/trailers/index';

package/app/routes/management/vehicles/index/details/trailers.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/vehicles/index/details/trailers';

package/app/services/trailer-actions.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/services/trailer-actions';

package/app/templates/management/trailers/index/details/connections.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details/connections';

package/app/templates/management/trailers/index/details/devices.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details/devices';

package/app/templates/management/trailers/index/details/equipment.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details/equipment';

package/app/templates/management/trailers/index/details/index.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details/index';

package/app/templates/management/trailers/index/details/maintenance-history.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details/maintenance-history';

package/app/templates/management/trailers/index/details/positions.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details/positions';

package/app/templates/management/trailers/index/details/schedules.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details/schedules';

package/app/templates/management/trailers/index/details/work-orders.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details/work-orders';

package/app/templates/management/trailers/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/details';

package/app/templates/management/trailers/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/edit';

package/app/templates/management/trailers/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index/new';

package/app/templates/management/trailers/index.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/trailers/index';

package/app/templates/management/vehicles/index/details/trailers.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/vehicles/index/details/trailers';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.63",
+    "version": "0.6.65",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.63",
+    "version": "0.6.65",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.63",
+    "version": "0.6.65",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

package/server/migrations/2026_09_03_000001_add_first_class_trailer_columns_to_assets_table.php

@@ -0,0 +1,58 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('assets', function (Blueprint $table) {
+            // Existing Asset rows predate public identifiers. Keep this nullable so
+            // Trailer support does not rewrite unrelated historical Asset data.
+            $table->string('public_id')->nullable()->after('uuid')->unique();
+            $table->string('asset_class')->nullable()->after('type')->index();
+            $table->foreignUuid('photo_uuid')->nullable()->after('current_place_uuid')->constrained('files', 'uuid')->nullOnDelete();
+            $table->boolean('online')->nullable()->after('altitude')->index();
+            $table->timestamp('last_online_at')->nullable()->after('online')->index();
+            $table->json('telematics')->nullable()->after('attributes');
+            $table->date('purchased_at')->nullable()->after('lease_expires_at');
+            $table->decimal('length', 12, 3)->nullable();
+            $table->decimal('width', 12, 3)->nullable();
+            $table->decimal('height', 12, 3)->nullable();
+            $table->decimal('tare_weight', 12, 3)->nullable();
+            $table->decimal('gvwr', 12, 3)->nullable();
+            $table->decimal('payload_capacity', 12, 3)->nullable();
+            $table->decimal('cargo_volume', 12, 3)->nullable();
+            $table->unsignedSmallInteger('axle_count')->nullable();
+            $table->unsignedSmallInteger('tire_count')->nullable();
+            $table->unsignedSmallInteger('door_count')->nullable();
+            $table->string('body_type')->nullable()->index();
+            $table->string('coupling_type')->nullable();
+            $table->string('brake_type')->nullable();
+            $table->boolean('abs_equipped')->nullable();
+            $table->boolean('ebs_equipped')->nullable();
+            $table->boolean('refrigerated')->nullable()->index();
+            $table->decimal('temperature_min', 8, 3)->nullable();
+            $table->decimal('temperature_max', 8, 3)->nullable();
+            $table->decimal('reefer_engine_hours', 14, 2)->nullable();
+            $table->index(['company_uuid', 'asset_class', 'status'], 'assets_company_class_status_index');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('assets', function (Blueprint $table) {
+            $table->dropIndex('assets_company_class_status_index');
+            $table->dropForeign(['photo_uuid']);
+            $table->dropUnique(['public_id']);
+            $table->dropColumn([
+                'public_id', 'asset_class', 'photo_uuid', 'online', 'last_online_at', 'telematics', 'purchased_at',
+                'length', 'width', 'height', 'tare_weight', 'gvwr', 'payload_capacity', 'cargo_volume',
+                'axle_count', 'tire_count', 'door_count', 'body_type', 'coupling_type', 'brake_type',
+                'abs_equipped', 'ebs_equipped', 'refrigerated', 'temperature_min', 'temperature_max',
+                'reefer_engine_hours',
+            ]);
+        });
+    }
+};

package/server/migrations/2026_09_03_000002_create_asset_connections_table.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::create('asset_connections', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->uuid('uuid')->unique();
+            $table->string('public_id')->unique();
+            $table->foreignUuid('company_uuid')->constrained('companies', 'uuid')->cascadeOnDelete();
+            $table->string('connector_type');
+            $table->uuid('connector_uuid');
+            $table->string('connected_type');
+            $table->uuid('connected_uuid');
+            $table->uuid('active_connected_uuid')->nullable()->unique();
+            $table->string('active_connector_position')->nullable()->unique();
+            $table->string('relationship_type')->default('towing');
+            $table->unsignedSmallInteger('position')->default(1);
+            $table->timestamp('connected_at');
+            $table->timestamp('disconnected_at')->nullable();
+            $table->string('source')->default('manual');
+            $table->string('confidence')->nullable();
+            $table->text('notes')->nullable();
+            $table->json('meta')->nullable();
+            $table->foreignUuid('created_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+            $table->foreignUuid('updated_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+            $table->timestamps();
+            $table->softDeletes();
+            $table->index(['company_uuid', 'connector_type', 'connector_uuid'], 'asset_connections_connector_index');
+            $table->index(['company_uuid', 'connected_type', 'connected_uuid'], 'asset_connections_connected_index');
+            $table->index(['company_uuid', 'disconnected_at'], 'asset_connections_active_index');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('asset_connections');
+    }
+};

package/server/migrations/2026_09_03_000003_create_device_installations_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::create('device_installations', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->uuid('uuid')->unique();
+            $table->foreignUuid('company_uuid')->constrained('companies', 'uuid')->cascadeOnDelete();
+            $table->foreignUuid('device_uuid')->constrained('devices', 'uuid')->cascadeOnDelete();
+            $table->string('attachable_type');
+            $table->uuid('attachable_uuid');
+            $table->uuid('active_device_uuid')->nullable()->unique();
+            $table->timestamp('installed_at');
+            $table->timestamp('removed_at')->nullable();
+            $table->string('source')->default('manual');
+            $table->json('metadata')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+            $table->index(['company_uuid', 'attachable_type', 'attachable_uuid'], 'device_installations_attachable_index');
+            $table->index(['device_uuid', 'installed_at'], 'device_installations_history_index');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('device_installations');
+    }
+};

package/server/src/Auth/Schemas/FleetOps.php

@@ -61,6 +61,10 @@ class FleetOps
             'name'    => 'vehicle',
             'actions' => ['assign-driver-for', 'export', 'import'],
         ],
+        [
+            'name'    => 'trailer',
+            'actions' => ['export', 'import', 'attach-vehicle-for', 'detach-vehicle-for', 'attach-device-for', 'detach-device-for', 'attach-equipment-for', 'detach-equipment-for'],
+        ],
         [
             'name'    => 'fleet',
             'actions' => ['assign-driver-for', 'assign-vehicle-for', 'remove-driver-for', 'remove-vehicle-for', 'export', 'import'],
@@ -217,6 +221,7 @@ class FleetOps
                 '* fleet',
                 '* driver',
                 '* vehicle',
+                '* trailer',
             ],
         ],
         [
@@ -294,6 +299,7 @@ class FleetOps
                 '* work-order',
                 '* equipment',
                 '* part',
+                '* trailer',
                 'see vehicle',
                 'list vehicle',
                 'view vehicle',
@@ -318,6 +324,7 @@ class FleetOps
                 '* work-order',
                 '* equipment',
                 '* part',
+                '* trailer',
             ],
         ],
         [

package/server/src/Events/TrailerLocationChanged.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Fleetbase\FleetOps\Events;
+
+use Fleetbase\FleetOps\Models\Trailer;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class TrailerLocationChanged implements ShouldBroadcast
+{
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
+
+    public string $eventId;
+    public string $sentAt;
+    public string $companyUuid;
+    public string $trailerUuid;
+    public string $trailerId;
+    public mixed $location;
+    public mixed $altitude;
+    public mixed $heading;
+    public mixed $speed;
+    public array $additionalData;
+
+    public function __construct(Trailer $trailer, array $additionalData = [])
+    {
+        $this->eventId        = uniqid('event_');
+        $this->sentAt         = now()->toDateTimeString();
+        $this->companyUuid    = $trailer->company_uuid;
+        $this->trailerUuid    = $trailer->uuid;
+        $this->trailerId      = $trailer->public_id;
+        $this->location       = $trailer->location;
+        $this->altitude       = $trailer->altitude;
+        $this->heading        = $trailer->heading;
+        $this->speed          = $trailer->speed;
+        $this->additionalData = $additionalData;
+    }
+
+    public function broadcastOn(): array
+    {
+        return [new Channel('company.' . $this->companyUuid), new Channel('trailer.' . $this->trailerId), new Channel('trailer.' . $this->trailerUuid)];
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'trailer.location_changed';
+    }
+
+    public function broadcastWith(): array
+    {
+        return [
+            'id'          => $this->eventId,
+            'api_version' => config('api.version'),
+            'event'       => $this->broadcastAs(),
+            'created_at'  => $this->sentAt,
+            'data'        => [
+                'id'             => $this->trailerId,
+                'location'       => $this->location,
+                'altitude'       => $this->altitude,
+                'heading'        => $this->heading,
+                'speed'          => $this->speed,
+                'additionalData' => $this->additionalData,
+            ],
+        ];
+    }
+}

package/server/src/Exceptions/DeviceAlreadyAttachedException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Exceptions;
+
+/**
+ * Thrown when a device that is already installed on one asset is attached to another
+ * without being detached first. Attaching silently used to re-home the device, which
+ * let an operator "steal" a tracker from a vehicle with no feedback.
+ */
+class DeviceAlreadyAttachedException extends \DomainException
+{
+    public static function for(?string $attachedToName): self
+    {
+        $target = $attachedToName ? ' to ' . $attachedToName : ' to another asset';
+
+        return new self('Device is already attached' . $target . '. Detach it before attaching it elsewhere.');
+    }
+}

package/server/src/Exports/TrailerExport.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Fleetbase\FleetOps\Exports;
+
+use Fleetbase\FleetOps\Models\Trailer;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+
+class TrailerExport implements FromCollection, WithHeadings, WithMapping, ShouldAutoSize
+{
+    public function __construct(protected array $selections = [])
+    {
+    }
+
+    public function headings(): array
+    {
+        return ['ID', 'Name', 'Code', 'Type', 'Status', 'VIN', 'Plate Number', 'Serial Number', 'Make', 'Model', 'Year', 'Length', 'Width', 'Height', 'Tare Weight', 'GVWR', 'Payload Capacity', 'Cargo Volume', 'Axle Count', 'Tire Count', 'Coupling Type', 'Brake Type', 'Refrigerated', 'Measurement System', 'Odometer', 'Odometer Unit', 'Ownership Type', 'Purchased At', 'Lease Expires At', 'Notes', 'Date Created', 'Date Updated'];
+    }
+
+    public function map($trailer): array
+    {
+        return [$trailer->public_id, $trailer->name, $trailer->code, $trailer->type, $trailer->status, $trailer->vin, $trailer->plate_number, $trailer->serial_number, $trailer->make, $trailer->model, $trailer->year, $trailer->length, $trailer->width, $trailer->height, $trailer->tare_weight, $trailer->gvwr, $trailer->payload_capacity, $trailer->cargo_volume, $trailer->axle_count, $trailer->tire_count, $trailer->coupling_type, $trailer->brake_type, $trailer->refrigerated ? 'Yes' : 'No', $trailer->measurement_system, $trailer->odometer, $trailer->odometer_unit, $trailer->ownership_type, $trailer->purchased_at, $trailer->lease_expires_at, $trailer->notes, $trailer->created_at, $trailer->updated_at];
+    }
+
+    public function collection()
+    {
+        return Trailer::where('company_uuid', session('company'))->when($this->selections, fn ($q) => $q->whereIn('uuid', $this->selections))->get();
+    }
+}

package/server/src/Http/Controllers/Api/v1/Concerns/ResolvesFleetOpsApiResources.php

@@ -12,10 +12,10 @@ use Fleetbase\FleetOps\Models\FuelReport;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Part;
 use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Models\Trailer;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Models\Vendor;
 use Fleetbase\FleetOps\Models\Warranty;
-use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\File;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -72,7 +72,10 @@ trait ResolvesFleetOpsApiResources
             return [null, null];
         }
 
-        $modelClass = Utils::getMutationType($type);
+        $modelClass = $this->allowedMorphTypes()[$type] ?? null;
+        if (!$modelClass) {
+            throw ValidationException::withMessages(['type' => ['Unsupported resource type.']]);
+        }
         $model      = $this->resolveModel($modelClass, $id);
 
         return [$modelClass, $model->uuid];
@@ -166,6 +169,9 @@ trait ResolvesFleetOpsApiResources
             'fleet-ops:vehicle'                  => Vehicle::class,
             'vehicle'                            => Vehicle::class,
             Vehicle::class                       => Vehicle::class,
+            'fleet-ops:trailer'                  => Trailer::class,
+            'trailer'                            => Trailer::class,
+            Trailer::class                       => Trailer::class,
             'fleet-ops:driver'                   => Driver::class,
             'driver'                             => Driver::class,
             Driver::class                        => Driver::class,

package/server/src/Http/Controllers/Api/v1/DeviceController.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 
+use Fleetbase\FleetOps\Exceptions\DeviceAlreadyAttachedException;
 use Fleetbase\FleetOps\Http\Controllers\Api\v1\Concerns\ResolvesFleetOpsApiResources;
 use Fleetbase\FleetOps\Http\Requests\CreateDeviceRequest;
 use Fleetbase\FleetOps\Http\Requests\UpdateDeviceRequest;
@@ -9,7 +10,6 @@ use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Device as DeviceResource;
 use Fleetbase\FleetOps\Models\Device;
 use Fleetbase\FleetOps\Models\Telematic;
-use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Models\Warranty;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
@@ -90,28 +90,34 @@ class DeviceController extends Controller
         $this->rejectUuidIdentifiers($request);
 
         $request->validate([
-            'vehicle' => 'required_without:attachable|string|nullable',
+            'vehicle'         => 'required_without:attachable|string|nullable',
+            'attachable'      => 'required_without:vehicle|string|nullable',
+            'attachable_type' => 'nullable|in:fleet-ops:vehicle,fleet-ops:trailer,vehicle,trailer',
         ]);
 
-        $deviceId  = $id;
-        $vehicleId = $request->input('vehicle') ?? $request->input('attachable');
+        $deviceId       = $id;
+        $attachableId   = $request->input('vehicle') ?? $request->input('attachable');
+        $attachableType = $request->filled('vehicle') ? 'fleet-ops:vehicle' : $request->input('attachable_type', 'fleet-ops:vehicle');
 
         try {
-            $device  = $this->resolveModel(Device::class, $deviceId);
-            $vehicle = $this->resolveModel(Vehicle::class, $vehicleId);
+            $device       = $this->resolveModel(Device::class, $deviceId);
+            [$modelClass] = $this->resolveMorph($attachableType, $attachableId);
+            $attachable   = $this->resolveModel($modelClass, $attachableId);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
-            $this->logDeviceAttachmentLookupFailure('attach', $deviceId, $vehicleId);
+            $this->logDeviceAttachmentLookupFailure('attach', $deviceId, $attachableId);
 
-            return response()->json(['error' => 'Device or vehicle resource not found.'], 404);
+            return response()->json(['error' => 'Device or attachable resource not found.'], 404);
         }
 
         try {
-            $device->attachTo($vehicle);
+            $device->attachTo($attachable);
             $this->loadDeviceRelations($device);
+        } catch (DeviceAlreadyAttachedException $e) {
+            return response()->json(['error' => $e->getMessage()], 409);
         } catch (\Throwable $e) {
-            $this->logDeviceAttachmentFailure('attach', $device, $vehicle, $e);
+            $this->logDeviceAttachmentFailure('attach', $device, $attachable, $e);
 
-            return response()->json(['error' => 'Unable to attach device to vehicle.'], 500);
+            return response()->json(['error' => 'Unable to attach device to resource.'], 500);
         }
 
         return response()->json([
@@ -136,7 +142,7 @@ class DeviceController extends Controller
         } catch (\Throwable $e) {
             $this->logDeviceAttachmentFailure('detach', $device, null, $e);
 
-            return response()->json(['error' => 'Unable to detach device from vehicle.'], 500);
+            return response()->json(['error' => 'Unable to detach device from resource.'], 500);
         }
 
         return response()->json([
@@ -242,14 +248,15 @@ class DeviceController extends Controller
         ]);
     }
 
-    protected function logDeviceAttachmentFailure(string $action, Device $device, ?Vehicle $vehicle, \Throwable $exception): void
+    protected function logDeviceAttachmentFailure(string $action, Device $device, ?\Illuminate\Database\Eloquent\Model $attachable, \Throwable $exception): void
     {
         Log::error('Public API device attachment failed', [
             'action'          => $action,
             'device_uuid'     => $device->uuid,
             'device_id'       => $device->public_id,
-            'vehicle_uuid'    => $vehicle?->uuid,
-            'vehicle_id'      => $vehicle?->public_id,
+            'attachable_type' => $attachable ? get_class($attachable) : null,
+            'attachable_uuid' => $attachable?->uuid,
+            'attachable_id'   => $attachable?->public_id,
             'company_uuid'    => session('company'),
             'request_id'      => request()->headers->get('X-Request-ID') ?? request()->headers->get('X-Correlation-ID'),
             'exception_class' => get_class($exception),