1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 15:54:03 +00:00

Get tests to run

This commit is contained in:
Samuel Štancl 2019-09-11 21:11:40 +02:00
parent 23a4fd24b0
commit 7a0154bf8e
8 changed files with 46 additions and 29 deletions

View file

@ -24,22 +24,32 @@ class DatabaseStorageDriver implements StorageDriver
return $this->find($id); return $this->find($id);
} }
public function find(string $id): Tenant public function findById(string $id): Tenant
{ {
return Tenant::fromStorage(Tenants::find($id)->decoded()) return Tenant::fromStorage(Tenants::find($id)->decoded())
->withDomains(Domains::where('tenant_id', $id)->all()->only('domain')->toArray()); ->withDomains(Domains::where('tenant_id', $id)->all()->only('domain')->toArray());
} }
public function canCreateTenant(Tenant $tenant)
{
// todo
}
public function getTenantIdByDomain(string $domain): ?string public function getTenantIdByDomain(string $domain): ?string
{ {
return Domains::where('domain', $domain)->first()->tenant_id ?? null; return Domains::where('domain', $domain)->first()->tenant_id ?? null;
} }
public function createTenant(string $domain, string $id): void public function createTenant(Tenant $tenant): void
{ {
DB::transaction(function () use ($domain, $id) { DB::transaction(function () use ($tenant) {
Tenants::create(['id' => $id, 'data' => '{}'])->toArray(); Tenants::create(['id' => $tenant->id, 'data' => '{}'])->toArray();
Domains::create(['domain' => $domain, 'tenant_id' => $id]);
$domainData = [];
foreach($tenant->domains as $domain) {
$domainData[] = ['domain' => $domain, 'tenant_id' => $tenant->id];
}
Domains::create($domainData);
}); });
} }
@ -48,9 +58,10 @@ class DatabaseStorageDriver implements StorageDriver
// todo // todo
} }
public function deleteTenant(string $id): bool public function deleteTenant(Tenant $tenant): void
{ {
return Tenants::find($id)->delete(); Tenants::find($tenant->id)->delete();
// todo domains
} }
public function all(array $ids = []): array public function all(array $ids = []): array
@ -58,27 +69,26 @@ class DatabaseStorageDriver implements StorageDriver
return Tenants::getAllTenants($ids)->toArray(); return Tenants::getAllTenants($ids)->toArray();
} }
public function get(string $id, string $key) public function get(string $key, Tenant $tenant = null)
{ {
return Tenants::find($id)->get($key); return Tenants::find($tenant->id)->get($key);
} }
public function getMany(string $id, array $keys): array // todo storage methods default to current tenant
public function getMany(array $keys, Tenant $tenant = null): array
{ {
return Tenants::find($id)->getMany($keys); return Tenants::find($tenant->id)->getMany($keys);
} }
public function put(string $id, string $key, $value) public function put(string $key, $value, Tenant $tenant = null): void
{ {
return Tenants::find($id)->put($key, $value); Tenants::find($tenant->id)->put($key, $value);
} }
public function putMany(string $id, array $values): array public function putMany(array $kvPairs, Tenant $tenant = null): void
{ {
foreach ($values as $key => $value) { // todo performance foreach ($kvPairs as $key => $value) { // todo performance
Tenants::find($id)->put($key, $value); Tenants::find($tenant->id)->put($key, $value);
} }
return $values;
} }
} }

View file

@ -36,6 +36,11 @@ class RedisStorageDriver implements StorageDriver
return $this->app[Tenant::class]; return $this->app[Tenant::class];
} }
public function canCreateTenant(Tenant $tenant)
{
// todo
}
public function findByDomain(string $domain): Tenant public function findByDomain(string $domain): Tenant
{ {
$id = $this->getTenantIdByDomain($domain); $id = $this->getTenantIdByDomain($domain);
@ -46,7 +51,7 @@ class RedisStorageDriver implements StorageDriver
return $this->find($id); return $this->find($id);
} }
public function find(string $id): Tenant public function findById(string $id): Tenant
{ {
$data = $this->redis->hgetall("tenants:$id"); $data = $this->redis->hgetall("tenants:$id");
$keys = []; $keys = [];
@ -151,15 +156,13 @@ class RedisStorageDriver implements StorageDriver
return $result; return $result;
} }
public function put(string $key, $value, Tenant $tenant = null) public function put(string $key, $value, Tenant $tenant = null): void
{ {
$tenant = $tenant ?? $this->tenant(); $tenant = $tenant ?? $this->tenant();
$this->redis->hset("tenants:{$tenant->id}", $key, json_encode($value)); $this->redis->hset("tenants:{$tenant->id}", $key, json_encode($value));
return $value;
} }
public function putMany(array $kvPairs, Tenant $tenant = null): array public function putMany(array $kvPairs, Tenant $tenant = null): void
{ {
$tenant = $tenant ?? $this->tenant(); $tenant = $tenant ?? $this->tenant();
@ -168,7 +171,5 @@ class RedisStorageDriver implements StorageDriver
} }
$this->redis->hmset("tenants:{$tenant->id}", $kvPairs); $this->redis->hmset("tenants:{$tenant->id}", $kvPairs);
return $kvPairs;
} }
} }

View file

@ -5,13 +5,14 @@ declare(strict_types=1);
namespace Stancl\Tenancy\TenancyBoostrappers; namespace Stancl\Tenancy\TenancyBoostrappers;
use Stancl\Tenancy\Contracts\TenancyBootstrapper; use Stancl\Tenancy\Contracts\TenancyBootstrapper;
use Stancl\Tenancy\Tenant;
class CacheTenancyBoostrapper implements TenancyBootstrapper class CacheTenancyBoostrapper implements TenancyBootstrapper
{ {
/** @var \Illuminate\Cache\CacheManager */ /** @var \Illuminate\Cache\CacheManager */
protected $originalCache; protected $originalCache;
public function start() public function start(Tenant $tenant)
{ {
$this->originalCache = $this->originalCache ?? $this->app['cache']; $this->originalCache = $this->originalCache ?? $this->app['cache'];
$this->app->extend('cache', function () { $this->app->extend('cache', function () {

View file

@ -7,6 +7,7 @@ namespace Stancl\Tenancy\TenancyBoostrappers;
use Illuminate\Foundation\Application; use Illuminate\Foundation\Application;
use Stancl\Tenancy\Contracts\TenancyBootstrapper; use Stancl\Tenancy\Contracts\TenancyBootstrapper;
use Stancl\Tenancy\DatabaseManager; use Stancl\Tenancy\DatabaseManager;
use Stancl\Tenancy\Tenant;
class DatabaseTenancyBootstrapper implements TenancyBootstrapper class DatabaseTenancyBootstrapper implements TenancyBootstrapper
{ {

View file

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Stancl\Tenancy\TenancyBoostrappers; namespace Stancl\Tenancy\TenancyBoostrappers;
use Stancl\Tenancy\Contracts\TenancyBootstrapper; use Stancl\Tenancy\Contracts\TenancyBootstrapper;
use Stancl\Tenancy\Tenant;
// todo better solution than tenant_asset? // todo better solution than tenant_asset?
@ -24,7 +25,7 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
]; ];
} }
public function start() public function start(Tenant $tenant)
{ {
// todo revisit this // todo revisit this
$suffix = $this->app['config']['tenancy.filesystem.suffix_base'] . tenant('uuid'); $suffix = $this->app['config']['tenancy.filesystem.suffix_base'] . tenant('uuid');

View file

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Stancl\Tenancy\TenancyBoostrappers; namespace Stancl\Tenancy\TenancyBoostrappers;
use Stancl\Tenancy\Contracts\TenancyBootstrapper; use Stancl\Tenancy\Contracts\TenancyBootstrapper;
use Stancl\Tenancy\Tenant;
class QueueTenancyBootstrapper implements TenancyBootstrapper class QueueTenancyBootstrapper implements TenancyBootstrapper
{ {
@ -26,7 +27,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
}); });
} }
public function start() public function start(Tenant $tenant)
{ {
$this->started = true; $this->started = true;
} }

View file

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Stancl\Tenancy\TenantDatabaseManagers; namespace Stancl\Tenancy\TenantDatabaseManagers;
use Stancl\Tenancy\Contracts\TenancyBootstrapper; use Stancl\Tenancy\Contracts\TenancyBootstrapper;
use Stancl\Tenancy\Tenant;
class RedisTenancyBootstrapper implements TenancyBootstrapper class RedisTenancyBootstrapper implements TenancyBootstrapper
{ {
@ -19,7 +20,7 @@ class RedisTenancyBootstrapper implements TenancyBootstrapper
$this->app = $app; $this->app = $app;
} }
public function start() public function start(Tenant $tenant)
{ {
foreach ($this->prefixedConnections() as $connection) { foreach ($this->prefixedConnections() as $connection) {
$prefix = $this->app['config']['tenancy.redis.prefix_base'] . $this->tenant['uuid']; $prefix = $this->app['config']['tenancy.redis.prefix_base'] . $this->tenant['uuid'];

View file

@ -69,6 +69,7 @@ class Tenant implements ArrayAccess
return $this; return $this;
} }
// todo addDomain, removeDomain
public function withDomains($domains): self public function withDomains($domains): self
{ {
$domains = (array) $domains; $domains = (array) $domains;