user destroying flow updated

akaunting · Jun 29, 2022 · c846aa0 · c846aa0
1 parent 127d85d
commit c846aa0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 34 deletions.
diff --git a/app/Jobs/Auth/DeleteUser.php b/app/Jobs/Auth/DeleteUser.php
@@ -16,6 +16,8 @@ public function handle(): bool
         event(new UserDeleting($this->model));
 
         \DB::transaction(function () {
+            $this->deleteRelationships($this->model, ['invitation']);
+
             $this->model->delete();
 
             $this->model->flushCache();

diff --git a/app/Listeners/Auth/DeleteUserInvitation.php b/app/Listeners/Auth/DeleteUserInvitation.php
diff --git a/app/Listeners/Update/V30/Version304.php b/app/Listeners/Update/V30/Version304.php
@@ -58,6 +58,7 @@ public function deleteOldFiles()
         $files = [
             'app/Events/Auth/InvitationCreated.php',
             'app/Listeners/Auth/SendUserInvitation.php',
+            'app/Listeners/Auth/DeleteUserInvitation.php',
         ];
 
         foreach ($files as $file) {

diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
@@ -89,6 +89,11 @@ public function dashboards()
         return $this->belongsToMany('App\Models\Common\Dashboard', 'App\Models\Auth\UserDashboard');
     }
 
+    public function invitation()
+    {
+        return $this->hasOne('App\Models\Auth\UserInvitation', 'user_id', 'id');
+    }
+
     /**
      * Always capitalize the name when we retrieve it
      */

diff --git a/app/Providers/Event.php b/app/Providers/Event.php
@@ -32,12 +32,6 @@ class Event extends Provider
         'App\Events\Auth\LandingPageShowing' => [
             'App\Listeners\Auth\AddLandingPages',
         ],
-        'App\Events\Auth\InvitationCreated' => [
-            'App\Listeners\Auth\SendUserInvitation',
-        ],
-        'App\Events\Auth\UserDeleted' => [
-            'App\Listeners\Auth\DeleteUserInvitation',
-        ],
         'App\Events\Document\DocumentCreated' => [
             'App\Listeners\Document\CreateDocumentCreatedHistory',
             'App\Listeners\Document\IncreaseNextDocumentNumber',