diff --git a/src/Commands/Migrate.php b/src/Commands/Migrate.php index c67d3598..6b72c27b 100644 --- a/src/Commands/Migrate.php +++ b/src/Commands/Migrate.php @@ -49,7 +49,7 @@ class Migrate extends MigrateCommand } tenancy()->runForMultiple($this->option('tenants'), function ($tenant) { - $this->line("Tenant: {$tenant->getTenantKey()}"); + $this->line("Tenant: {$tenant->getTenantName()}"); event(new MigratingDatabase($tenant)); diff --git a/src/Commands/Rollback.php b/src/Commands/Rollback.php index e60d974b..03746728 100644 --- a/src/Commands/Rollback.php +++ b/src/Commands/Rollback.php @@ -58,7 +58,7 @@ class Rollback extends RollbackCommand } tenancy()->runForMultiple($this->option('tenants'), function ($tenant) { - $this->line("Tenant: {$tenant->getTenantKey()}"); + $this->line("Tenant: {$tenant->getTenantName()}"); event(new RollingBackDatabase($tenant)); diff --git a/src/Commands/Run.php b/src/Commands/Run.php index aa518d7a..e133decd 100644 --- a/src/Commands/Run.php +++ b/src/Commands/Run.php @@ -33,7 +33,7 @@ class Run extends Command public function handle() { tenancy()->runForMultiple($this->option('tenants'), function ($tenant) { - $this->line("Tenant: {$tenant->getTenantKey()}"); + $this->line("Tenant: {$tenant->getTenantName()}"); $callback = function ($prefix = '') { return function ($arguments, $argument) use ($prefix) { diff --git a/src/Commands/Seed.php b/src/Commands/Seed.php index dc97ae71..eef1756e 100644 --- a/src/Commands/Seed.php +++ b/src/Commands/Seed.php @@ -51,7 +51,7 @@ class Seed extends SeedCommand } tenancy()->runForMultiple($this->option('tenants'), function ($tenant) { - $this->line("Tenant: {$tenant->getTenantKey()}"); + $this->line("Tenant: {$tenant->getTenantName()}"); event(new SeedingDatabase($tenant)); diff --git a/src/Commands/TenantList.php b/src/Commands/TenantList.php index d01afcb9..d1e75f3c 100644 --- a/src/Commands/TenantList.php +++ b/src/Commands/TenantList.php @@ -36,9 +36,9 @@ class TenantList extends Command ->cursor() ->each(function (Tenant $tenant) { if ($tenant->domains) { - $this->line("[Tenant] {$tenant->getTenantKeyName()}: {$tenant->getTenantKey()} @ " . implode('; ', $tenant->domains->pluck('domain')->toArray() ?? [])); + $this->line("[{$tenant->getTenantName()}] {$tenant->getTenantKeyName()}: {$tenant->getTenantKey()} @ " . implode('; ', $tenant->domains->pluck('domain')->toArray() ?? [])); } else { - $this->line("[Tenant] {$tenant->getTenantKeyName()}: {$tenant->getTenantKey()}"); + $this->line("[{$tenant->getTenantName()}] {$tenant->getTenantKeyName()}: {$tenant->getTenantKey()}"); } }); } diff --git a/src/Contracts/Tenant.php b/src/Contracts/Tenant.php index 770e862e..3fcc4c59 100644 --- a/src/Contracts/Tenant.php +++ b/src/Contracts/Tenant.php @@ -27,4 +27,7 @@ interface Tenant /** Run a callback in this tenant's environment. */ public function run(callable $callback); + + /** Get the human readable name of the tenant. */ + public function getTenantName(): string; } diff --git a/src/Database/Models/Tenant.php b/src/Database/Models/Tenant.php index ecc5dbc4..30903430 100644 --- a/src/Database/Models/Tenant.php +++ b/src/Database/Models/Tenant.php @@ -48,7 +48,12 @@ class Tenant extends Model implements Contracts\Tenant { return new TenantCollection($models); } - + + public function getTenantName(): string + { + return $this->getAttribute('name') ?? $this->getTenantKey(); + } + protected $dispatchesEvents = [ 'saving' => Events\SavingTenant::class, 'saved' => Events\TenantSaved::class,