@fleetbase/fleetops-engine 0.6.65 → 0.6.66

package/server/tests/FuelProviderConnectionControllerContractsTest.php

@@ -99,6 +99,14 @@ class FleetOpsFuelProviderConnectionFake extends FuelProviderConnection
 class FleetOpsFuelProviderSyncRunFake extends FuelProviderSyncRun
 {
     public bool $freshForTest = false;
+    public array $updatesForTest = [];
+
+    public function update(array $attributes = [], array $options = [])
+    {
+        $this->updatesForTest[] = $attributes;
+
+        return true;
+    }
 
     public function fresh($with = [])
     {
@@ -165,9 +173,10 @@ test('fuel provider connection controller preserves active status while normaliz
 
     $connection = new FleetOpsFuelProviderConnectionFake();
     $connection->setRawAttributes([
-        'provider'    => 'petroapp',
-        'status'      => 'active',
-        'credentials' => ['api_token' => 'existing-token'],
+        'provider'      => 'petroapp',
+        'status'        => 'active',
+        'credentials'   => ['api_token' => 'existing-token'],
+        'sync_settings' => ['window_days' => 30, 'auto_create_fuel_reports' => false, 'matching_order' => []],
     ]);
 
     $input = [
@@ -301,3 +310,74 @@ test('fuel provider sync queues async runs and finds real connections', function
     $found = $reflection->invoke(fleetopsFuelProviderConnectionController(new FleetOpsFuelProviderConnectionServiceFake()), 'fuel_provider_connection_real1');
     expect($found->uuid)->toBe('fpc-real-1');
 });
+
+test('fuel provider connection updates preserve sandbox and reject unknown environments', function () {
+    session(['company' => 'company-uuid']);
+    $controller = fleetopsFuelProviderConnectionController(new FleetOpsFuelProviderConnectionServiceFake());
+    $connection = new FleetOpsFuelProviderConnectionFake();
+    $connection->setRawAttributes([
+        'provider'      => 'petroapp',
+        'status'        => 'active',
+        'environment'   => 'sandbox',
+        'credentials'   => ['api_token' => 'existing-token'],
+        'sync_settings' => ['window_days' => 30, 'auto_create_fuel_reports' => false, 'matching_order' => []],
+    ]);
+    $input = ['name' => 'Updated sandbox'];
+    $controller->onBeforeUpdate(new Request(), $connection, $input);
+    expect($input['environment'])->toBe('sandbox');
+    expect($input['sync_settings'])->toMatchArray(['window_days' => 30, 'auto_create_fuel_reports' => false, 'matching_order' => []]);
+
+    $invalid = ['environment' => 'unknown'];
+    expect(fn () => $controller->onBeforeUpdate(new Request(), $connection, $invalid))->toThrow(ValidationException::class);
+});
+
+test('serialized fuel connection credentials survive create validation and settings updates', function () {
+    if (!Request::hasMacro('or')) {
+        Request::macro('or', (new Fleetbase\Expansions\Request())->or());
+    }
+    session(['company' => 'company-uuid']);
+    $controller = fleetopsFuelProviderConnectionController(new FleetOpsFuelProviderConnectionServiceFake());
+    $model      = new FuelProviderConnection();
+    $request    = new Request(['fuelProviderConnection' => [
+        'provider'    => 'petroapp',
+        'name'        => 'PetroApp Sandbox',
+        'environment' => 'sandbox',
+        'credentials' => ['api_token' => 'test-token', 'auth_type' => 'ws_sk_header'],
+    ]]);
+    $input = $model->getApiPayloadFromRequest($request);
+    $controller->onBeforeCreate($request, $input);
+    expect($input['credentials'])->toBe(['api_token' => 'test-token', 'auth_type' => 'ws_sk_header']);
+    expect($input['environment'])->toBe('sandbox');
+
+    $connection = new FuelProviderConnection($input);
+    $update     = ['name' => 'Renamed sandbox'];
+    $controller->onBeforeUpdate(new Request(), $connection, $update);
+    expect($update)->not->toHaveKey('credentials');
+    expect(data_get($connection->credentials, 'api_token'))->toBe('test-token');
+});
+
+test('disabled fuel connections cannot queue imports', function () {
+    $service                = new FleetOpsFuelProviderConnectionServiceFake();
+    $controller             = fleetopsFuelProviderConnectionController($service);
+    $controller->connection = new FleetOpsFuelProviderConnectionFake(['status' => 'disabled']);
+    expect(fn () => $controller->sync(new Request(), 'disabled-connection'))->toThrow(ValidationException::class);
+    expect($service->syncRuns)->toBeEmpty();
+});
+
+test('failed fuel sync dispatch marks the run as failed and propagates the broker error', function () {
+    $service = new FleetOpsFuelProviderConnectionServiceFake();
+    $controller = fleetopsFuelProviderConnectionController($service);
+    $controller->connection = new FleetOpsFuelProviderConnectionFake(['uuid' => 'connection-uuid', 'status' => 'active']);
+    $error = new RuntimeException('Queue broker unavailable');
+    Fleetbase\TestSupport\DispatchRecorder::$failure = $error;
+    try {
+        expect(fn () => $controller->sync(new Request(['async' => true]), 'connection-uuid'))->toThrow(RuntimeException::class, 'Queue broker unavailable');
+        $updates = $service->syncRuns[0][4]->updatesForTest;
+        expect($updates)->toHaveCount(1);
+        expect($updates[0])->toMatchArray(['status' => 'error', 'error' => 'Unable to queue sync. Please retry.']);
+        expect($updates[0]['finished_at'])->toBeInstanceOf(Carbon::class);
+        expect($service->syncs)->toBeEmpty();
+    } finally {
+        Fleetbase\TestSupport\DispatchRecorder::$failure = null;
+    }
+});

package/server/tests/FuelProviderImplementationTest.php

@@ -195,7 +195,7 @@ class FleetOpsFuelProviderServiceHarness extends FuelProviderService
             return $this->ingestTransactionResult;
         }
 
-        return new FleetOpsFuelProviderTransactionHarness(array_merge([
+        $transaction = new FleetOpsFuelProviderTransactionHarness(array_merge([
             'company_uuid'            => $connection->company_uuid,
             'provider'                => $connection->provider,
             'provider_transaction_id' => $payload['provider_transaction_id'] ?? 'txn-harness',
@@ -204,6 +204,10 @@ class FleetOpsFuelProviderServiceHarness extends FuelProviderService
             'sync_status'             => $payload['sync_status'] ?? 'unmatched',
             'fuel_report_uuid'        => $payload['fuel_report_uuid'] ?? null,
         ], $payload));
+        $transaction->wasRecentlyCreated = true;
+        $transaction->createdFuelReport = (bool) $transaction->fuel_report_uuid;
+
+        return $transaction;
     }
 
     public function createSyncRun(FuelProviderConnection $connection, ?Carbon $from = null, ?Carbon $to = null, string $status = 'queued'): FuelProviderSyncRun
@@ -392,7 +396,7 @@ test('petroapp provider resolves base urls auth headers and normalized bills', f
 
     expect($provider->key())->toBe('petroapp')
         ->and($provider->name())->toBe('PetroApp')
-        ->and($provider->exposedBaseUrl($defaultConnection))->toBe('https://app-public.staging.petroapp.app/webservice')
+        ->and($provider->exposedBaseUrl($defaultConnection))->toBe('https://app.petroapp.com.sa/webservice')
         ->and($provider->exposedBaseUrl($customConnection))->toBe('https://petroapp.example.test/root')
         ->and($provider->exposedHeaders($defaultConnection))->toBe([
             'WS-Version'    => 'v2.0',
@@ -572,6 +576,8 @@ test('fuel provider service summarizes successful sync transactions', function (
     $summary = $service->syncTransactions($connection, Carbon::parse('2026-07-01'), Carbon::parse('2026-07-02'), ['page_size' => 50]);
 
     expect($summary)->toBe([
+        'received'             => 2,
+        'updated'              => 0,
         'imported'             => 2,
         'matched'              => 1,
         'unmatched'            => 1,
@@ -627,6 +633,8 @@ test('fuel provider service records sync errors before rethrowing', function ()
         'status'  => 'error',
         'error'   => 'provider offline',
         'summary' => [
+            'received'             => 0,
+            'updated'              => 0,
             'imported'             => 0,
             'matched'              => 0,
             'unmatched'            => 0,

package/server/tests/HubAndGettingStartedContractsTest.php

@@ -90,15 +90,38 @@ test('hub controller maintenance actions summarize service priorities', function
 
     $actions = $controller->callHelper('maintenanceActions', 1, 2, 0, 3, 4, 5, 0);
 
+    // No published inspection form is the first thing a new maintenance setup is
+    // told about: without one, drivers have nothing to file a DVIR against.
     expect(array_column($actions, 'key'))->toBe([
+        'create_inspection_forms',
         'overdue_schedules',
         'overdue_work_orders',
         'high_priority_maintenance',
         'upcoming_service',
-        'no_open_work_orders',
     ])
-        ->and($actions[0]['description'])->toContain('1 recurring service schedule is overdue')
-        ->and($actions[1]['description'])->toContain('3 work orders are past due');
+        ->and($actions[0])->toMatchArray(['tone' => 'info', 'route' => 'maintenance.inspection-forms'])
+        ->and($actions[1]['description'])->toContain('1 recurring service schedule is overdue')
+        ->and($actions[2]['description'])->toContain('3 work orders are past due');
+});
+
+test('hub controller maintenance actions surface failed and unresolved inspections', function () {
+    $controller = new FleetOpsHubControllerProbe();
+
+    // A failed inspection awaiting review outranks everything else, and while one
+    // is waiting the unresolved count is not repeated as a second action.
+    $failed = $controller->callHelper('maintenanceActions', 0, 0, 1, 0, 0, 0, 1, 1, 4, 2);
+    expect(array_column($failed, 'key'))->toBe(['failed_inspections'])
+        ->and($failed[0]['description'])->toBe('1 failed inspection needs issue or work order follow-up.')
+        ->and((array) $failed[0]['query'])->toBe(['result' => 'failed']);
+
+    // Reviewed but not yet resolved: the follow-up prompt, after the service ones.
+    $unresolved = $controller->callHelper('maintenanceActions', 0, 0, 1, 0, 0, 0, 1, 0, 2, 1);
+    expect(array_column($unresolved, 'key'))->toBe(['unresolved_inspections'])
+        ->and($unresolved[0]['description'])->toBe('2 failed inspections remain unresolved.');
+
+    // Forms published and nothing failed: no inspection action at all.
+    $quiet = $controller->callHelper('maintenanceActions', 0, 0, 1, 0, 0, 0, 1, 0, 0, 3);
+    expect(array_column($quiet, 'key'))->toBe([]);
 });
 
 test('hub controller small helpers build dashboard payload fragments', function () {