archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-04 19:04:03 +00:00
Code Activity

Apply fixes suggested by @carlos-mora

Browse source
This commit is contained in:
Samuel Štancl 2019-08-11 20:19:09 +02:00
parent 429b1779f5
commit f073926cfb
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/StorageDrivers/DatabaseStorageDriver.php
View file

@ -2,7 +2,7 @@
namespace Stancl\Tenancy\StorageDrivers; namespace Stancl\Tenancy\StorageDrivers;
use Stancl\Tenancy\Interfaces\TenantModel; use Stancl\Tenancy\Tenant;
use Stancl\Tenancy\Interfaces\StorageDriver; use Stancl\Tenancy\Interfaces\StorageDriver;
class DatabaseStorageDriver implements StorageDriver class DatabaseStorageDriver implements StorageDriver
@ -50,9 +50,13 @@ class DatabaseStorageDriver implements StorageDriver
public function getAllTenants(array $uuids = []): array public function getAllTenants(array $uuids = []): array
{ {
return Tenant::all()->map(function ($model) { if ($uuids) {
return $model->toArray(); $tenants = Tenant::find($uuids);
})->toArray(); } else {
$tenants = Tenant::all();
}
return $tenants->toArray();
} }
public function get(string $uuid, string $key) public function get(string $uuid, string $key)

4
src/Tenant.php
View file

@ -20,12 +20,12 @@ class Tenant extends Model
public function dataColumn() public function dataColumn()
{ {
return config('tenancy.db_storage.data_column'); return config('tenancy.db_storage.data_column', 'data');
} }
public function customColumns() public function customColumns()
{ {
return config('tenancy.db_storage.custom_columns'); return config('tenancy.db_storage.custom_columns', []);
} }
public function getFromData(string $key) public function getFromData(string $key)

2
src/assets/migrations/2019_08_08_000000_create_tenants_table.php
View file

@ -16,7 +16,7 @@ class CreateTenantsTable extends Migration
Schema::create('tenants', function (Blueprint $table) { Schema::create('tenants', function (Blueprint $table) {
$table->string('uuid', 36)->primary(); $table->string('uuid', 36)->primary();
$table->string('domain', 255)->index(); $table->string('domain', 255)->index();
$table->string('data', 1024)->default('{}'); $table->json('data')->default('{}');
}); });
} }