diff --git a/src/Database/Concerns/ResourceSyncing.php b/src/Database/Concerns/ResourceSyncing.php index d85a9706..b9905930 100644 --- a/src/Database/Concerns/ResourceSyncing.php +++ b/src/Database/Concerns/ResourceSyncing.php @@ -7,7 +7,6 @@ namespace Stancl\Tenancy\Database\Concerns; use Illuminate\Database\Eloquent\Relations\MorphToMany; use Stancl\Tenancy\Contracts\Syncable; use Stancl\Tenancy\Contracts\UniqueIdentifierGenerator; -use Stancl\Tenancy\Database\Models\Tenant; use Stancl\Tenancy\Database\Models\TenantMorphPivot; use Stancl\Tenancy\Events\SyncedResourceSaved; @@ -49,12 +48,7 @@ trait ResourceSyncing public function tenants(): MorphToMany { - return $this->morphToMany($this->getResourceTenantModelName(), 'tenant_resources', 'tenant_resources', 'resource_global_id', 'tenant_id', 'global_id') + return $this->morphToMany(config('tenancy.tenant_model'), 'tenant_resources', 'tenant_resources', 'resource_global_id', 'tenant_id', 'global_id') ->using(TenantMorphPivot::class); } - - public function getResourceTenantModelName(): string // todo better name - { - return config('tenancy.tenant_model', Tenant::class); - } } diff --git a/tests/ResourceSyncingUsingPolymorphicTest.php b/tests/ResourceSyncingUsingPolymorphicTest.php index 52dc9937..83ed9ba6 100644 --- a/tests/ResourceSyncingUsingPolymorphicTest.php +++ b/tests/ResourceSyncingUsingPolymorphicTest.php @@ -27,7 +27,9 @@ use Stancl\Tenancy\Tests\Etc\Tenant; beforeEach(function () { config(['tenancy.bootstrappers' => [ DatabaseTenancyBootstrapper::class, - ]]); + ], + 'tenancy.tenant_model' => ResourceTenantUsingPolymorphic::class, + ]); Event::listen(TenantCreated::class, JobPipeline::make([CreateDatabase::class])->send(function (TenantCreated $event) { return $event->tenant; @@ -203,12 +205,6 @@ class CentralUserUsingPolymorphic extends Model implements SyncMaster public $table = 'users'; - // override method to provide different tenant - public function getResourceTenantModelName(): string - { - return ResourceTenantUsingPolymorphic::class; - } - public function getTenantModelName(): string { return TenantUserUsingPolymorphic::class; @@ -286,12 +282,6 @@ class CentralCompanyUsingPolymorphic extends Model implements SyncMaster public $table = 'companies'; - // override method to provide different tenant - public function getResourceTenantModelName(): string - { - return ResourceTenantUsingPolymorphic::class; - } - public function getTenantModelName(): string { return TenantCompanyUsingPolymorphic::class;