Fix broken opt-in notifications

app/Notifications/ApplicationApproved.php

@@ -52,10 +52,9 @@ class ApplicationApproved extends Notification implements ShouldQueue
      *
      * @return void
      */
-    public function __construct(User $user, Application $application)
+    public function __construct(Application $application)
     {
         $this->application = $application;
-        $this->user = $user;
     }
 
     public function channels()
@@ -65,7 +64,7 @@ class ApplicationApproved extends Notification implements ShouldQueue
 
     public function optOut($notifiable)
     {
-        return Options::getOption('notify_applicant_approved') !== 1;
+        return Options::getOption('notify_applicant_approved') != 1;
     }
 
     /**
@@ -79,12 +78,10 @@ class ApplicationApproved extends Notification implements ShouldQueue
         return (new MailMessage)
                     ->greeting('Hi ' . $notifiable->name . ',')
                     ->from(config('notification.sender.address'), config('notification.sender.name'))
-                    ->subject(config('app.name').' - '.$this->application->response->vacancy->vacancyName.' application approved')
-                    ->line('<br />')
+                    ->subject(config('app.name').' - application approved')
                     ->line('Congratulations! Your most recent application has been approved by the reviewing team.')
                     ->line('You have just received the Reviewer role, which allows you to view and vote on other applications.')
                     ->line('You should have received more information about your onboarding process by now.')
-                    ->line('<br />')
                     ->line('Good luck and welcome aboard!')
                     ->action('Sign in', url(route('login')))
                     ->salutation('The team at ' . config('app.name'));

app/Notifications/ApplicationMoved.php

@@ -27,6 +27,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Facades\Log;
 
 class ApplicationMoved extends Notification implements ShouldQueue
 {
@@ -42,9 +43,21 @@ class ApplicationMoved extends Notification implements ShouldQueue
         //
     }
 
+    public function channels()
+    {
+        Log::debug('Application moved notification: channels chosen', [
+            'channels' => $this->chooseChannelsViaOptions()
+        ]);
+        return $this->chooseChannelsViaOptions();
+    }
+
     public function optOut($notifiable)
     {
-        return Options::getOption('notify_application_status_change') !== 1;
+        Log::debug('Application moved notification: opt out verified', [
+            'opt-out' => Options::getOption('notify_application_status_change') != 1
+        ]);
+
+        return Options::getOption('notify_application_status_change') != 1;
     }
 
     /**

app/Notifications/AppointmentFinished.php

@@ -21,6 +21,7 @@
 
 namespace App\Notifications;
 
+use App\Appointment;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -30,14 +31,17 @@ class AppointmentFinished extends Notification implements ShouldQueue
 {
     use Queueable;
 
+
+    public $appointment;
+
     /**
      * Create a new notification instance.
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(Appointment $appointment)
     {
-        //
+        $this->appointment = $appointment;
     }
 
     /**
@@ -63,7 +67,7 @@ class AppointmentFinished extends Notification implements ShouldQueue
                     ->greeting("Hi " . $notifiable->name . ",")
                     ->from(config('notification.sender.address'), config('notification.sender.name'))
                     ->subject(config('app.name').' - appointment completed')
-                    ->line('Your appointment has been marked as completed!')
+                    ->line('Your appointment, "' . $this->appointment->appointmentDescription . '", has been marked as completed!')
                     ->line('Please allow an additional day for your application to be fully processed.')
                     ->action('View applications', url(route('showUserApps')))
                     ->salutation('The team at ' . config('app.name'));

app/Notifications/NewApplicant.php

@@ -61,7 +61,7 @@ class NewApplicant extends Notification implements ShouldQueue
 
     public function optOut($notifiable)
     {
-        return Options::getOption('notify_new_user') !== 1;
+        return Options::getOption('notify_new_user') != 1;
     }
 
     /**

app/Notifications/NewComment.php

@@ -48,7 +48,7 @@ class NewComment extends Notification implements ShouldQueue
 
     public function optOut($notifiable)
     {
-        return Options::getOption('notify_application_comment') !== 1;
+        return Options::getOption('notify_application_comment') != 1;
     }
 
     /**

app/Notifications/NewUser.php

@@ -54,7 +54,7 @@ class NewUser extends Notification implements ShouldQueue
 
     public function optOut($notifiable)
     {
-        return Options::getOption('notify_new_user') !== 1;
+        return Options::getOption('notify_new_user') != 1;
     }
 
     /**

app/Notifications/VacancyClosed.php

@@ -48,7 +48,7 @@ class VacancyClosed extends Notification implements ShouldQueue
 
     public function optOut($notifiable)
     {
-        return Options::getOption('notify_vacancystatus_change') !== 1;
+        return Options::getOption('notify_vacancystatus_change') != 1;
     }
 
     /**

app/Services/AppointmentService.php

@@ -9,6 +9,7 @@ use App\Appointment;
 use App\Exceptions\InvalidAppointmentStatusException;
 use App\Notifications\ApplicationMoved;
 use App\Notifications\AppointmentCancelled;
+use App\Notifications\AppointmentFinished;
 use App\Notifications\AppointmentScheduled;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
@@ -104,7 +105,7 @@ class AppointmentService
             if ($updateApplication)
             {
                 $application->setStatus('STAGE_PEERAPPROVAL');
-                $application->user->notify(new ApplicationMoved());
+                $application->user->notify(new AppointmentFinished($application->appointment));
             }
         }
         else

app/Traits/Cancellable.php

@@ -22,19 +22,24 @@
 namespace App\Traits;
 
 use App\Facades\Options;
+use Illuminate\Support\Facades\Log;
 
 trait Cancellable
 {
     public function chooseChannelsViaOptions()
     {
         $channels = [];
-
+        // FIXME: This is not letting Slack and Email work at the same time
         if (Options::getOption('enable_slack_notifications') == 1) {
             array_push($channels, 'slack');
         } elseif (Options::getOption('enable_email_notifications') == 1) {
-            array_push($channels, 'email');
+            array_push($channels, 'mail');
         }
 
+        Log::debug('Cancellable: current channels list', [
+            'channels' => $channels
+        ]);
+
         return $channels;
     }
 

composer.json

@@ -31,7 +31,8 @@
         "pragmarx/google2fa-laravel": "^1.3",
         "sentry/sentry-laravel": "2.9.0",
         "socialiteproviders/discord": "^4.1",
-        "spatie/laravel-permission": "^3.13"
+        "spatie/laravel-permission": "^3.13",
+      "ext-xdebug": "*"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.3",