## Summary - replace the legacy Tenant and TenantMembership core models with ManagedEnvironment and ManagedEnvironmentMembership - propagate the managed environment naming and key changes across Filament resources, pages, controllers, jobs, models, and supporting runtime paths - add feature 279 spec artifacts and focused managed-environment test coverage for model behavior, route binding, panel context, authorization, and legacy guardrails ## Validation - `cd apps/platform && ./vendor/bin/sail artisan test --compact tests/Feature/ManagedEnvironment/LegacyTenantCoreGuardTest.php tests/Feature/ManagedEnvironment/ManagedEnvironmentAuthorizationTest.php tests/Feature/ManagedEnvironment/ManagedEnvironmentPanelContextTest.php tests/Feature/ManagedEnvironment/ManagedEnvironmentRouteBindingTest.php tests/Unit/ManagedEnvironment/ManagedEnvironmentContextResolverTest.php tests/Unit/ManagedEnvironment/ManagedEnvironmentModelTest.php` - `cd apps/platform && ./vendor/bin/sail bin pint --dirty --format agent` ## Notes - branch pushed from commit `1123b122` - browser smoke test file was added but not run in this pass Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #335
208 lines
7.3 KiB
PHP
208 lines
7.3 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Filament\Widgets\Alerts\AlertsKpiHeader;
|
|
use App\Models\AlertDelivery;
|
|
use App\Models\AlertDestination;
|
|
use App\Models\AlertRule;
|
|
use App\Models\ManagedEnvironment;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use Filament\Facades\Filament;
|
|
use Filament\Widgets\StatsOverviewWidget\Stat;
|
|
use Livewire\Livewire;
|
|
|
|
function alertsKpiValues($component): array
|
|
{
|
|
$method = new ReflectionMethod(AlertsKpiHeader::class, 'getStats');
|
|
$method->setAccessible(true);
|
|
|
|
return collect($method->invoke($component->instance()))
|
|
->mapWithKeys(fn (Stat $stat): array => [
|
|
(string) $stat->getLabel() => (string) $stat->getValue(),
|
|
])
|
|
->all();
|
|
}
|
|
|
|
it('filters KPI deliveries by tenant when context is set via lastTenantId fallback only', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$workspaceId = (int) $tenant->workspace_id;
|
|
|
|
$rule = AlertRule::factory()->create(['workspace_id' => $workspaceId]);
|
|
$destination = AlertDestination::factory()->create(['workspace_id' => $workspaceId]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'managed_environment_id' => (int) $tenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$otherTenant = ManagedEnvironment::factory()->create(['workspace_id' => $workspaceId]);
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$otherTenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'managed_environment_id' => (int) $otherTenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant(null, true);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, $workspaceId);
|
|
session()->put(WorkspaceContext::LAST_TENANT_IDS_SESSION_KEY, [
|
|
(string) $workspaceId => (int) $tenant->getKey(),
|
|
]);
|
|
|
|
$values = alertsKpiValues(Livewire::test(AlertsKpiHeader::class));
|
|
|
|
expect($values)->toMatchArray([
|
|
'Deliveries (24h)' => '1',
|
|
'Failed (7d)' => '0',
|
|
]);
|
|
})->group('ops-ux');
|
|
|
|
it('filters KPI deliveries by tenant when context is set via Filament setTenant', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$workspaceId = (int) $tenant->workspace_id;
|
|
|
|
$rule = AlertRule::factory()->create(['workspace_id' => $workspaceId]);
|
|
$destination = AlertDestination::factory()->create(['workspace_id' => $workspaceId]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'managed_environment_id' => (int) $tenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$otherTenant = ManagedEnvironment::factory()->create(['workspace_id' => $workspaceId]);
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$otherTenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'managed_environment_id' => (int) $otherTenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, $workspaceId);
|
|
|
|
$values = alertsKpiValues(Livewire::test(AlertsKpiHeader::class));
|
|
|
|
expect($values)->toMatchArray([
|
|
'Deliveries (24h)' => '1',
|
|
'Failed (7d)' => '0',
|
|
]);
|
|
})->group('ops-ux');
|
|
|
|
it('shows workspace-wide KPI counts when no tenant context is active', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$workspaceId = (int) $tenant->workspace_id;
|
|
|
|
$rule = AlertRule::factory()->create(['workspace_id' => $workspaceId]);
|
|
$destination = AlertDestination::factory()->create(['workspace_id' => $workspaceId]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'managed_environment_id' => (int) $tenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$otherTenant = ManagedEnvironment::factory()->create(['workspace_id' => $workspaceId]);
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$otherTenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'managed_environment_id' => (int) $otherTenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant(null, true);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, $workspaceId);
|
|
|
|
$values = alertsKpiValues(Livewire::test(AlertsKpiHeader::class));
|
|
|
|
expect($values)->toMatchArray([
|
|
'Deliveries (24h)' => '2',
|
|
'Failed (7d)' => '0',
|
|
]);
|
|
})->group('ops-ux');
|
|
|
|
it('prefers the Filament tenant over remembered tenant fallback in KPI scope conflicts', function (): void {
|
|
[$user, $tenantA] = createUserWithTenant(role: 'owner');
|
|
|
|
$workspaceId = (int) $tenantA->workspace_id;
|
|
|
|
$tenantB = ManagedEnvironment::factory()->create(['workspace_id' => $workspaceId]);
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenantB->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
$rule = AlertRule::factory()->create(['workspace_id' => $workspaceId]);
|
|
$destination = AlertDestination::factory()->create(['workspace_id' => $workspaceId]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'managed_environment_id' => (int) $tenantA->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'managed_environment_id' => (int) $tenantB->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_FAILED,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenantB, true);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, $workspaceId);
|
|
session()->put(WorkspaceContext::LAST_TENANT_IDS_SESSION_KEY, [
|
|
(string) $workspaceId => (int) $tenantA->getKey(),
|
|
]);
|
|
|
|
$values = alertsKpiValues(Livewire::test(AlertsKpiHeader::class));
|
|
|
|
expect($values)->toMatchArray([
|
|
'Deliveries (24h)' => '1',
|
|
'Failed (7d)' => '1',
|
|
]);
|
|
})->group('ops-ux');
|