From 73c5655bc886f46ae4689b29bcd19657ea86a406 Mon Sep 17 00:00:00 2001
From: Abrar Ahmad <abrar.dev99@gmail.com>
Date: Fri, 25 Nov 2022 07:09:31 +0500
Subject: [PATCH] Manual mode improvements (use correct event type, add new
 listeners) (#1013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix issue and add test

* Update CreateTenantConnection.php

* add purge call

* Update ManualModeTest.php

* use tenant connection and central connection listener

* Update ManualModeTest.php

* fix test

* improvements

* Update ManualModeTest.php

* add comment

* simplify comment

Co-authored-by: Samuel Štancl <samuel@archte.ch>
---
 src/Listeners/CreateTenantConnection.php |  9 ++---
 src/Listeners/UseCentralConnection.php   | 21 +++++++++++
 src/Listeners/UseTenantConnection.php    | 21 +++++++++++
 tests/ManualModeTest.php                 | 45 ++++++++++++++++++++++++
 4 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 src/Listeners/UseCentralConnection.php
 create mode 100644 src/Listeners/UseTenantConnection.php
 create mode 100644 tests/ManualModeTest.php

diff --git a/src/Listeners/CreateTenantConnection.php b/src/Listeners/CreateTenantConnection.php
index b4983d32..6af18a10 100644
--- a/src/Listeners/CreateTenantConnection.php
+++ b/src/Listeners/CreateTenantConnection.php
@@ -6,7 +6,7 @@ namespace Stancl\Tenancy\Listeners;
 
 use Stancl\Tenancy\Database\Contracts\TenantWithDatabase;
 use Stancl\Tenancy\Database\DatabaseManager;
-use Stancl\Tenancy\Events\Contracts\TenantEvent;
+use Stancl\Tenancy\Events\Contracts\TenancyEvent;
 
 class CreateTenantConnection
 {
@@ -15,11 +15,12 @@ class CreateTenantConnection
     ) {
     }
 
-    public function handle(TenantEvent $event): void
+    public function handle(TenancyEvent $event): void
     {
-        /** @var TenantWithDatabase */
-        $tenant = $event->tenant;
+        /** @var TenantWithDatabase $tenant */
+        $tenant = $event->tenancy->tenant;
 
+        $this->database->purgeTenantConnection();
         $this->database->createTenantConnection($tenant);
     }
 }
diff --git a/src/Listeners/UseCentralConnection.php b/src/Listeners/UseCentralConnection.php
new file mode 100644
index 00000000..716a5148
--- /dev/null
+++ b/src/Listeners/UseCentralConnection.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Listeners;
+
+use Stancl\Tenancy\Database\DatabaseManager;
+use Stancl\Tenancy\Events\Contracts\TenancyEvent;
+
+class UseCentralConnection
+{
+    public function __construct(
+        protected DatabaseManager $database,
+    ) {
+    }
+
+    public function handle(TenancyEvent $event): void
+    {
+        $this->database->reconnectToCentral();
+    }
+}
diff --git a/src/Listeners/UseTenantConnection.php b/src/Listeners/UseTenantConnection.php
new file mode 100644
index 00000000..a4c12108
--- /dev/null
+++ b/src/Listeners/UseTenantConnection.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Listeners;
+
+use Stancl\Tenancy\Database\DatabaseManager;
+use Stancl\Tenancy\Events\Contracts\TenancyEvent;
+
+class UseTenantConnection
+{
+    public function __construct(
+        protected DatabaseManager $database,
+    ) {
+    }
+
+    public function handle(TenancyEvent $event): void
+    {
+        $this->database->setDefaultConnection('tenant');
+    }
+}
diff --git a/tests/ManualModeTest.php b/tests/ManualModeTest.php
new file mode 100644
index 00000000..fe1ba9a6
--- /dev/null
+++ b/tests/ManualModeTest.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Support\Facades\Event;
+use Stancl\JobPipeline\JobPipeline;
+use Stancl\Tenancy\Events\TenancyEnded;
+use Stancl\Tenancy\Events\TenancyInitialized;
+use Stancl\Tenancy\Events\TenantCreated;
+use Stancl\Tenancy\Jobs\CreateDatabase;
+use Stancl\Tenancy\Listeners\CreateTenantConnection;
+use Stancl\Tenancy\Listeners\UseCentralConnection;
+use Stancl\Tenancy\Listeners\UseTenantConnection;
+use \Stancl\Tenancy\Tests\Etc\Tenant;
+
+test('manual tenancy initialization works', function () {
+    Event::listen(TenantCreated::class, JobPipeline::make([CreateDatabase::class])->send(function (TenantCreated $event) {
+        return $event->tenant;
+    })->toListener());
+
+    Event::listen(TenancyInitialized::class, CreateTenantConnection::class);
+    Event::listen(TenancyInitialized::class, UseTenantConnection::class);
+    Event::listen(TenancyEnded::class, UseCentralConnection::class);
+
+    $tenant = Tenant::create();
+
+    expect(app('db')->getDefaultConnection())->toBe('central');
+    expect(array_keys(app('db')->getConnections()))->toBe(['central', 'tenant_host_connection']);
+    pest()->assertArrayNotHasKey('tenant', config('database.connections'));
+
+    tenancy()->initialize($tenant);
+    
+    // Trigger creation of the tenant connection
+    createUsersTable();
+
+    expect(app('db')->getDefaultConnection())->toBe('tenant');
+    expect(array_keys(app('db')->getConnections()))->toBe(['central', 'tenant']);
+    pest()->assertArrayHasKey('tenant', config('database.connections'));
+
+    tenancy()->end();
+
+    expect(array_keys(app('db')->getConnections()))->toBe(['central']);
+    expect(config('database.connections.tenant'))->toBeNull();
+    expect(app('db')->getDefaultConnection())->toBe(config('tenancy.database.central_connection'));
+});