ahmido
e64bae9cfc
## 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
78 lines
2.5 KiB
PHP
78 lines
2.5 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Models\Workspace;
|
|
use App\Models\WorkspaceSetting;
|
|
use App\Services\Settings\SettingsResolver;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\DB;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
it('caches repeated workspace setting resolution within a request', function (): void {
|
|
$workspace = Workspace::factory()->create();
|
|
|
|
WorkspaceSetting::factory()->create([
|
|
'workspace_id' => (int) $workspace->getKey(),
|
|
'domain' => 'backup',
|
|
'key' => 'retention_keep_last_default',
|
|
'value' => 41,
|
|
'updated_by_user_id' => null,
|
|
]);
|
|
|
|
$resolver = app(SettingsResolver::class);
|
|
|
|
DB::flushQueryLog();
|
|
DB::enableQueryLog();
|
|
|
|
expect($resolver->resolveValue($workspace, 'backup', 'retention_keep_last_default'))->toBe(41);
|
|
expect($resolver->resolveValue($workspace, 'backup', 'retention_keep_last_default'))->toBe(41);
|
|
|
|
$workspaceSettingsQueries = collect(DB::getQueryLog())
|
|
->pluck('query')
|
|
->filter(fn (string $query): bool => str_contains($query, 'workspace_settings'))
|
|
->count();
|
|
|
|
expect($workspaceSettingsQueries)->toBe(1);
|
|
});
|
|
|
|
it('resolves tenant override from cache without repeated database reads', function (): void {
|
|
$workspace = Workspace::factory()->create();
|
|
$tenant = \App\Models\ManagedEnvironment::factory()->create([
|
|
'workspace_id' => (int) $workspace->getKey(),
|
|
]);
|
|
|
|
WorkspaceSetting::factory()->create([
|
|
'workspace_id' => (int) $workspace->getKey(),
|
|
'domain' => 'backup',
|
|
'key' => 'retention_keep_last_default',
|
|
'value' => 22,
|
|
'updated_by_user_id' => null,
|
|
]);
|
|
|
|
\App\Models\TenantSetting::factory()->create([
|
|
'workspace_id' => (int) $workspace->getKey(),
|
|
'managed_environment_id' => (int) $tenant->getKey(),
|
|
'domain' => 'backup',
|
|
'key' => 'retention_keep_last_default',
|
|
'value' => 12,
|
|
'updated_by_user_id' => null,
|
|
]);
|
|
|
|
$resolver = app(SettingsResolver::class);
|
|
|
|
DB::flushQueryLog();
|
|
DB::enableQueryLog();
|
|
|
|
expect($resolver->resolveValue($workspace, 'backup', 'retention_keep_last_default', $tenant))->toBe(12);
|
|
expect($resolver->resolveValue($workspace, 'backup', 'retention_keep_last_default', $tenant))->toBe(12);
|
|
|
|
$settingsQueries = collect(DB::getQueryLog())
|
|
->pluck('query')
|
|
->filter(fn (string $query): bool => str_contains($query, 'tenant_settings') || str_contains($query, 'workspace_settings'))
|
|
->count();
|
|
|
|
expect($settingsQueries)->toBe(2);
|
|
});
|