fix: fix reminders not being sent

CHANGELOG

@@ -10,6 +10,7 @@ Enhancements:
 
 Fixes:
 
+* Fix reminders not being sent
 * Fix setting deceased information with removing date and reminder
 * Fix contact information update
 * Fix adding people on activity create and update

app/Jobs/Reminder/NotifyUserAboutReminder.php

@@ -73,9 +73,9 @@ private function getMessage()
     {
         switch ($this->reminderOutbox->nature) {
             case 'reminder':
-                return new UserReminded($this->reminderOutbox);
+                return new UserReminded($this->reminderOutbox->reminder);
             case 'notification':
-                return new UserNotified($this->reminderOutbox);
+                return new UserNotified($this->reminderOutbox->reminder, $this->reminderOutbox->notification_number_days_before);
             default:
                 break;
         }

app/Notifications/UserNotified.php

@@ -6,9 +6,9 @@
 use App\Helpers\DateHelper;
 use Illuminate\Bus\Queueable;
 use App\Models\Contact\Contact;
+use App\Models\Contact\Reminder;
 use Illuminate\Support\Facades\App;
 use App\Interfaces\MailNotification;
-use App\Models\Contact\ReminderOutbox;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -21,18 +21,20 @@ class UserNotified extends LaravelNotification implements ShouldQueue, MailNotif
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     /**
-     * @var ReminderOutbox
+     * @var Reminder
      */
-    public $reminderOutbox;
+    public $reminder;
+    public $numberDaysBefore;
 
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct(ReminderOutbox $reminderOutbox)
+    public function __construct(Reminder $reminder, $numberDaysBefore)
     {
-        $this->reminderOutbox = $reminderOutbox;
+        $this->reminder = $reminder;
+        $this->numberDaysBefore = $numberDaysBefore;
     }
 
     /**
@@ -56,22 +58,22 @@ public function toMail(User $user) : MailMessage
         App::setLocale($user->locale);
 
         $contact = Contact::where('account_id', $user->account_id)
-            ->findOrFail($this->reminderOutbox->reminder->contact_id);
+            ->findOrFail($this->reminder->contact_id);
 
         $message = (new MailMessage)
             ->subject(trans('mail.subject_line', ['contact' => $contact->name]))
             ->greeting(trans('mail.greetings', ['username' => $user->first_name]))
-            ->line(trans_choice('mail.notification_description', $this->reminderOutbox->notification_number_days_before, [
-                'count' => $this->reminderOutbox->notification_number_days_before,
-                'date' => DateHelper::getShortDate($this->reminderOutbox->reminder->calculateNextExpectedDate()),
+            ->line(trans_choice('mail.notification_description', $this->numberDaysBefore, [
+                'count' => $this->numberDaysBefore,
+                'date' => DateHelper::getShortDate($this->reminder->calculateNextExpectedDate()),
             ]))
-            ->line($this->reminderOutbox->reminder->title)
+            ->line($this->reminder->title)
             ->line(trans('mail.for', ['name' => $contact->name]))
             ->action(trans('mail.footer_contact_info2', ['name' => $contact->name]), $contact->getLink());
 
-        if (! is_null($this->reminderOutbox->reminder->description)) {
+        if (! is_null($this->reminder->description)) {
             $message = $message
-                ->line(trans('mail.comment', ['comment' => $this->reminderOutbox->reminder->description]));
+                ->line(trans('mail.comment', ['comment' => $this->reminder->description]));
         }
 
         return $message;

app/Notifications/UserReminded.php

@@ -5,9 +5,9 @@
 use App\Models\User\User;
 use Illuminate\Bus\Queueable;
 use App\Models\Contact\Contact;
+use App\Models\Contact\Reminder;
 use Illuminate\Support\Facades\App;
 use App\Interfaces\MailNotification;
-use App\Models\Contact\ReminderOutbox;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -20,18 +20,18 @@ class UserReminded extends LaravelNotification implements ShouldQueue, MailNotif
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     /**
-     * @var ReminderOutbox
+     * @var Reminder
      */
-    public $reminderOutbox;
+    public $reminder;
 
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct(ReminderOutbox $reminderOutbox)
+    public function __construct(Reminder $reminder)
     {
-        $this->reminderOutbox = $reminderOutbox;
+        $this->reminder = $reminder;
     }
 
     /**
@@ -55,18 +55,18 @@ public function toMail(User $user) : MailMessage
         App::setLocale($user->locale);
 
         $contact = Contact::where('account_id', $user->account_id)
-            ->findOrFail($this->reminderOutbox->reminder->contact_id);
+            ->findOrFail($this->reminder->contact_id);
 
         $message = (new MailMessage)
             ->subject(trans('mail.subject_line', ['contact' => $contact->name]))
             ->greeting(trans('mail.greetings', ['username' => $user->first_name]))
-            ->line(trans('mail.want_reminded_of', ['reason' => $this->reminderOutbox->reminder->title]))
+            ->line(trans('mail.want_reminded_of', ['reason' => $this->reminder->title]))
             ->line(trans('mail.for', ['name' => $contact->name]))
             ->action(trans('mail.footer_contact_info2', ['name' => $contact->name]), $contact->getLink());
 
-        if (! is_null($this->reminderOutbox->reminder->description)) {
+        if (! is_null($this->reminder->description)) {
             $message = $message
-                ->line(trans('mail.comment', ['comment' => $this->reminderOutbox->reminder->description]));
+                ->line(trans('mail.comment', ['comment' => $this->reminder->description]));
         }
 
         return $message;

tests/Unit/Jobs/Reminder/NotifyUserAboutReminderTest.php

@@ -54,13 +54,13 @@ public function test_it_sends_a_reminder_to_a_user()
         Notification::assertSentTo(
             $user,
             UserReminded::class,
-            function ($notification, $channels) use ($reminderOutbox, $user, $contact) {
+            function ($notification, $channels) use ($reminderOutbox, $reminder, $user, $contact) {
                 $mailData = $notification->toMail($user)->toArray();
                 $this->assertEquals("Reminder for {$contact->name}", $mailData['subject']);
                 $this->assertEquals("Hi {$user->first_name}", $mailData['greeting']);
                 $this->assertContains("You wanted to be reminded of {$reminderOutbox->reminder->title}", $mailData['introLines']);
 
-                return $notification->reminderOutbox->id === $reminderOutbox->id;
+                return $notification->reminder->id === $reminder->id;
             }
         );
     }
@@ -99,13 +99,13 @@ public function test_it_sends_a_notification_to_a_user()
         Notification::assertSentTo(
             $user,
             UserNotified::class,
-            function ($notification, $channels) use ($reminderOutbox, $user, $contact) {
+            function ($notification, $channels) use ($reminderOutbox, $reminder, $user, $contact) {
                 $mailData = $notification->toMail($user)->toArray();
                 $this->assertEquals("Reminder for {$contact->name}", $mailData['subject']);
                 $this->assertEquals("Hi {$user->first_name}", $mailData['greeting']);
                 $this->assertContains('In  days (on Jan 01, 2018), the following event will happen:', $mailData['introLines']);
 
-                return $notification->reminderOutbox->id === $reminderOutbox->id;
+                return $notification->reminder->id === $reminder->id;
             }
         );
     }