@fleetbase/fleetops-engine 0.6.65 → 0.6.67

package/server/src/Support/Telematics/Telemetry/Sample.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Telematics\Telemetry;
+
+use Illuminate\Support\Carbon;
+
+/** Normalized telemetry validation and cross-transport signal identity. */
+class Sample
+{
+    public static function timestamp(mixed $value): ?string
+    {
+        if ($value === null || $value === '' || is_bool($value) || (!is_string($value) && !is_numeric($value))) {
+            return null;
+        }
+        try {
+            $time = is_numeric($value)
+                ? Carbon::createFromTimestampUTC((float) $value > 9999999999 ? (float) $value / 1000 : (float) $value)
+                : Carbon::parse($value, 'UTC')->utc();
+
+            return $time->toISOString();
+        } catch (\Throwable) {
+            return null;
+        }
+    }
+
+    public static function validPosition(array $event): bool
+    {
+        $lat  = data_get($event, 'location.lat');
+        $lng  = data_get($event, 'location.lng');
+        $time = self::timestamp($event['occurred_at'] ?? null);
+
+        return is_numeric($lat) && is_numeric($lng) && is_finite((float) $lat) && is_finite((float) $lng)
+            && $lat >= -90 && $lat <= 90 && $lng >= -180 && $lng <= 180
+            && $time !== null && Carbon::parse($time)->lte(now()->addMinutes(5));
+    }
+
+    public static function signalKey(array $event): string
+    {
+        // Receipt/source/envelope differences must not change identity across poll and push.
+        $signal = array_intersect_key($event, array_flip(['device_id', 'occurred_at', 'event_type', 'location', 'speed', 'heading', 'altitude', 'ignition']));
+        ksort($signal);
+        if (isset($signal['location'])) {
+            $signal['location'] = array_map(fn ($v) => $v === null ? null : (float) $v, $signal['location']);
+            ksort($signal['location']);
+        }
+        foreach (['speed', 'heading', 'altitude'] as $field) {
+            if (isset($signal[$field])) {
+                $signal[$field] = (float) $signal[$field];
+            }
+        }
+
+        return hash('sha256', json_encode($signal, JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION));
+    }
+}

package/server/src/routes.php

@@ -14,6 +14,18 @@ use Illuminate\Support\Facades\Route;
 */
 Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\FleetOps\Http\Controllers')->group(
     function ($router) {
+        // Tokenised inspection links, for people with no console login. The
+        // link itself is the credential, so what guards it lives here: a rate
+        // limit per address on every call, and a tighter one on uploads. Each
+        // limiter has its own prefix so the two do not share one counter.
+        // Every answer is JSON, so a refused submission reaches the page with
+        // its reasons instead of as a redirect back to it.
+        $router->prefix('public')->namespace('Public')->middleware([Fleetbase\FleetOps\Http\Middleware\ForceJsonResponse::class, 'throttle:60,1,inspection-public'])->group(function ($router) {
+            $router->get('inspections/forms/{id}', 'PublicInspectionController@show');
+            $router->post('inspections/forms/{id}/submit', 'PublicInspectionController@submit');
+            $router->post('inspections/forms/{id}/files', 'PublicInspectionController@upload')->middleware('throttle:20,1,inspection-upload');
+        });
+
         /*
         |--------------------------------------------------------------------------
         | Consumable FleetOps API Routes
@@ -207,6 +219,20 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                 $router->patch('{id}', 'ManifestController@updateStop');
                 $router->post('{id}', 'ManifestController@updateStop');
             });
+            // inspections — a driver's DVIR. Read the published forms and file
+            // against them; authoring forms and reviewing submissions is fleet
+            // management and stays on the internal namespace. A refused submit
+            // answers 422 in JSON: without ForceJsonResponse, a client that did
+            // not ask for JSON was redirected instead.
+            $router->group(['prefix' => 'inspection-forms', 'middleware' => [Fleetbase\FleetOps\Http\Middleware\ForceJsonResponse::class]], function () use ($router) {
+                $router->get('/', 'InspectionController@queryForms');
+                $router->get('{id}', 'InspectionController@findForm');
+            });
+            $router->group(['prefix' => 'inspections', 'middleware' => [Fleetbase\FleetOps\Http\Middleware\ForceJsonResponse::class]], function () use ($router) {
+                $router->post('/', 'InspectionController@submit');
+                $router->get('/', 'InspectionController@query');
+                $router->get('{id}', 'InspectionController@find');
+            });
 
             // entities routes
             $router->group(['prefix' => 'entities'], function () use ($router) {
@@ -300,6 +326,8 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                 $router->delete('{id}', 'VehicleController@delete');
                 $router->match(['put', 'patch', 'post'], '{id}/track', 'VehicleController@track');
                 $router->get('{id}/trailers', 'TrailerController@vehicleTrailers');
+                // A vehicle's inspection history, for the driver app's vehicle screen.
+                $router->get('{id}/inspections', 'InspectionController@forVehicle')->middleware(Fleetbase\FleetOps\Http\Middleware\ForceJsonResponse::class);
             });
             // trailer routes
             $router->group(['prefix' => 'trailers'], function () use ($router) {
@@ -449,6 +477,7 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                             function ($router, $controller) {
                                 $router->get('providers', $controller('providers'));
                                 $router->post('providers/{provider}/test-credentials', $controller('testCredentials'));
+                                $router->get('{id}/activity', $controller('activity'));
                                 $router->post('{id}/test-connection', $controller('testConnection'));
                                 $router->post('{id}/sync', $controller('sync'));
                             }
@@ -630,6 +659,9 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                             $router->get('{id}/devices', $controller('devices'));
                             $router->post('{id}/link-device', $controller('linkDevice'));
                             $router->post('{id}/discover', $controller('discover'));
+                            $router->get('{id}/telemetry-diagnostics', $controller('telemetryDiagnostics'));
+                            $router->post('{id}/telemetry-webhook', $controller('telemetryWebhook'));
+                            $router->post('{id}/telemetry-deliveries/{delivery}/replay', $controller('replayTelemetryDelivery'));
                             $router->post('{id}/test-connection', $controller('testConnection'));
                             $router->post('{key}/test-credentials', $controller('testCredentials'));
                         });
@@ -642,6 +674,26 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                             $router->get('calendar-feed', $controller('calendarFeed'));
                             $router->get('{id}/ical', $controller('ical'));
                         });
+                        // The console validates these with $request->validate(), which
+                        // redirects a request that did not ask for JSON; they answer
+                        // in JSON so a refusal reaches the console as a 422.
+                        $router->group(['middleware' => [Fleetbase\FleetOps\Http\Middleware\ForceJsonResponse::class]], function ($router) {
+                            $router->fleetbaseRoutes('inspection-forms', function ($router, $controller) {
+                                $router->post('{id}/publish', $controller('publish'));
+                                $router->post('{id}/archive', $controller('archive'));
+                                $router->post('{id}/generate-link', $controller('generateLink'));
+                                $router->get('{id}/links', $controller('links'));
+                                $router->delete('{id}/links/{linkId}', $controller('revokeLink'));
+                                $router->post('{id}/links/{linkId}/send-pin', $controller('sendPin'));
+                            });
+                            $router->fleetbaseRoutes('inspection-submissions', function ($router, $controller) {
+                                $router->match(['get', 'post'], 'export', $controller('export'));
+                                $router->post('{id}/submit', $controller('submit'));
+                                $router->post('{id}/create-issue', $controller('createIssue'));
+                                $router->post('{id}/create-work-order', $controller('createWorkOrder'));
+                                $router->post('{id}/resolve', $controller('resolve'));
+                            });
+                        });
                         $router->fleetbaseRoutes('work-orders', function ($router, $controller) {
                             $router->match(['get', 'post'], 'export', $controller('export'));
                             $router->post('import', $controller('import'));
@@ -789,6 +841,30 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                         $router->get('maintenance', 'HubController@maintenance');
                                     }
                                 );
+
+                                // radar — the per-record gaps a fleet manager triages each
+                                // morning, computed live, with acknowledge / snooze / assign
+                                // state kept on the core alerts table.
+                                $router->group(
+                                    ['prefix' => 'radar'],
+                                    function ($router) {
+                                        $router->get('items', 'RadarController@items');
+                                        $router->get('summary', 'RadarController@summary');
+                                        $router->get('briefing', 'RadarController@briefing');
+                                        $router->get('agenda', 'RadarController@agenda');
+                                        $router->get('handovers/{key}', 'RadarController@handoverSuggest');
+                                        $router->post('shifts/{id}/extend', 'RadarController@extendShift');
+                                        $router->post('items/bulk', 'RadarController@bulk');
+                                        $router->post('items/{key}/acknowledge', 'RadarController@acknowledge');
+                                        $router->post('items/{key}/snooze', 'RadarController@snooze');
+                                        $router->post('items/{key}/wake', 'RadarController@wake');
+                                        $router->post('items/{key}/assign', 'RadarController@assign');
+                                        $router->post('items/{key}/plan', 'RadarController@plan');
+                                        $router->post('items/{key}/resolve', 'RadarController@resolve');
+                                        $router->post('notices', 'RadarController@storeNotice');
+                                        $router->delete('notices/{id}', 'RadarController@destroyNotice');
+                                    }
+                                );
                                 $router->group(
                                     ['prefix' => 'getting-started'],
                                     function ($router) {

package/server/tests/ApiManifestControllerContractsTest.php

@@ -84,8 +84,8 @@ use Illuminate\Http\Request;
 /** A stop that records what was done to it instead of touching a database. */
 class FleetOpsManifestStopFake extends ManifestStop
 {
-    public array $marks   = [];
-    public array $updates = [];
+    public array $marks          = [];
+    public array $updates        = [];
     public ?object $placeForTest = null;
 
     public function markArrived(): ManifestStop
@@ -148,7 +148,7 @@ class FleetOpsManifestStopFake extends ManifestStop
 /** A manifest whose stops and appended counts are supplied, not queried. */
 class FleetOpsManifestFakeRecord extends Manifest
 {
-    public $stopsForTest = null;
+    public $stopsForTest;
 
     public function getCompletedStopsAttribute(): int
     {
@@ -263,7 +263,7 @@ class FleetOpsManifestQueryFake
         return $this;
     }
 
-    public function get(): \Illuminate\Support\Collection
+    public function get(): Illuminate\Support\Collection
     {
         return collect($this->results);
     }
@@ -451,7 +451,7 @@ test('manifest controller re-sequences pending stops nearest first, leaving fini
 
     $manifest               = new FleetOpsManifestFakeRecord();
     $manifest->setRawAttributes(['uuid' => 'm-uuid', 'public_id' => 'manifest_a'], true);
-    $manifest->stopsForTest = collect([$done, $far, $near, $mid]);
+    $manifest->stopsForTest                    = collect([$done, $far, $near, $mid]);
     FleetOpsManifestControllerProbe::$manifest = $manifest;
 
     FleetOpsManifestControllerProbe::$distances = [
@@ -482,8 +482,8 @@ test('manifest controller starts from the first pending stop when given no posit
 
     $manifest               = new FleetOpsManifestFakeRecord();
     $manifest->setRawAttributes(['uuid' => 'm-uuid', 'public_id' => 'manifest_a'], true);
-    $manifest->stopsForTest = collect([$a, $b, $c]);
-    FleetOpsManifestControllerProbe::$manifest = $manifest;
+    $manifest->stopsForTest                     = collect([$a, $b, $c]);
+    FleetOpsManifestControllerProbe::$manifest  = $manifest;
     FleetOpsManifestControllerProbe::$distances = [
         '1.3,103.8->1.3,103.8'   => 0.0,
         '1.3,103.8->1.31,103.81' => 1500.0,
@@ -506,7 +506,7 @@ test('manifest controller skips a stop with no place rather than failing the who
 
     $manifest               = new FleetOpsManifestFakeRecord();
     $manifest->setRawAttributes(['uuid' => 'm-uuid', 'public_id' => 'manifest_a'], true);
-    $manifest->stopsForTest = collect([$a, $b, $c]);
+    $manifest->stopsForTest                    = collect([$a, $b, $c]);
     FleetOpsManifestControllerProbe::$manifest = $manifest;
 
     $controller = new FleetOpsManifestControllerProbe();
@@ -585,7 +585,7 @@ test('manifest controller lookups go to the database', function () {
     $reached = function (callable $lookup): bool {
         try {
             $lookup();
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             return true;
         }
 

package/server/tests/ControllerFilterContractsTest.php

@@ -741,7 +741,7 @@ test('fuel provider and work order filters record company search and status scop
         ['where', ['company_uuid', 'company-uuid']],
         ['search', 'fuelx'],
         ['where', ['provider', 'petro-app']],
-        ['where', ['status', 'active']],
+        ['whereIn', 'status', ['active']],
         ['where', ['environment', 'sandbox']],
     ]);
 

package/server/tests/EventContractsTest.php

@@ -477,13 +477,14 @@ test('driver simulated location changed broadcasts simulated telemetry payload',
 
 test('vehicle location changed broadcasts vehicle telemetry payload', function () {
     session([
-        'company'        => 'company-1',
+        'company'        => 'wrong-session-company',
         'api_credential' => 'api-1',
     ]);
 
     $vehicle = new Vehicle();
     $vehicle->setRawAttributes([
         'uuid'         => 'vehicle-uuid',
+        'company_uuid' => 'company-1',
         'public_id'    => 'vehicle_public',
         'plate_number' => 'ABC-123',
         'name'         => 'Truck 12',