Fix queue driver with emails not sending; formatting #675

nabeelio · May 8, 2020 · d5fc083 · d5fc083
1 parent 5367f92
commit d5fc083
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 10 deletions.
diff --git a/app/Notifications/BaseNotification.php b/app/Notifications/BaseNotification.php
@@ -20,7 +20,7 @@ public function __construct()
         $klass = get_class($this);
         $notif_config = config('notifications.channels', []);
         if (!array_key_exists($klass, $notif_config)) {
-            Log::error('Notification type '.$klass.' missing from notifications config');
+            Log::error('Notification type '.$klass.' missing from notifications config, defaulting to mail');
             return;
         }
 

diff --git a/app/Notifications/Channels/MailChannel.php b/app/Notifications/Channels/MailChannel.php
@@ -3,12 +3,13 @@
 namespace App\Notifications\Channels;
 
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Log;
 
 trait MailChannel
 {
-    private $mailSubject;
-    private $mailTemplate;
-    private $mailTemplateArgs;
+    protected $mailSubject;
+    protected $mailTemplate;
+    protected $mailTemplateArgs;
 
     /**
      * Set the arguments for the toMail() method
@@ -33,6 +34,7 @@ public function setMailable($subject, $template, $args)
      */
     public function toMail($notifiable)
     {
+        Log::info('Sending mail message: '.$this->mailSubject);
         return (new MailMessage())
             ->from(config('mail.from.address', 'no-reply@phpvms.net'))
             ->subject($this->mailSubject)

diff --git a/app/Notifications/Messages/AdminUserRegistered.php b/app/Notifications/Messages/AdminUserRegistered.php
@@ -10,6 +10,8 @@ class AdminUserRegistered extends BaseNotification
 {
     use MailChannel;
 
+    public $channels = ['mail'];
+
     private $user;
 
     /**

diff --git a/app/Notifications/Messages/NewsAdded.php b/app/Notifications/Messages/NewsAdded.php
@@ -10,6 +10,8 @@ class NewsAdded extends BaseNotification
 {
     use MailChannel;
 
+    public $channels = ['mail'];
+
     private $news;
 
     public function __construct(News $news)

diff --git a/app/Notifications/Messages/PirepAccepted.php b/app/Notifications/Messages/PirepAccepted.php
@@ -13,6 +13,8 @@ class PirepAccepted extends BaseNotification
 {
     use MailChannel;
 
+    public $channels = ['mail'];
+
     private $pirep;
 
     /**

diff --git a/app/Notifications/Messages/PirepRejected.php b/app/Notifications/Messages/PirepRejected.php
@@ -10,6 +10,8 @@ class PirepRejected extends BaseNotification
 {
     use MailChannel;
 
+    public $channels = ['mail'];
+
     private $pirep;
 
     /**

diff --git a/app/Notifications/Messages/PirepSubmitted.php b/app/Notifications/Messages/PirepSubmitted.php
@@ -10,6 +10,8 @@ class PirepSubmitted extends BaseNotification
 {
     use MailChannel;
 
+    public $channels = ['mail'];
+
     private $pirep;
 
     /**

diff --git a/app/Notifications/Messages/UserPending.php b/app/Notifications/Messages/UserPending.php
@@ -10,13 +10,17 @@ class UserPending extends BaseNotification
 {
     use MailChannel;
 
+    public $channels = ['mail'];
+
     private $user;
 
     /**
      * @param \App\Models\User $user
      */
     public function __construct(User $user)
     {
+        parent::__construct();
+
         $this->user = $user;
 
         $this->setMailable(

diff --git a/app/Notifications/Messages/UserRegistered.php b/app/Notifications/Messages/UserRegistered.php
@@ -10,6 +10,8 @@ class UserRegistered extends BaseNotification
 {
     use MailChannel;
 
+    public $channels = ['mail'];
+
     private $user;
 
     /**

diff --git a/app/Notifications/Messages/UserRejected.php b/app/Notifications/Messages/UserRejected.php
@@ -10,6 +10,8 @@ class UserRejected extends BaseNotification
 {
     use MailChannel;
 
+    public $channels = ['mail'];
+
     private $user;
 
     /**

diff --git a/config/queue.php b/config/queue.php
@@ -14,7 +14,7 @@
     |
     */
 
-    'default' => env('QUEUE_DRIVER', 'database'),
+    'default' => env('QUEUE_DRIVER', 'sync'),
 
     /*
     |--------------------------------------------------------------------------

diff --git a/modules/Importer/Services/BaseImporter.php b/modules/Importer/Services/BaseImporter.php
@@ -5,14 +5,13 @@
 use App\Services\Installer\LoggerTrait;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Log;
 use Modules\Importer\Utils\IdMapper;
 use Modules\Importer\Utils\ImporterDB;
 
-abstract class BaseImporter implements ShouldQueue
+abstract class BaseImporter
 {
     use LoggerTrait;
     use Dispatchable;

diff --git a/resources/stubs/modules/mail.stub b/resources/stubs/modules/mail.stub
@@ -2,18 +2,16 @@
 
 namespace $NAMESPACE$;
 
-use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 /**
  * Class $CLASS$
  * @package $NAMESPACE$
  */
 class $CLASS$ extends Mailable
 {
-    use Queueable, SerializesModels;
+    use SerializesModels;
 
     /**
      * Create a new message instance.