@fleetbase/fleetops-engine 0.6.64 → 0.6.66

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

@@ -1,5 +1,6 @@
 <?php
 
+use Fleetbase\FleetOps\Exceptions\DeviceAlreadyAttachedException;
 use Fleetbase\FleetOps\Http\Controllers\Internal\v1\DeviceController;
 use Fleetbase\FleetOps\Models\Device;
 use Fleetbase\FleetOps\Models\Vehicle;
@@ -39,11 +40,12 @@ class FleetOpsInternalDeviceControllerProbe extends DeviceController
 
 class FleetOpsInternalDeviceFake extends Device
 {
-    public array $attachedTo = [];
-    public array $detaches   = [];
-    public array $loads      = [];
-    public bool $throwAttach = false;
-    public bool $throwDetach = false;
+    public array $attachedTo          = [];
+    public array $detaches            = [];
+    public array $loads               = [];
+    public bool $throwAttach          = false;
+    public bool $throwDetach          = false;
+    public bool $throwAlreadyAttached = false;
 
     public function attachTo(Model $attachable): bool
     {
@@ -51,6 +53,10 @@ class FleetOpsInternalDeviceFake extends Device
             throw new RuntimeException('attach failed');
         }
 
+        if ($this->throwAlreadyAttached) {
+            throw DeviceAlreadyAttachedException::for('Truck 1');
+        }
+
         $this->attachedTo[] = [$attachable::class, $attachable->uuid];
         $this->forceFill([
             'attachable_type' => $attachable::class,
@@ -350,6 +356,12 @@ test('internal device controller reports lookup and persistence failures', funct
             ->attach(new Request(['vehicle' => 'vehicle_public']), 'device_public')
     );
 
+    $conflictDevice                       = fleetopsInternalDevice();
+    $conflictDevice->throwAlreadyAttached = true;
+    $conflictResponse                     = fleetopsInternalDeviceController($conflictDevice, fleetopsInternalDeviceVehicle())
+        ->attach(new Request(['vehicle' => 'vehicle_public']), 'device_public');
+    $conflict = fleetopsInternalDeviceJson($conflictResponse);
+
     $detachFailureDevice              = fleetopsInternalDevice();
     $detachFailureDevice->throwDetach = true;
     $detachFailure                    = fleetopsInternalDeviceJson(
@@ -365,6 +377,9 @@ test('internal device controller reports lookup and persistence failures', funct
     expect($missingDevice['error'])->toBe('Device not found or not available for this organization.')
         ->and($missingVehicle['error'])->toBe('Vehicle not found or not available for this organization.')
         ->and($attachFailure['error'])->toBe('Unable to attach device to vehicle. Please try again or contact support.')
+        // A device installed elsewhere is refused with a conflict, not re-homed or reported as a crash.
+        ->and($conflict['error'])->toBe('Device is already attached to Truck 1. Detach it before attaching it elsewhere.')
+        ->and($conflictResponse->getStatusCode())->toBe(409)
         ->and($detachFailure['error'])->toBe('Unable to detach device from vehicle. Please try again or contact support.')
         ->and($missingDetachDevice['error'])->toBe('Device not found or not available for this organization.');
 });

package/server/tests/Feature/Http/Internal/DriverControllerCreateRecordTest.php

@@ -109,7 +109,7 @@ function fleetopsInternalDriverCreateBoot(): SQLiteConnection
         'companies'       => ['uuid', 'public_id', 'name', 'owner_uuid', 'timezone', 'options'],
         'company_users'   => ['uuid', 'company_uuid', 'user_uuid', 'status'],
         'vehicles'        => ['uuid', 'public_id', 'company_uuid', 'driver_uuid'],
-        'custom_fields'   => ['uuid', 'company_uuid', 'subject_uuid', 'subject_type', 'name', 'label'],
+        'custom_fields'   => ['uuid', 'public_id', 'company_uuid', 'subject_uuid', 'subject_type', 'name', 'label'],
         'roles'           => ['name', 'guard_name', 'company_uuid'],
         'model_has_roles' => ['role_id', 'model_type', 'model_uuid'],
     ];

package/server/tests/Feature/Http/Internal/DriverControllerExistingUserAdoptionTest.php

@@ -220,7 +220,7 @@ function fleetopsDriverAdoptionBoot(array $validatorErrors): SQLiteConnection
         'companies'             => ['uuid', 'public_id', 'name', 'owner_uuid', 'timezone', 'options', 'status', '_key'],
         'company_users'         => ['uuid', 'public_id', 'company_uuid', 'user_uuid', 'status', '_key'],
         'vehicles'              => ['uuid', 'public_id', 'company_uuid', 'driver_uuid'],
-        'custom_fields'         => ['uuid', 'company_uuid', 'subject_uuid', 'subject_type', 'name', 'label'],
+        'custom_fields'         => ['uuid', 'public_id', 'company_uuid', 'subject_uuid', 'subject_type', 'name', 'label'],
         'custom_field_values'   => ['uuid', 'public_id', 'company_uuid', 'custom_field_uuid', 'subject_uuid', 'subject_type', 'value', 'value_type', '_key'],
         'settings'              => ['key', 'value'],
         'permissions'           => ['name', 'guard_name', 'service', 'description'],

package/server/tests/Feature/Http/Internal/HubControllerTest.php

@@ -163,6 +163,9 @@ test('internal hub maintenance builds kpis sections docs and service actions', f
         5, // overdue work orders
         6, // open maintenance
         7, // high priority maintenance
+        1, // published inspection forms
+        2, // failed inspections awaiting review
+        3, // unresolved failed inspections
         8, // low stock parts
         9, // equipment
     ], 'company-maintenance');
@@ -175,32 +178,55 @@ test('internal hub maintenance builds kpis sections docs and service actions', f
             'value' => 2,
             'tone'  => 'rose',
         ])
+        // Failed inspections take the third tile: a failed DVIR is a truck that
+        // should not be on the road, which outranks the parts shelf.
         ->and($payload['kpis'][2])->toMatchArray([
+            'key'   => 'failed_inspections',
+            'value' => 2,
+            'tone'  => 'rose',
+            'route' => 'maintenance.inspection-submissions',
+        ])
+        ->and($payload['kpis'][3])->toMatchArray([
             'key'   => 'open_work_orders',
             'value' => 4,
             'tone'  => 'amber',
         ])
         ->and(array_column($payload['actions'], 'key'))->toBe([
+            'failed_inspections',
             'overdue_schedules',
             'overdue_work_orders',
             'high_priority_maintenance',
             'upcoming_service',
-            'low_stock_parts',
+        ])
+        ->and($payload['actions'][0])->toMatchArray([
+            'description' => '2 failed inspections need issue or work order follow-up.',
+            'tone'        => 'warning',
+            'route'       => 'maintenance.inspection-submissions',
         ])
         ->and(array_column($payload['sections'], 'key'))->toBe([
+            'inspections',
             'planning',
             'records',
         ])
         ->and($payload['sections'][0]['links'][0])->toMatchArray([
+            'label' => 'Inspection Forms',
+            'count' => 1,
+        ])
+        ->and($payload['sections'][0]['links'][1])->toMatchArray([
+            'label' => 'Inspections',
+            'count' => 3,
+        ])
+        ->and($payload['sections'][1]['links'][0])->toMatchArray([
             'label' => 'Schedules',
             'count' => 5,
         ])
         ->and(array_column($payload['docs'], 'label'))->toBe([
             'Schedules',
+            'Inspections',
             'Work Orders',
             'Equipment',
             'Parts',
         ])
-        ->and($controller->countCalls)->toHaveCount(8)
+        ->and($controller->countCalls)->toHaveCount(11)
         ->and(array_unique($controller->countCalls))->toBe(['company-maintenance']);
 });

package/server/tests/Feature/Http/Internal/LiveControllerEndpointsTest.php

@@ -123,6 +123,8 @@ function fleetopsLiveEndpointsBoot(): SQLiteConnection
         'users'             => ['uuid', 'public_id', 'company_uuid', 'name', 'phone', 'email', 'status', 'type', 'avatar_uuid'],
         'vehicles'          => ['uuid', 'public_id', 'company_uuid', 'vendor_uuid', 'photo_uuid', 'name', 'display_name', 'plate_number', 'serial_number', 'fuel_card_number', 'vin', 'vin_data', 'make', 'model', 'year', 'trim', 'class', 'color', 'call_sign', 'specs', 'telematics', 'status', 'online', 'location', 'meta', 'avatar_url', 'internal_id', 'speed', 'heading', 'altitude'],
         'devices'           => ['uuid', 'public_id', 'company_uuid', 'device_id', 'device_type', 'device_provider', 'owner_uuid', 'owner_type', 'attachable_uuid', 'attachable_type', 'status'],
+        'assets'            => ['uuid', 'public_id', 'company_uuid', 'asset_class', 'name', 'display_name', 'type', 'plate_number', 'status', 'last_online_at', 'online'],
+        'asset_connections' => ['uuid', 'public_id', 'company_uuid', 'connector_type', 'connector_uuid', 'connected_type', 'connected_uuid', 'active_connected_uuid', 'active_connector_position', 'relationship_type', 'position', 'connected_at', 'disconnected_at', 'source'],
         'vendors'           => ['uuid', 'public_id', 'company_uuid', 'name'],
         'files'             => ['uuid', 'public_id', 'company_uuid', 'type', 'path', 'disk'],
         'entities'          => ['uuid', 'public_id', 'company_uuid', 'payload_uuid', 'name', 'type'],
@@ -216,6 +218,16 @@ test('drivers and vehicles list located records within viewport bounds', functio
         ['uuid' => 'driver-2', 'company_uuid' => 'company-1', 'user_uuid' => 'user-1', 'online' => '1', 'location' => null],
     ]);
     $connection->table('vehicles')->insert(['uuid' => 'vehicle-1', 'company_uuid' => 'company-1', 'name' => 'Truck', 'location' => 'POINT(1 1)']);
+    $connection->table('assets')->insert([
+        ['uuid' => 'trailer-1', 'company_uuid' => 'company-1', 'asset_class' => 'trailer', 'name' => 'Reefer 12', 'type' => 'reefer', 'plate_number' => 'TRL-12', 'status' => 'in_use'],
+        ['uuid' => 'trailer-2', 'company_uuid' => 'company-1', 'asset_class' => 'trailer', 'name' => 'Flatbed 3', 'type' => 'flatbed', 'plate_number' => null, 'status' => 'available'],
+    ]);
+    $connection->table('asset_connections')->insert([
+        // Active towing connection: appears on the vehicle's map popover.
+        ['uuid' => 'connection-1', 'company_uuid' => 'company-1', 'connector_type' => 'Fleetbase\\FleetOps\\Models\\Vehicle', 'connector_uuid' => 'vehicle-1', 'connected_type' => 'Fleetbase\\FleetOps\\Models\\Trailer', 'connected_uuid' => 'trailer-1', 'active_connected_uuid' => 'trailer-1', 'relationship_type' => 'towing', 'position' => '1', 'connected_at' => '2026-09-01 08:00:00', 'source' => 'manual'],
+        // Ended connection: history only, never surfaced as a current trailer.
+        ['uuid' => 'connection-2', 'company_uuid' => 'company-1', 'connector_type' => 'Fleetbase\\FleetOps\\Models\\Vehicle', 'connector_uuid' => 'vehicle-1', 'connected_type' => 'Fleetbase\\FleetOps\\Models\\Trailer', 'connected_uuid' => 'trailer-2', 'relationship_type' => 'towing', 'position' => '1', 'connected_at' => '2026-08-01 08:00:00', 'disconnected_at' => '2026-08-02 08:00:00', 'source' => 'manual'],
+    ]);
 
     $drivers = (new LiveController())->drivers(Request::create('/x', 'GET'));
     expect($drivers->count())->toBe(1);
@@ -228,6 +240,13 @@ test('drivers and vehicles list located records within viewport bounds', functio
 
     $vehicles = (new LiveController())->vehicles(Request::create('/x', 'GET'));
     expect($vehicles->count())->toBe(1);
+
+    // The live feed eager-loads the trailers currently coupled to each vehicle so the
+    // map popover can list them without a second request per marker.
+    $vehicle = $vehicles->collection->first()->resource;
+    expect($vehicle->relationLoaded('currentTrailers'))->toBeTrue()
+        ->and($vehicle->relationLoaded('devices'))->toBeTrue()
+        ->and($vehicle->currentTrailers->pluck('uuid')->all())->toBe(['trailer-1']);
     expect((new LiveController())->vehicles(Request::create('/x', 'GET', ['bounds' => [0, 0, 1, 1]]))->count())->toBe(0);
 });
 

package/server/tests/Feature/Http/Internal/OrderControllerCreateRecordTest.php

@@ -201,7 +201,7 @@ function fleetopsInternalOrderCreateBoot(array $validatorErrors = []): SQLiteCon
         'tracking_statuses'   => ['uuid', 'public_id', 'company_uuid', 'tracking_number_uuid', 'code', 'status', 'details', 'location', 'city', 'province', 'country', '_key'],
         'contacts'            => ['uuid', 'public_id', 'company_uuid', 'name'],
         'vendors'             => ['uuid', 'public_id', 'company_uuid', 'name'],
-        'custom_fields'       => ['uuid', 'company_uuid', 'subject_uuid', 'subject_type', 'name', 'label'],
+        'custom_fields'       => ['uuid', 'public_id', 'company_uuid', 'subject_uuid', 'subject_type', 'name', 'label'],
         'custom_field_values' => ['uuid', 'company_uuid', 'custom_field_uuid', 'subject_uuid', 'subject_type', 'value'],
         'companies'           => ['uuid', 'public_id', 'name', 'options'],
     ];