From b4010e271fc39c6e99a0731b6ce559f3b2d03ec8 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Fri, 8 Feb 2019 11:29:15 +0100
Subject: [PATCH] Move account deletion emails sending to user observer

---
 Changelog                                     | 1 +
 app/Http/Controllers/Admin/UserController.php | 2 --
 app/Http/Controllers/ProfileController.php    | 1 -
 app/Observers/UserServiceObserver.php         | 9 +++++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 5fa699bc7..5068023f8 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2019-02-08 DariusIII
+	* Chg: Move account deletion emails sending to user observer
 	* Chg: Add email notifications for new registered user on site, send welcome email to new users
 	* Chg: Comment out missed dict definition in sphinx.conf (resolves issue #878)
 2019-02-07 DariusIII
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 71fe04a2d..f73009374 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -230,8 +230,6 @@ class UserController extends BasePageController
         if ($request->has('id')) {
             $user = User::find($request->input('id'));
 
-            SendAccountDeletedEmail::dispatch($user);
-
             $user->delete();
 
             return redirect('admin/user-list');
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index a4e7fe7c4..41833e046 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -354,7 +354,6 @@ class ProfileController extends BasePageController
 
         if ($userId !== null && (int) $userId === $this->userdata->id && ! $this->userdata->hasRole('Admin')) {
             $user = User::find($userId);
-            SendAccountDeletedEmail::dispatch($user);
             $user->delete();
 
             return redirect('login');
diff --git a/app/Observers/UserServiceObserver.php b/app/Observers/UserServiceObserver.php
index db8b1f155..b5507caad 100644
--- a/app/Observers/UserServiceObserver.php
+++ b/app/Observers/UserServiceObserver.php
@@ -2,6 +2,7 @@
 
 namespace App\Observers;
 
+use App\Jobs\SendAccountDeletedEmail;
 use App\Models\User;
 use App\Jobs\SendWelcomeEmail;
 use App\Jobs\SendNewRegisteredAccountMail;
@@ -25,4 +26,12 @@ class UserServiceObserver
 
         UserVerification::send($user, 'User email verification required');
     }
+
+    /**
+     * @param \App\Models\User $user
+     */
+    public function deleting(User $user)
+    {
+        SendAccountDeletedEmail::dispatch($user);
+    }
 }