From 6b103cd2cb8a92c87a061890326e8c3b3f4f9a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Fri, 27 Sep 2019 22:53:38 +0200 Subject: [PATCH] Model timestamps --- .../migrations/2019_09_15_000010_create_tenants_table.php | 4 +++- .../migrations/2019_09_15_000020_create_domains_table.php | 1 + composer.json | 3 ++- src/StorageDrivers/Database/DatabaseStorageDriver.php | 6 ++++-- src/StorageDrivers/Database/DomainModel.php | 1 - src/StorageDrivers/Database/TenantModel.php | 1 - 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/assets/migrations/2019_09_15_000010_create_tenants_table.php b/assets/migrations/2019_09_15_000010_create_tenants_table.php index ad806827..86d5e059 100644 --- a/assets/migrations/2019_09_15_000010_create_tenants_table.php +++ b/assets/migrations/2019_09_15_000010_create_tenants_table.php @@ -17,9 +17,11 @@ class CreateTenantsTable extends Migration { Schema::create('tenants', function (Blueprint $table) { $table->string('id', 36)->primary(); // 36 characters is the default uuid length - // (optional) your custom, indexed columns can go here + + // (optional) your custom, indexed columns may go here $table->json('data'); + $table->timestamps(); }); } diff --git a/assets/migrations/2019_09_15_000020_create_domains_table.php b/assets/migrations/2019_09_15_000020_create_domains_table.php index 1ee0d5f3..de2855fc 100644 --- a/assets/migrations/2019_09_15_000020_create_domains_table.php +++ b/assets/migrations/2019_09_15_000020_create_domains_table.php @@ -18,6 +18,7 @@ class CreateDomainsTable extends Migration Schema::create('domains', function (Blueprint $table) { $table->string('domain', 255)->primary(); $table->string('tenant_id', 36); + $table->timestamps(); $table->foreign('tenant_id')->references('id')->on('tenants')->onUpdate('cascade')->onDelete('cascade'); }); diff --git a/composer.json b/composer.json index f3622760..49fa840f 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ "require": { "illuminate/support": "^6.0", "webpatser/laravel-uuid": "^3.0", - "facade/ignition-contracts": "^1.0" + "facade/ignition-contracts": "^1.0", + "nesbot/carbon": "^2.0" }, "require-dev": { "vlucas/phpdotenv": "^3.3", diff --git a/src/StorageDrivers/Database/DatabaseStorageDriver.php b/src/StorageDrivers/Database/DatabaseStorageDriver.php index c18dbad8..010218ee 100644 --- a/src/StorageDrivers/Database/DatabaseStorageDriver.php +++ b/src/StorageDrivers/Database/DatabaseStorageDriver.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace Stancl\Tenancy\StorageDrivers\Database; use Illuminate\Foundation\Application; +use Illuminate\Support\Carbon; use Stancl\Tenancy\Contracts\StorageDriver; use Stancl\Tenancy\DatabaseManager; use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException; @@ -84,9 +85,10 @@ class DatabaseStorageDriver implements StorageDriver $domainData = []; foreach ($tenant->domains as $domain) { - $domainData[] = ['domain' => $domain, 'tenant_id' => $tenant->id]; + $domainData[] = ['domain' => $domain, 'tenant_id' => $tenant->id, 'created_at' => Carbon::now()]; } - Domains::create($domainData); + + Domains::insert($domainData); }); } diff --git a/src/StorageDrivers/Database/DomainModel.php b/src/StorageDrivers/Database/DomainModel.php index aa348887..3cb8704b 100644 --- a/src/StorageDrivers/Database/DomainModel.php +++ b/src/StorageDrivers/Database/DomainModel.php @@ -16,7 +16,6 @@ class DomainModel extends Model protected $guarded = []; protected $primaryKey = 'domain'; public $incrementing = false; - public $timestamps = false; public function getTable() { diff --git a/src/StorageDrivers/Database/TenantModel.php b/src/StorageDrivers/Database/TenantModel.php index 36c24b58..3b49bc80 100644 --- a/src/StorageDrivers/Database/TenantModel.php +++ b/src/StorageDrivers/Database/TenantModel.php @@ -16,7 +16,6 @@ class TenantModel extends Model protected $guarded = []; protected $primaryKey = 'id'; public $incrementing = false; - public $timestamps = false; public function getTable() {