Feature: Allow users to disable the overwriting of the default connec…

…tion and adjust hooks to perform properly on queues (#279)

* Adjust hooks to perform properly on queues

* Linting

* Include tests

* Adjust to comply with PHP 8.0

src/Hooks/Migration/Hooks/MigratesHook.php

@@ -16,7 +16,6 @@
 
 namespace Tenancy\Hooks\Migration\Hooks;
 
-use Illuminate\Database\Migrations\Migrator;
 use Tenancy\Affects\Connections\Contracts\ResolvesConnections;
 use Tenancy\Facades\Tenancy;
 use Tenancy\Hooks\Migration\Events\ConfigureMigrations;
@@ -25,12 +24,8 @@
 
 class MigratesHook extends ConfigurableHook
 {
-    public Migrator $migrator;
-
     public string $connection;
 
-    public ResolvesConnections $resolver;
-
     public $action;
 
     public int $priority = -50;
@@ -39,11 +34,9 @@ class MigratesHook extends ConfigurableHook
 
     public function __construct()
     {
-        $this->migrator = resolve('migrator');
         $this->connection = Tenancy::getTenantConnectionName();
-        $this->resolver = resolve(ResolvesConnections::class);
 
-        $this->paths = $this->migrator->paths();
+        $this->paths = resolve('migrator')->paths();
     }
 
     public function for($event): static
@@ -60,17 +53,20 @@ public function for($event): static
     public function fire(): void
     {
         $db = resolve('db');
+        $migrator = resolve('migrator');
+        $resolver = resolve(ResolvesConnections::class);
+
         $default = $db->getDefaultConnection();
 
-        $this->resolver->__invoke($this->event->tenant, $this->connection);
-        $this->migrator->setConnection($this->connection);
+        $resolver->__invoke($this->event->tenant, $this->connection);
+        $migrator->setConnection($this->connection);
 
-        if (!$this->migrator->repositoryExists()) {
-            $this->migrator->getRepository()->createRepository();
+        if (!$migrator->repositoryExists()) {
+            $migrator->getRepository()->createRepository();
         }
-        call_user_func([$this->migrator, $this->action], $this->paths);
+        call_user_func([$migrator, $this->action], $this->paths);
 
-        $this->resolver->__invoke(null, $this->connection);
+        $resolver->__invoke(null, $this->connection);
         $db->setDefaultConnection($default);
     }
 }

src/Hooks/Migration/Hooks/SeedsHook.php

@@ -28,19 +28,18 @@ class SeedsHook extends ConfigurableHook
 {
     public string $connection;
 
-    public ResolvesConnections $resolver;
-
     public ?string $action = null;
 
     public int $priority = -40;
 
+    protected bool $replaceDefaultConnection = true;
+
     /** @var array|string[] */
     public array $seeds = [];
 
     public function __construct()
     {
         $this->connection = Tenancy::getTenantConnectionName();
-        $this->resolver = resolve(ResolvesConnections::class);
     }
 
     public function for($event): static
@@ -54,20 +53,31 @@ public function for($event): static
         return $this;
     }
 
+    public function withDefaultConnection(bool $replace = true): static
+    {
+        $this->replaceDefaultConnection = $replace;
+
+        return $this;
+    }
+
     public function fire(): void
     {
         if (empty($this->seeds)) {
             return;
         }
 
         $db = resolve('db');
+        $resolver = resolve(ResolvesConnections::class);
 
         $default = $db->getDefaultConnection();
 
         Model::unguard();
 
-        $this->resolver->__invoke($this->event->tenant, $this->connection);
-        $db->setDefaultConnection($this->connection);
+        $resolver->__invoke($this->event->tenant, $this->connection);
+
+        if ($this->replaceDefaultConnection) {
+            $db->setDefaultConnection($this->connection);
+        }
 
         foreach ($this->seeds as $seed) {
             /** @var Seeder $seeder */
@@ -77,8 +87,11 @@ public function fire(): void
             $seeder();
         }
 
-        $this->resolver->__invoke(null, $this->connection);
-        $db->setDefaultConnection($default);
+        $resolver->__invoke(Tenancy::getTenant(), $this->connection);
+
+        if ($this->replaceDefaultConnection) {
+            $db->setDefaultConnection($default);
+        }
 
         Model::reguard();
     }

tests/Hooks/Migration/Unit/ConfiguresSeedsTest.php

@@ -46,4 +46,25 @@ public function it_can_add_seeds($tenantEvent)
             $this->hook->seeds
         );
     }
+
+    /**
+     * @dataProvider tenantEventsProvider
+     *
+     * @test */
+    public function it_can_decide_whether_to_replace_the_default($tenantEvent)
+    {
+        $this->events->listen($this->eventClass, function ($event) {
+            $event->hook->withDefaultConnection(false);
+        });
+
+        $this->hook->for(new $tenantEvent($this->mockTenant()));
+
+        $reflection = new \ReflectionClass($this->hook);
+        $property = $reflection->getProperty('replaceDefaultConnection');
+        $property->setAccessible(true);
+
+        $this->assertFalse(
+            $property->getValue($this->hook)
+        );
+    }
 }