[2.1.0] Fix queue race conditions (#178)

* Add TenantDoesNotExist exception, fix queued migrator serialization

* wip

* Apply fixes from StyleCI

* Use only one config for  queueing

* Apply fixes from StyleCI

* rename test

* rename test

assets/config.php

@@ -89,10 +89,9 @@ return [
         // 'paypal_api_key' => 'services.paypal.api_key',
     ],
     'home_url' => '/app',
-    'migrate_after_creation' => false, // run migrations after creating a tenant
-    'queue_automatic_migration' => false, // queue the automatic post-tenant-creation migrations
-    'delete_database_after_tenant_deletion' => false, // delete the tenant's database after deleting the tenant
     'queue_database_creation' => false,
+    'migrate_after_creation' => false, // run migrations after creating a tenant
     'queue_database_deletion' => false,
+    'delete_database_after_tenant_deletion' => false, // delete the tenant's database after deleting the tenant
     'unique_id_generator' => Stancl\Tenancy\UniqueIDGenerators\UUIDGenerator::class,
 ];

src/DatabaseManager.php

@@ -126,17 +126,21 @@ class DatabaseManager
      * Create a database for a tenant.
      *
      * @param Tenant $tenant
+     * @param \Illuminate\Contracts\Queue\ShouldQueue[]|callable[] $afterCreating
      * @return void
      */
-    public function createDatabase(Tenant $tenant)
+    public function createDatabase(Tenant $tenant, array $afterCreating = [])
     {
         $database = $tenant->getDatabaseName();
         $manager = $this->getTenantDatabaseManager($tenant);
 
         if ($this->app['config']['tenancy.queue_database_creation'] ?? false) {
-            QueuedTenantDatabaseCreator::dispatch($manager, $database);
+            QueuedTenantDatabaseCreator::withChain($afterCreating)->dispatch($manager, $database);
         } else {
             $manager->createDatabase($database);
+            foreach ($afterCreating as $callback) {
+                $callback();
+            }
         }
     }
 

src/Exceptions/TenantDoesNotExistException.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Exceptions;
+
+use Exception;
+
+class TenantDoesNotExistException extends Exception
+{
+    public function __construct(string $id)
+    {
+        $this->message = "Tenant with this id does not exist: $id";
+    }
+}

src/Jobs/QueuedTenantDatabaseMigrator.php

@@ -16,12 +16,12 @@ class QueuedTenantDatabaseMigrator implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    /** @var Tenant */
+    /** @var string */
-    protected $tenant;
+    protected $tenantId;
 
     public function __construct(Tenant $tenant)
     {
-        $this->tenant = $tenant;
+        $this->tenantId = $tenant->id;
     }
 
     /**
@@ -32,7 +32,7 @@ class QueuedTenantDatabaseMigrator implements ShouldQueue
     public function handle()
     {
         Artisan::call('tenants:migrate', [
-            '--tenants' => [$this->tenant->id],
+            '--tenants' => [$this->tenantId],
         ]);
     }
 }

src/StorageDrivers/Database/DatabaseStorageDriver.php

@@ -10,6 +10,7 @@ use Stancl\Tenancy\Contracts\StorageDriver;
 use Stancl\Tenancy\DatabaseManager;
 use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException;
 use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException;
+use Stancl\Tenancy\Exceptions\TenantDoesNotExistException;
 use Stancl\Tenancy\Exceptions\TenantWithThisIdAlreadyExistsException;
 use Stancl\Tenancy\StorageDrivers\Database\DomainModel as Domains;
 use Stancl\Tenancy\StorageDrivers\Database\TenantModel as Tenants;
@@ -59,7 +60,13 @@ class DatabaseStorageDriver implements StorageDriver
 
     public function findById(string $id): Tenant
     {
-        return Tenant::fromStorage(Tenants::find($id)->decoded())
+        $tenant = Tenants::find($id);
+
+        if (! $tenant) {
+            throw new TenantDoesNotExistException($id);
+        }
+
+        return Tenant::fromStorage($tenant->decoded())
             ->withDomains($this->getTenantDomains($id));
     }
 

src/StorageDrivers/RedisStorageDriver.php

@@ -9,6 +9,7 @@ use Illuminate\Foundation\Application;
 use Stancl\Tenancy\Contracts\StorageDriver;
 use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException;
 use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException;
+use Stancl\Tenancy\Exceptions\TenantDoesNotExistException;
 use Stancl\Tenancy\Exceptions\TenantWithThisIdAlreadyExistsException;
 use Stancl\Tenancy\Tenant;
 
@@ -73,7 +74,13 @@ class RedisStorageDriver implements StorageDriver
 
     public function findById(string $id): Tenant
     {
-        return $this->makeTenant($this->redis->hgetall("tenants:$id"));
+        $data = $this->redis->hgetall("tenants:$id");
+
+        if (! $data) {
+            throw new TenantDoesNotExistException($id);
+        }
+
+        return $this->makeTenant($data);
     }
 
     public function getTenantIdByDomain(string $domain): ?string

src/TenantManager.php

@@ -62,18 +62,24 @@ class TenantManager
         $this->ensureTenantCanBeCreated($tenant);
 
         $this->storage->createTenant($tenant);
-        $this->database->createDatabase($tenant);
+
+        /** @var \Illuminate\Contracts\Queue\ShouldQueue[]|callable[] $afterCreating */
+        $afterCreating = [];
 
         if ($this->shouldMigrateAfterCreation()) {
-            if ($this->shouldQueueMigration()) {
+            $afterCreating += $this->databaseCreationQueued() ? [
-                QueuedTenantDatabaseMigrator::dispatch($tenant);
+                new QueuedTenantDatabaseMigrator($tenant),
-            } else {
+            ] : [
-                $this->artisan->call('tenants:migrate', [
+                function () use ($tenant) {
-                    '--tenants' => [$tenant['id']],
+                    $this->artisan->call('tenants:migrate', [
-                ]);
+                        '--tenants' => [$tenant['id']],
-            }
+                    ]);
+                },
+            ];
         }
 
+        $this->database->createDatabase($tenant, $afterCreating);
+
         return $this;
     }
 
@@ -315,9 +321,9 @@ class TenantManager
         return $this->app['config']['tenancy.migrate_after_creation'] ?? false;
     }
 
-    public function shouldQueueMigration(): bool
+    public function databaseCreationQueued(): bool
     {
-        return $this->app['config']['tenancy.queue_automatic_migration'] ?? false;
+        return $this->app['config']['tenancy.queue_database_creation'] ?? false;
     }
 
     public function shouldDeleteDatabase(): bool

tests/TenantManagerTest.php

@@ -8,7 +8,9 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Storage;
 use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException;
+use Stancl\Tenancy\Exceptions\TenantDoesNotExistException;
 use Stancl\Tenancy\Exceptions\TenantWithThisIdAlreadyExistsException;
+use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator;
 use Stancl\Tenancy\Jobs\QueuedTenantDatabaseMigrator;
 use Stancl\Tenancy\Tenant;
 use Stancl\Tenancy\TenantManager;
@@ -248,22 +250,32 @@ class TenantManagerTest extends TestCase
     }
 
     /** @test */
-    public function automigration_can_be_queued()
+    public function automigration_is_queued_when_db_creation_is_queued()
     {
         Queue::fake();
 
         config([
+            'tenancy.queue_database_creation' => true,
             'tenancy.migrate_after_creation' => true,
-            'tenancy.queue_automatic_migration' => true,
         ]);
 
         $tenant = Tenant::new()->save();
-        tenancy()->initialize($tenant);
 
-        Queue::assertPushed(QueuedTenantDatabaseMigrator::class);
+        Queue::assertPushedWithChain(QueuedTenantDatabaseCreator::class, [
+            QueuedTenantDatabaseMigrator::class,
+        ]);
 
-        $this->assertFalse(\Schema::hasTable('users'));
+        // foreach (Queue::pushedJobs() as $job) {
-        (new QueuedTenantDatabaseMigrator($tenant))->handle();
+        //     $job[0]['job']->handle(); // this doesn't execute the chained job
-        $this->assertTrue(\Schema::hasTable('users'));
+        // }
+        // tenancy()->initialize($tenant);
+        // $this->assertTrue(\Schema::hasTable('users'));
+    }
+
+    /** @test */
+    public function TenantDoesNotExistException_is_thrown_when_find_is_called_on_an_id_that_does_not_belong_to_any_tenant()
+    {
+        $this->expectException(TenantDoesNotExistException::class);
+        tenancy()->find('gjnfdgf');
     }
 }