@fleetbase/fleetops-engine 0.6.55 → 0.6.56

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

@@ -194,19 +194,30 @@ class TelematicService
     {
         $device = $this->linkDevice($telematic, $provider->normalizeDevice($payload));
 
-        $event = null;
+        $event  = null;
+        $events = [];
         try {
-            $eventData = $provider->normalizeEvent($payload);
-            if ($this->hasEventSignal($eventData)) {
-                $event = $this->storeDeviceEvent($telematic, $eventData, $device);
+            $eventPayloads = method_exists($provider, 'normalizeEvents') ? $provider->normalizeEvents($payload) : [];
+            if (empty($eventPayloads)) {
+                $eventPayloads = [$provider->normalizeEvent($payload)];
+            }
+
+            foreach ($eventPayloads as $eventData) {
+                if ($this->hasEventSignal($eventData)) {
+                    $storedEvent = $this->storeDeviceEvent($telematic, $eventData, $device);
+                    $events[]    = $storedEvent;
+                    $event ??= $storedEvent;
+                }
             }
         } catch (\Throwable) {
-            $event = null;
+            $event  = null;
+            $events = [];
         }
 
         return [
             'device'  => $device,
             'event'   => $event,
+            'events'  => $events,
             'sensors' => $this->storeSnapshotSensors($telematic, $provider, $payload, $device),
         ];
     }
@@ -663,6 +674,10 @@ class TelematicService
             $vehicle->altitude = $eventData['altitude'];
         }
 
+        if (array_key_exists('odometer', $eventData) && $eventData['odometer'] !== null) {
+            $vehicle->odometer = $eventData['odometer'];
+        }
+
         $vehicle->telematics = array_merge($vehicle->telematics ?? [], [
             'last_event_uuid'     => $event->uuid,
             'last_event_id'       => $event->public_id,
@@ -757,13 +772,17 @@ class TelematicService
         return collect($rawSensors)
             ->map(function ($sensor, $name) {
                 if (is_array($sensor)) {
-                    return array_merge(['name' => $name], $sensor);
+                    return array_merge([
+                        'sensor_key' => $name,
+                        'name'       => $name,
+                    ], $sensor);
                 }
 
                 return [
-                    'name'  => $name,
-                    'type'  => $name,
-                    'value' => $sensor,
+                    'sensor_key' => $name,
+                    'name'       => $name,
+                    'type'       => $name,
+                    'value'      => $sensor,
                 ];
             })
             ->values()

package/server/src/routes.php

@@ -105,6 +105,61 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                 $router->put('{id}', 'FuelReportController@update');
                 $router->delete('{id}', 'FuelReportController@delete');
             });
+            // fuel-transactions routes
+            $router->group(['prefix' => 'fuel-transactions'], function () use ($router) {
+                $router->post('/', 'FuelTransactionController@create');
+                $router->get('/', 'FuelTransactionController@query');
+                $router->get('{id}', 'FuelTransactionController@find');
+                $router->put('{id}', 'FuelTransactionController@update');
+                $router->delete('{id}', 'FuelTransactionController@delete');
+                $router->post('{id}/match-vehicle', 'FuelTransactionController@matchVehicle');
+                $router->post('{id}/match-order', 'FuelTransactionController@matchOrder');
+                $router->post('{id}/reprocess', 'FuelTransactionController@reprocess');
+                $router->post('{id}/review', 'FuelTransactionController@review');
+            });
+            // equipment routes
+            $router->group(['prefix' => 'equipment'], function () use ($router) {
+                $router->post('/', 'EquipmentController@create');
+                $router->get('/', 'EquipmentController@query');
+                $router->get('{id}', 'EquipmentController@find');
+                $router->put('{id}', 'EquipmentController@update');
+                $router->delete('{id}', 'EquipmentController@delete');
+            });
+            // parts routes
+            $router->group(['prefix' => 'parts'], function () use ($router) {
+                $router->post('/', 'PartController@create');
+                $router->get('/', 'PartController@query');
+                $router->get('{id}', 'PartController@find');
+                $router->put('{id}', 'PartController@update');
+                $router->delete('{id}', 'PartController@delete');
+            });
+            // work-orders routes
+            $router->group(['prefix' => 'work-orders'], function () use ($router) {
+                $router->post('/', 'WorkOrderController@create');
+                $router->get('/', 'WorkOrderController@query');
+                $router->get('{id}', 'WorkOrderController@find');
+                $router->put('{id}', 'WorkOrderController@update');
+                $router->delete('{id}', 'WorkOrderController@delete');
+                $router->post('{id}/send', 'WorkOrderController@send');
+            });
+            // devices routes
+            $router->group(['prefix' => 'devices'], function () use ($router) {
+                $router->post('/', 'DeviceController@create');
+                $router->get('/', 'DeviceController@query');
+                $router->get('{id}', 'DeviceController@find');
+                $router->put('{id}', 'DeviceController@update');
+                $router->delete('{id}', 'DeviceController@delete');
+                $router->post('{id}/attach', 'DeviceController@attach');
+                $router->post('{id}/detach', 'DeviceController@detach');
+            });
+            // sensors routes
+            $router->group(['prefix' => 'sensors'], function () use ($router) {
+                $router->post('/', 'SensorController@create');
+                $router->get('/', 'SensorController@query');
+                $router->get('{id}', 'SensorController@find');
+                $router->put('{id}', 'SensorController@update');
+                $router->delete('{id}', 'SensorController@delete');
+            });
             // orders routes
             $router->group(['prefix' => 'orders', 'middleware' => []], function () use ($router) {
                 $router->post('/', 'OrderController@create');
@@ -315,7 +370,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->get('facilitators/{id}', $controller('getAsFacilitator'));
                                 $router->get('customers/{id}', $controller('getAsCustomer'));
                                 $router->post('{id}/convert-to-vendor', $controller('convertToVendor'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
                         $router->fleetbaseRoutes(
@@ -330,7 +384,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->post('{id}/assign-vehicle', $controller('assignVehicle'));
                                 $router->post('{id}/unassign-vehicle', $controller('unassignVehicle'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                                 $router->post('import', $controller('import'));
                                 // Driver scheduling endpoints
                                 $router->get('{id}/schedule-items', $controller('scheduleItems'));
@@ -349,7 +402,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->post('remove-vehicle', $controller('removeVehicle'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->post('import', $controller('import'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
                         $router->fleetbaseRoutes(
@@ -357,7 +409,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                             function ($router, $controller) {
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->post('import', $controller('import'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
                         $router->fleetbaseRoutes(
@@ -385,14 +436,12 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                             function ($router, $controller) {
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->post('import', $controller('import'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
                         $router->fleetbaseRoutes(
                             'integrated-vendors',
                             function ($router, $controller) {
                                 $router->get('supported', $controller('getSupported'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
                         $router->fleetbaseRoutes(
@@ -421,7 +470,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->patch('start', $controller('start'));
                                 // Scheduler: set scheduled_at + driver without triggering dispatch
                                 $router->patch('schedule', $controller('scheduleOrder'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                             }
                         );
@@ -434,7 +482,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->get('lookup', $controller('geocode'))->middleware(['cache.headers:private;max_age=3600']);
                                 $router->get('avatars', $controller('avatars'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                                 $router->post('import', $controller('import'));
                             }
                         );
@@ -449,7 +496,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                             'service-areas',
                             function ($router, $controller) {
                                 $router->match(['get', 'post'], 'export', $controller('export'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
                         $router->group(
@@ -473,7 +519,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                         $router->fleetbaseRoutes(
                             'service-rates',
                             function ($router, $controller) {
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                                 $router->get('for-route', $controller('getServicesForRoute'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                             }
@@ -493,7 +538,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->post('{id}/detach-device', $controller('detachDevice'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->post('import', $controller('import'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
                         $router->fleetbaseRoutes('vehicle-devices');
@@ -509,18 +553,22 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->delete('{id}/personnels/{contact}', $controller('removeVendorPersonnel'));
                                 $router->post('{id}/assign-driver', $controller('assignDriver'));
                                 $router->post('{id}/remove-driver', $controller('removeDriver'));
-                                $router->delete('bulk-delete', $controller('bulkDelete'));
                                 $router->post('import', $controller('import'));
                             }
                         );
-                        $router->fleetbaseRoutes('devices');
+                        $router->fleetbaseRoutes('devices', function ($router, $controller) {
+                            $router->match(['get', 'post'], 'export', $controller('export'));
+                        });
                         $router->post('devices/{id}/attach', 'DeviceController@attach');
                         $router->post('devices/{id}/detach', 'DeviceController@detach');
                         $router->fleetbaseRoutes('device-events', function ($router, $controller) {
                             $router->post('{id}/mark-processed', $controller('markProcessed'));
                         });
-                        $router->fleetbaseRoutes('sensors');
+                        $router->fleetbaseRoutes('sensors', function ($router, $controller) {
+                            $router->match(['get', 'post'], 'export', $controller('export'));
+                        });
                         $router->fleetbaseRoutes('telematics', function ($router, $controller) {
+                            $router->match(['get', 'post'], 'export', $controller('export'));
                             $router->get('providers', $controller('providers'));
                             $router->get('{id}/logs', $controller('logs'));
                             $router->get('{id}/devices', $controller('devices'));
@@ -530,6 +578,7 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                             $router->post('{key}/test-credentials', $controller('testCredentials'));
                         });
                         $router->fleetbaseRoutes('maintenance-schedules', function ($router, $controller) {
+                            $router->match(['get', 'post'], 'export', $controller('export'));
                             $router->post('import', $controller('import'));
                             $router->post('{id}/pause', $controller('pause'));
                             $router->post('{id}/resume', $controller('resume'));
@@ -538,19 +587,23 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                             $router->get('{id}/ical', $controller('ical'));
                         });
                         $router->fleetbaseRoutes('work-orders', function ($router, $controller) {
+                            $router->match(['get', 'post'], 'export', $controller('export'));
                             $router->post('import', $controller('import'));
                             $router->post('{id}/send', $controller('sendEmail'));
                         });
                         $router->fleetbaseRoutes('maintenances', function ($router, $controller) {
+                            $router->match(['get', 'post'], 'export', $controller('export'));
                             $router->post('import', $controller('import'));
                             $router->post('{id}/line-items', $controller('addLineItem'));
                             $router->put('{id}/line-items/{index}', $controller('updateLineItem'));
                             $router->delete('{id}/line-items/{index}', $controller('removeLineItem'));
                         });
                         $router->fleetbaseRoutes('equipment', function ($router, $controller) {
+                            $router->match(['get', 'post'], 'export', $controller('export'));
                             $router->post('import', $controller('import'));
                         });
                         $router->fleetbaseRoutes('parts', function ($router, $controller) {
+                            $router->match(['get', 'post'], 'export', $controller('export'));
                             $router->post('import', $controller('import'));
                         });
                         $router->fleetbaseRoutes('warranties');

package/server/tests/ExportCoverageTest.php

@@ -0,0 +1,79 @@
+<?php
+
+use Fleetbase\FleetOps\Exports\DeviceExport;
+use Fleetbase\FleetOps\Exports\MaintenanceExport;
+use Fleetbase\FleetOps\Exports\MaintenanceScheduleExport;
+use Fleetbase\FleetOps\Exports\VehicleExport;
+use Fleetbase\FleetOps\Exports\WorkOrderExport;
+
+test('expanded export headings include important operational fields', function () {
+    expect((new VehicleExport())->headings())
+        ->toContain('Plate Number')
+        ->toContain('VIN')
+        ->toContain('Fuel Card Number')
+        ->toContain('Status')
+        ->toContain('Body Type')
+        ->toContain('Usage Type')
+        ->toContain('Transmission')
+        ->toContain('Measurement System')
+        ->toContain('Engine Number')
+        ->toContain('Engine Size (L)')
+        ->toContain('Payload Capacity (kg)')
+        ->toContain('Payload Volume (m3)')
+        ->toContain('DPF Equipped')
+        ->toContain('Insurance Value')
+        ->toContain('Loan Amount')
+        ->toContain('Vehicle Skills')
+        ->toContain('Updated At');
+
+    expect((new WorkOrderExport())->headings())
+        ->toContain('Assignee')
+        ->toContain('Target')
+        ->toContain('Due At')
+        ->toContain('Completion Percentage');
+
+    expect((new DeviceExport())->headings())
+        ->toContain('Connection Status')
+        ->toContain('Attached To')
+        ->toContain('Telematic Provider')
+        ->toContain('Last Seen');
+});
+
+test('relationship exports use readable name columns', function () {
+    expect((new VehicleExport())->headings())
+        ->toContain('Driver')
+        ->toContain('Vendor');
+
+    expect((new WorkOrderExport())->headings())
+        ->toContain('Assignee')
+        ->toContain('Target');
+
+    expect((new MaintenanceExport())->headings())
+        ->toContain('Asset')
+        ->toContain('Performed By');
+
+    expect((new MaintenanceScheduleExport())->headings())
+        ->toContain('Subject')
+        ->toContain('Default Assignee');
+});
+
+test('vehicle export helpers format spreadsheet friendly values', function () {
+    $export = new VehicleExport();
+    $helper = fn (string $method, ...$arguments) => (new ReflectionMethod($export, $method))->invoke($export, ...$arguments);
+
+    expect($helper('yesNo', true))->toBe('Yes')
+        ->and($helper('yesNo', false))->toBe('No')
+        ->and($helper('yesNo', null))->toBeNull()
+        ->and($helper('joinSkills', ['hazmat', 'refrigerated']))->toBe('hazmat, refrigerated')
+        ->and($helper('joinSkills', []))->toBeNull();
+});
+
+test('resources with visible export actions have backend export routes', function () {
+    $routes = file_get_contents(dirname(__DIR__) . '/src/routes.php');
+
+    foreach (['devices', 'sensors', 'telematics', 'maintenance-schedules', 'work-orders', 'maintenances', 'equipment', 'parts'] as $resource) {
+        expect($routes)->toContain("\$router->fleetbaseRoutes('{$resource}'");
+    }
+
+    expect(substr_count($routes, "\$router->match(['get', 'post'], 'export', \$controller('export'));"))->toBeGreaterThanOrEqual(19);
+});

package/server/tests/MetricsRegistryTest.php

@@ -4,6 +4,7 @@ use Fleetbase\FleetOps\Support\Metrics\AbstractMetric;
 use Fleetbase\FleetOps\Support\Metrics\OrdersInProgressMetric;
 use Fleetbase\FleetOps\Support\Metrics\Registry;
 use Fleetbase\FleetOps\Support\Metrics\TotalTimeTraveledMetric;
+use Fleetbase\Models\Transaction;
 
 test('registry exposes every known metric slug', function () {
     $slugs = Registry::slugs();
@@ -66,13 +67,52 @@ test('money metrics return float values to preserve cents', function () {
 });
 
 test('money metrics filter by currency to avoid mixed-currency sums', function () {
-    $earnings  = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/EarningsMetric.php');
-    $fuelCosts = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/FuelCostsMetric.php');
-    $aov       = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/AvgOrderValueMetric.php');
+    $earnings      = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/EarningsMetric.php');
+    $fuelCosts     = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/FuelCostsMetric.php');
+    $aov           = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/AvgOrderValueMetric.php');
+    $activeRevenue = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/ActiveRevenueQuery.php');
 
-    expect($earnings)->toContain("->where('currency'");
+    expect($earnings)->toContain('ActiveRevenueQuery::forCompany');
     expect($fuelCosts)->toContain("->where('currency'");
-    expect($aov)->toContain("->where('currency'");
+    expect($aov)->toContain('ActiveRevenueQuery::forCompany');
+    expect($activeRevenue)->toContain("->where('currency'");
+});
+
+test('earnings use the shared active revenue query', function () {
+    $earnings     = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/EarningsMetric.php');
+    $aov          = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/AvgOrderValueMetric.php');
+    $revenueTrend = file_get_contents(dirname(__DIR__) . '/src/Support/Analytics/RevenueTrend.php');
+
+    expect($earnings)->toContain('ActiveRevenueQuery::forCompany');
+    expect($aov)->toContain('ActiveRevenueQuery::forCompany');
+    expect($revenueTrend)->toContain('ActiveRevenueQuery::forCompany');
+});
+
+test('active revenue query excludes inactive financial and operational lifecycle records', function () {
+    $source = file_get_contents(dirname(__DIR__) . '/src/Support/Metrics/ActiveRevenueQuery.php');
+
+    expect($source)->toContain("where('direction', Transaction::DIRECTION_CREDIT)");
+    expect($source)->toContain("whereIn('status', self::ACTIVE_STATUSES)");
+    expect($source)->toContain("whereNull('voided_at')");
+    expect($source)->toContain("whereNull('reversed_at')");
+    expect($source)->toContain("whereNull('parent_transaction_uuid')");
+    expect($source)->toContain('excludeInactiveOrders');
+    expect($source)->toContain('excludeInactiveInvoices');
+    expect($source)->toContain('ledger_invoices.deleted_at');
+    expect($source)->toContain('orders.deleted_at');
+    expect(Fleetbase\FleetOps\Support\Metrics\ActiveRevenueQuery::ACTIVE_STATUSES)->toBe([Transaction::STATUS_SUCCESS]);
+    expect(Fleetbase\FleetOps\Support\Metrics\ActiveRevenueQuery::ACTIVE_STATUSES)->not->toContain('completed');
+    expect(Fleetbase\FleetOps\Support\Metrics\ActiveRevenueQuery::ACTIVE_STATUSES)->not->toContain('paid');
+});
+
+test('active revenue query treats invoice status as invalidation only', function () {
+    $inactiveInvoiceStatuses = Fleetbase\FleetOps\Support\Metrics\ActiveRevenueQuery::INACTIVE_INVOICE_STATUSES;
+
+    expect($inactiveInvoiceStatuses)->not->toContain('draft');
+    expect($inactiveInvoiceStatuses)->toContain('void');
+    expect($inactiveInvoiceStatuses)->toContain('voided');
+    expect($inactiveInvoiceStatuses)->toContain('cancelled');
+    expect($inactiveInvoiceStatuses)->toContain('canceled');
 });
 
 test('ordersInProgress uses an explicit allowlist rather than an exclusion list', function () {

package/server/tests/PublicFleetOpsRestEndpointsTest.php

@@ -0,0 +1,191 @@
+<?php
+
+use Fleetbase\FleetOps\Http\Controllers\Api\v1\DeviceController;
+use Fleetbase\FleetOps\Http\Controllers\Api\v1\EquipmentController;
+use Fleetbase\FleetOps\Http\Controllers\Api\v1\FuelTransactionController;
+use Fleetbase\FleetOps\Http\Controllers\Api\v1\PartController;
+use Fleetbase\FleetOps\Http\Controllers\Api\v1\SensorController;
+use Fleetbase\FleetOps\Http\Controllers\Api\v1\WorkOrderController;
+use Fleetbase\FleetOps\Http\Resources\v1\Device;
+use Fleetbase\FleetOps\Http\Resources\v1\Equipment;
+use Fleetbase\FleetOps\Http\Resources\v1\FuelTransaction;
+use Fleetbase\FleetOps\Http\Resources\v1\Part;
+use Fleetbase\FleetOps\Http\Resources\v1\Sensor;
+use Fleetbase\FleetOps\Http\Resources\v1\WorkOrder;
+
+test('new first-class fleetops rest routes are registered in the consumable v1 namespace', function () {
+    $routes = file_get_contents(dirname(__DIR__) . '/src/routes.php');
+
+    foreach (['equipment', 'parts', 'work-orders', 'devices', 'sensors', 'fuel-transactions'] as $prefix) {
+        expect($routes)->toContain("\$router->group(['prefix' => '{$prefix}']");
+    }
+
+    expect($routes)
+        ->toContain('EquipmentController@create')
+        ->toContain('PartController@create')
+        ->toContain('WorkOrderController@send')
+        ->toContain('DeviceController@attach')
+        ->toContain('DeviceController@detach')
+        ->toContain('SensorController@create')
+        ->toContain('FuelTransactionController@matchVehicle')
+        ->toContain('FuelTransactionController@matchOrder')
+        ->toContain('FuelTransactionController@reprocess')
+        ->toContain('FuelTransactionController@review');
+});
+
+test('public fuel transaction api keeps provider naming internal only', function () {
+    $publicRoutes = file_get_contents(dirname(__DIR__) . '/src/routes.php');
+    $publicGroup  = substr($publicRoutes, 0, strpos($publicRoutes, 'Internal FleetOps API Routes'));
+    $controller   = file_get_contents(dirname(__DIR__) . '/src/Http/Controllers/Api/v1/FuelTransactionController.php');
+
+    expect($publicGroup)
+        ->toContain("['prefix' => 'fuel-transactions']")
+        ->not->toContain("['prefix' => 'fuel-provider-transactions']")
+        ->and($controller)
+        ->toContain('class FuelTransactionController')
+        ->toContain('FuelProviderTransaction')
+        ->toContain("'FuelTransaction resource not found.'");
+});
+
+test('new public controllers expose the expected rest methods', function () {
+    $controllers = [
+        EquipmentController::class       => ['create', 'query', 'find', 'update', 'delete'],
+        PartController::class            => ['create', 'query', 'find', 'update', 'delete'],
+        WorkOrderController::class       => ['create', 'query', 'find', 'update', 'delete', 'send'],
+        DeviceController::class          => ['create', 'query', 'find', 'update', 'delete', 'attach', 'detach'],
+        SensorController::class          => ['create', 'query', 'find', 'update', 'delete'],
+        FuelTransactionController::class => ['create', 'query', 'find', 'update', 'delete', 'matchVehicle', 'matchOrder', 'reprocess', 'review'],
+    ];
+
+    foreach ($controllers as $controller => $methods) {
+        foreach ($methods as $method) {
+            expect(method_exists($controller, $method))->toBeTrue("{$controller}::{$method} missing");
+        }
+    }
+});
+
+test('new public resources preserve internal uuid fields behind internal request checks', function () {
+    foreach ([Equipment::class, Part::class, WorkOrder::class, Device::class, Sensor::class, FuelTransaction::class] as $resource) {
+        expect(class_exists($resource))->toBeTrue();
+    }
+
+    $internalFields = [
+        'Equipment.php'       => ['uuid', 'company_uuid', 'warranty_uuid', 'photo_uuid', 'equipable_uuid'],
+        'Part.php'            => ['uuid', 'company_uuid', 'vendor_uuid', 'warranty_uuid', 'photo_uuid', 'asset_uuid'],
+        'Device.php'          => ['uuid', 'company_uuid', 'telematic_uuid', 'attachable_uuid', 'warranty_uuid', 'photo_uuid'],
+        'Sensor.php'          => ['uuid', 'company_uuid', 'device_uuid', 'warranty_uuid', 'telematic_uuid', 'photo_uuid', 'sensorable_uuid'],
+        'FuelTransaction.php' => ['uuid', 'fuel_provider_connection_uuid', 'fuel_report_uuid', 'vehicle_uuid', 'driver_uuid', 'order_uuid'],
+        'WorkOrder.php'       => ['uuid', 'company_uuid', 'schedule_uuid', 'created_by_uuid', 'updated_by_uuid', 'target_uuid', 'assignee_uuid'],
+    ];
+
+    foreach ($internalFields as $resourceFile => $fields) {
+        $source = file_get_contents(dirname(__DIR__) . '/src/Http/Resources/v1/' . $resourceFile);
+
+        expect($source)->toContain("'id'");
+
+        foreach ($fields as $field) {
+            expect($source)
+                ->toContain("'{$field}'")
+                ->toMatch("/'{$field}'\\s*=>\\s*\\\$this->when\\(Http::isInternalRequest\\(\\)/");
+        }
+    }
+});
+
+test('new shared resources do not expose unguarded uuid fields', function () {
+    foreach ([
+        'Equipment.php',
+        'Part.php',
+        'Device.php',
+        'Sensor.php',
+        'FuelTransaction.php',
+        'WorkOrder.php',
+    ] as $resourceFile) {
+        $source = file_get_contents(dirname(__DIR__) . '/src/Http/Resources/v1/' . $resourceFile);
+
+        preg_match_all("/'([^']*uuid)'\\s*=>\\s*([^,\\n]+)/i", $source, $matches, PREG_SET_ORDER);
+
+        foreach ($matches as $match) {
+            expect($match[2])->toContain('Http::isInternalRequest()');
+        }
+    }
+});
+
+test('new shared resources preserve public and internal relationship shapes', function () {
+    foreach ([
+        'Equipment.php',
+        'Part.php',
+        'Device.php',
+        'Sensor.php',
+        'FuelTransaction.php',
+    ] as $resourceFile) {
+        $source = file_get_contents(dirname(__DIR__) . '/src/Http/Resources/v1/' . $resourceFile);
+
+        expect($source)
+            ->toContain('resolveLoadedRelation')
+            ->toContain('Resolve::httpResourceForModel($model)')
+            ->toContain('$model->public_id');
+    }
+});
+
+test('new public resolver rejects uuid lookup while preserving public and internal identifiers', function () {
+    $resolver = file_get_contents(dirname(__DIR__) . '/src/Http/Controllers/Api/v1/Concerns/ResolvesFleetOpsApiResources.php');
+
+    expect($resolver)
+        ->not->toContain("where('uuid', \$id)")
+        ->not->toContain("orWhere('uuid', \$id)")
+        ->toContain("orWhere('public_id', \$id)")
+        ->toContain("orWhere('internal_id', \$id)")
+        ->toContain('rejectUuidIdentifiers')
+        ->toContain('Use public_id or internal_id values instead');
+});
+
+test('public controllers reject uuid shaped request keys', function () {
+    foreach ([
+        'EquipmentController.php',
+        'PartController.php',
+        'WorkOrderController.php',
+        'DeviceController.php',
+        'SensorController.php',
+        'FuelTransactionController.php',
+    ] as $controllerFile) {
+        $source = file_get_contents(dirname(__DIR__) . '/src/Http/Controllers/Api/v1/' . $controllerFile);
+
+        expect($source)->toContain('rejectUuidIdentifiers($request)');
+    }
+});
+
+test('new public list endpoints have company scoped filters', function () {
+    foreach ([
+        'EquipmentFilter.php',
+        'PartFilter.php',
+        'WorkOrderFilter.php',
+        'DeviceFilter.php',
+        'SensorFilter.php',
+        'FuelProviderTransactionFilter.php',
+    ] as $filterFile) {
+        $source = file_get_contents(dirname(__DIR__) . '/src/Http/Filter/' . $filterFile);
+
+        expect($source)
+            ->toContain('public function queryForPublic()')
+            ->toContain("where('company_uuid', \$this->session->get('company'))");
+    }
+});
+
+test('fuel transaction filter applies public company scoping and public id relation filters without raw uuid matching', function () {
+    $filter = file_get_contents(dirname(__DIR__) . '/src/Http/Filter/FuelProviderTransactionFilter.php');
+
+    expect($filter)
+        ->toContain('public function queryForPublic()')
+        ->toContain('$this->queryForInternal();')
+        ->toContain('public function vehicle(?string $vehicle)')
+        ->toContain('public function driver(?string $driver)')
+        ->toContain('public function order(?string $order)')
+        ->toContain('public function fuelReport(?string $fuelReport)')
+        ->toContain("where('public_id', \$identifier)")
+        ->toContain("orWhere('internal_id', \$identifier)")
+        ->toContain('if ($allowUuid)')
+        ->not->toContain("where('vehicle_uuid', \$vehicle)")
+        ->not->toContain("where('driver_uuid', \$driver)")
+        ->not->toContain("where('order_uuid', \$order)")
+        ->not->toContain("where('fuel_report_uuid', \$fuelReport)");
+});