1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 02:54:03 +00:00

FIx inconsistencies

This commit is contained in:
lukinovec 2025-06-11 12:37:18 +02:00
parent eb4890343c
commit 593de904d8

View file

@ -28,8 +28,8 @@ test('tenants can be resolved using cached resolvers', function (string $resolve
PathTenantResolver::class, PathTenantResolver::class,
RequestDataTenantResolver::class, RequestDataTenantResolver::class,
])->with([ ])->with([
'tenant column is id (default)' => false, 'tenant model column is id (default)' => false,
'tenant column is name (custom)' => true, 'tenant model column is name (custom)' => true,
]); ]);
test('the underlying resolver is not touched when using the cached resolver', function (string $resolver, bool $configureTenantModelColumn) { test('the underlying resolver is not touched when using the cached resolver', function (string $resolver, bool $configureTenantModelColumn) {
@ -58,8 +58,8 @@ test('the underlying resolver is not touched when using the cached resolver', fu
PathTenantResolver::class, PathTenantResolver::class,
RequestDataTenantResolver::class, RequestDataTenantResolver::class,
])->with([ ])->with([
'tenant column is id (default)' => false, 'tenant model column is id (default)' => false,
'tenant column is name (custom)' => true, 'tenant model column is name (custom)' => true,
]); ]);
test('cache is invalidated when the tenant is updated', function (string $resolver, bool $configureTenantModelColumn) { test('cache is invalidated when the tenant is updated', function (string $resolver, bool $configureTenantModelColumn) {
@ -92,8 +92,8 @@ test('cache is invalidated when the tenant is updated', function (string $resolv
PathTenantResolver::class, PathTenantResolver::class,
RequestDataTenantResolver::class, RequestDataTenantResolver::class,
])->with([ ])->with([
'tenant column is id (default)' => false, 'tenant model column is id (default)' => false,
'tenant column is name (custom)' => true, 'tenant model column is name (custom)' => true,
]); ]);
test('cache is invalidated when the tenant is deleted', function (string $resolver, bool $configureTenantModelColumn) { test('cache is invalidated when the tenant is deleted', function (string $resolver, bool $configureTenantModelColumn) {
@ -123,8 +123,8 @@ test('cache is invalidated when the tenant is deleted', function (string $resolv
PathTenantResolver::class, PathTenantResolver::class,
RequestDataTenantResolver::class, RequestDataTenantResolver::class,
])->with([ ])->with([
'tenant column is id (default)' => false, 'tenant model column is id (default)' => false,
'tenant column is name (custom)' => true, 'tenant model column is name (custom)' => true,
]); ]);
test('cache is invalidated when a tenants domain is changed', function () { test('cache is invalidated when a tenants domain is changed', function () {
@ -358,7 +358,7 @@ function tenantModelColumn(bool $configureTenantModelColumn): string {
* For PathTenantResolver, return a route instance with the value retrieved using $tenant->{$parameterColumn} as the parameter. * For PathTenantResolver, return a route instance with the value retrieved using $tenant->{$parameterColumn} as the parameter.
* For RequestDataTenantResolver and DomainTenantResolver, return the value retrieved using $tenant->{$parameterColumn}. * For RequestDataTenantResolver and DomainTenantResolver, return the value retrieved using $tenant->{$parameterColumn}.
* *
* Tenant column name is 'id' by default, but in the generic tests, * Tenant model column is 'id' by default, but in the generic tests,
* we also configure that to 'name' to ensure everything works both with default and custom config. * we also configure that to 'name' to ensure everything works both with default and custom config.
*/ */
function getResolverArgument(string $resolver, Tenant $tenant, string $parameterColumn = 'id'): string|Route function getResolverArgument(string $resolver, Tenant $tenant, string $parameterColumn = 'id'): string|Route