Zusammenfassung: Fügt im „Run Inventory Sync“-Modal einen include_dependencies-Toggle hinzu und persistiert die Auswahl in der InventorySyncRun.selection_payload. Tests, Quickstart und Tasks wurden entsprechend aktualisiert. Files: InventoryLanding.php, InventorySyncButtonTest.php, quickstart.md, tasks.md Motivation: Ermöglicht explizites Ein-/Ausschalten der Dependency-Extraktion pro Sync-Run (z. B. Assignments/Scope Tags/Foundations), statt starrer Defaults. Passt zur bestehenden selection_hash-Logik (InventorySelectionHasher) und zur deterministischen Selektionspersistenz. Verhalten: include_dependencies ist im Modal standardmäßig true. Wird die Option gesetzt, landet der Wert als bool im selection_payload und beeinflusst selection_hash über die Normalisierung. Tests: Neuer/angepasster Pest-Test stellt sicher, dass include_dependencies in selection_payload persistiert. Lokaler Testlauf: ./vendor/bin/sail artisan test tests/Feature/Inventory/InventorySyncButtonTest.php → alle Tests für diese Datei bestanden. ./vendor/bin/pint --dirty wurde ausgeführt (Formatting ok). How to test (quick): Start Sail + Queue: Im Admin → Inventory: „Run Inventory Sync“ öffnen, Include dependencies umschalten, ausführen. Prüfen: neu erstellter InventorySyncRun.selection_payload.include_dependencies ist der gesetzten Auswahl entsprechend. Oder laufen lassen: Notes / Next steps: Diese Änderung bereitet den Weg, später die Dependency-Extraction (042-inventory-dependencies-graph) optional tiefer zu integrieren. Working tree ist sauber; es gibt ein nicht eingebundenes Verzeichnis 0800-future-features (unrelated). Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #47
168 lines
5.8 KiB
PHP
168 lines
5.8 KiB
PHP
<?php
|
|
|
|
use App\Filament\Pages\InventoryLanding;
|
|
use App\Jobs\RunInventorySyncJob;
|
|
use App\Models\BulkOperationRun;
|
|
use App\Models\InventorySyncRun;
|
|
use App\Models\Tenant;
|
|
use App\Services\Inventory\InventorySyncService;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Support\Facades\Queue;
|
|
use Livewire\Livewire;
|
|
|
|
it('dispatches inventory sync and creates observable run records', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
|
|
Livewire::test(InventoryLanding::class)
|
|
->callAction('run_inventory_sync', data: ['policy_types' => $allTypes]);
|
|
|
|
Queue::assertPushed(RunInventorySyncJob::class);
|
|
|
|
$run = InventorySyncRun::query()->where('tenant_id', $tenant->id)->latest('id')->first();
|
|
expect($run)->not->toBeNull();
|
|
expect($run->user_id)->toBe($user->id);
|
|
expect($run->status)->toBe(InventorySyncRun::STATUS_PENDING);
|
|
|
|
$bulkRun = BulkOperationRun::query()
|
|
->where('tenant_id', $tenant->id)
|
|
->where('user_id', $user->id)
|
|
->where('resource', 'inventory')
|
|
->where('action', 'sync')
|
|
->latest('id')
|
|
->first();
|
|
|
|
expect($bulkRun)->not->toBeNull();
|
|
});
|
|
|
|
it('dispatches inventory sync for selected policy types', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
|
|
|
Livewire::test(InventoryLanding::class)
|
|
->mountAction('run_inventory_sync')
|
|
->set('mountedActions.0.data.policy_types', $selectedTypes)
|
|
->assertActionDataSet(['policy_types' => $selectedTypes])
|
|
->callMountedAction()
|
|
->assertHasNoActionErrors();
|
|
|
|
Queue::assertPushed(RunInventorySyncJob::class);
|
|
|
|
$run = InventorySyncRun::query()->where('tenant_id', $tenant->id)->latest('id')->first();
|
|
expect($run)->not->toBeNull();
|
|
expect($run->selection_payload['policy_types'] ?? [])->toEqualCanonicalizing($selectedTypes);
|
|
});
|
|
|
|
it('persists include dependencies toggle into the run selection payload', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
|
|
|
Livewire::test(InventoryLanding::class)
|
|
->callAction('run_inventory_sync', data: [
|
|
'policy_types' => $selectedTypes,
|
|
'include_dependencies' => false,
|
|
])
|
|
->assertHasNoActionErrors();
|
|
|
|
$run = InventorySyncRun::query()->where('tenant_id', $tenant->id)->latest('id')->first();
|
|
expect($run)->not->toBeNull();
|
|
expect((bool) ($run->selection_payload['include_dependencies'] ?? true))->toBeFalse();
|
|
});
|
|
|
|
it('rejects cross-tenant initiation attempts (403) with no side effects', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenantA] = createUserWithTenant(role: 'owner');
|
|
$tenantB = Tenant::factory()->create();
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenantA, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
|
|
Livewire::test(InventoryLanding::class)
|
|
->callAction('run_inventory_sync', data: ['tenant_id' => $tenantB->getKey(), 'policy_types' => $allTypes])
|
|
->assertStatus(403);
|
|
|
|
Queue::assertNothingPushed();
|
|
|
|
expect(InventorySyncRun::query()->where('tenant_id', $tenantB->id)->exists())->toBeFalse();
|
|
expect(BulkOperationRun::query()->where('tenant_id', $tenantB->id)->exists())->toBeFalse();
|
|
});
|
|
|
|
it('blocks dispatch when a matching run is already pending or running', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$selectionPayload = $sync->defaultSelectionPayload();
|
|
$computed = $sync->normalizeAndHashSelection($selectionPayload);
|
|
|
|
InventorySyncRun::query()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'selection_hash' => $computed['selection_hash'],
|
|
'selection_payload' => $computed['selection'],
|
|
'status' => InventorySyncRun::STATUS_RUNNING,
|
|
'had_errors' => false,
|
|
'error_codes' => [],
|
|
'error_context' => null,
|
|
'started_at' => now(),
|
|
'finished_at' => null,
|
|
'items_observed_count' => 0,
|
|
'items_upserted_count' => 0,
|
|
'errors_count' => 0,
|
|
]);
|
|
|
|
Livewire::test(InventoryLanding::class)
|
|
->callAction('run_inventory_sync', data: ['policy_types' => $computed['selection']['policy_types']]);
|
|
|
|
Queue::assertNothingPushed();
|
|
expect(InventorySyncRun::query()->where('tenant_id', $tenant->id)->count())->toBe(1);
|
|
expect(BulkOperationRun::query()->where('tenant_id', $tenant->id)->count())->toBe(0);
|
|
});
|
|
|
|
it('forbids unauthorized users from starting inventory sync', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'readonly');
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
Livewire::test(InventoryLanding::class)
|
|
->assertActionHidden('run_inventory_sync');
|
|
|
|
Queue::assertNothingPushed();
|
|
expect(InventorySyncRun::query()->where('tenant_id', $tenant->id)->exists())->toBeFalse();
|
|
});
|