archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 21:34:04 +00:00
Code Activity

Improve DatabaseManager create & delete fns code

Browse source
This commit is contained in:
Samuel Štancl 2019-09-08 15:51:48 +02:00
parent 11d7c564d9
commit 08319695b9
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/DatabaseManagerv2.php
View file

@ -7,6 +7,7 @@ namespace Stancl\Tenancy;
use Illuminate\Foundation\Application; use Illuminate\Foundation\Application;
use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator; use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator;
use Illuminate\Database\DatabaseManager as BaseDatabaseManager; use Illuminate\Database\DatabaseManager as BaseDatabaseManager;
use Stancl\Tenancy\Exceptions\DatabaseManagerNotRegisteredException;
class DatabaseManagerv2 class DatabaseManagerv2
{ {
@ -100,16 +101,8 @@ class DatabaseManagerv2
public function createDatabase(Tenant $tenant) public function createDatabase(Tenant $tenant)
{ {
$database = $tenant->getDatabaseName(); $database = $tenant->getDatabaseName();
$connection = $tenant->getConnectionName(); // todo $manager = $this->getTenantDatabaseManager($tenant);
$driver = $this->getDriver($connection);
$databaseManagers = $this->app['config']['tenancy.database_managers'];
if (! \array_key_exists($driver, $databaseManagers)) {
throw new DatabaseManagerNotRegisteredException('Database could not be created', $driver);
}
$manager = $databaseManagers[$driver];
if ($this->app['config']['tenancy.queue_database_creation'] ?? false) { if ($this->app['config']['tenancy.queue_database_creation'] ?? false) {
QueuedTenantDatabaseCreator::dispatch($this->app[$manager], $database, 'create'); QueuedTenantDatabaseCreator::dispatch($this->app[$manager], $database, 'create');
} else { } else {
@ -117,24 +110,29 @@ class DatabaseManagerv2
} }
} }
// todo this is the same as createDatabase. find a way to remove duplicite code
public function deleteDatabase(Tenant $tenant) public function deleteDatabase(Tenant $tenant)
{ {
$database = $tenant->getDatabaseName(); $database = $tenant->getDatabaseName();
$connection = $tenant->getConnectionName(); // todo $manager = $this->getTenantDatabaseManager($tenant);
$driver = $this->getDriver($connection);
$databaseManagers = $this->app['config']['tenancy.database_managers'];
if (! \array_key_exists($driver, $databaseManagers)) {
throw new DatabaseManagerNotRegisteredException('Database could not be deleted', $driver);
}
$manager = $databaseManagers[$driver];
if ($this->app['config']['tenancy.queue_database_creation'] ?? false) { if ($this->app['config']['tenancy.queue_database_creation'] ?? false) {
QueuedTenantDatabaseCreator::dispatch($this->app[$manager], $database, 'delete'); QueuedTenantDatabaseCreator::dispatch($this->app[$manager], $database, 'delete');
} else { } else {
return $this->app[$manager]->deleteDatabase($database); return $this->app[$manager]->deleteDatabase($database);
} }
} }
protected function getTenantDatabaseManager(Tenant $tenant)
{
$connection = $tenant->getConnectionName(); // todo
$driver = $this->getDriver($connection);
$databaseManagers = $this->app['config']['tenancy.database_managers'];
if (! \array_key_exists($driver, $databaseManagers)) {
throw new DatabaseManagerNotRegisteredException($driver);
}
return $databaseManagers[$driver];
}
} }

4
src/Exceptions/DatabaseManagerNotRegisteredException.php
View file

@ -6,8 +6,8 @@ namespace Stancl\Tenancy\Exceptions;
class DatabaseManagerNotRegisteredException extends \Exception class DatabaseManagerNotRegisteredException extends \Exception
{ {
public function __construct($error, $driver) public function __construct($driver)
{ {
$this->message = "$error: no database manager for driver $driver is registered."; $this->message = "Database manager for driver $driver is not registered.";
} }
} }