Log unserialize scheduler mails.

Author: binaryk

src/Actions/SendMailAction.php

@@ -6,6 +6,7 @@
 use Binarcode\LaravelMailator\Models\MailatorSchedule;
 use Binarcode\LaravelMailator\Support\ClassResolver;
 use Exception;
+use Illuminate\Contracts\Mail\Mailable;
 use Illuminate\Support\Facades\Mail;
 
 class SendMailAction implements Action
@@ -28,12 +29,14 @@ public function handle(MailatorSchedule $schedule)
     protected function sendMail(MailatorSchedule $schedule)
     {
         //todo - apply replacers for variables maybe
-        Mail::to($schedule->getRecipients())->send(
-            $schedule->getMailable()
-        );
+        $mailable = $schedule->getMailable();
 
-        $schedule->markAsSent();
+        if ($mailable instanceof Mailable) {
+            Mail::to($schedule->getRecipients())->send($mailable);
 
-        event(new ScheduleMailSentEvent($schedule));
+            $schedule->markAsSent();
+
+            event(new ScheduleMailSentEvent($schedule));
+        }
     }
 }

src/Models/MailatorSchedule.php

@@ -24,6 +24,7 @@
 use Illuminate\Support\Str;
 use Opis\Closure\SerializableClosure;
 use Throwable;
+use TypeError;
 
 /**
  * Class MailatorSchedule.
@@ -289,7 +290,7 @@ public function recipients(...$recipients): self
     {
         $this->recipients = array_merge(collect($recipients)
             ->flatten()
-            ->filter(fn ($email) => $this->ensureValidEmail($email))
+            ->filter(fn($email) => $this->ensureValidEmail($email))
             ->unique()
             ->toArray(), $this->recipients ?? []);
 
@@ -363,18 +364,24 @@ public static function run(): void
         static::query()
             ->ready()
             ->cursor()
-            ->filter(fn (self $schedule) => $schedule->shouldSend())
-            ->each(fn (self $schedule) => $schedule->execute());
+            ->filter(fn(self $schedule) => $schedule->shouldSend())
+            ->each(fn(self $schedule) => $schedule->execute());
     }
 
     public function hasCustomAction(): bool
     {
-        return ! is_null($this->action);
+        return !is_null($this->action);
     }
 
-    public function getMailable(): Mailable
+    public function getMailable(): ?Mailable
     {
-        return unserialize($this->mailable_class);
+        try {
+            return unserialize($this->mailable_class);
+        } catch (Throwable | TypeError $e) {
+            $this->markAsFailed($e->getMessage());
+        }
+
+        return null;
     }
 
     public function markAsSent(): self
@@ -418,13 +425,13 @@ public function markAsFailed(string $failureReason): self
     public function getRecipients(): array
     {
         return collect($this->recipients)
-            ->filter(fn ($email) => $this->ensureValidEmail($email))
+            ->filter(fn($email) => $this->ensureValidEmail($email))
             ->toArray();
     }
 
     protected function ensureValidEmail(string $email): bool
     {
-        return ! Validator::make(
+        return !Validator::make(
             compact('email'),
             ['email' => 'required|email']
         )->fails();
@@ -437,7 +444,7 @@ public function actionClass(Action $action): self
         return $this;
     }
 
-    public function tag(string | array $tag): self
+    public function tag(string|array $tag): self
     {
         if (is_array($tag)) {
             $tag = implode(',', $tag);
@@ -485,12 +492,12 @@ public function markComplete(): self
     public function failedLastTimes(int $times): bool
     {
         return $this
-            ->logs()
-            ->latest()
-            ->take($times)
-            ->get()
-            ->filter
-            ->isFailed()
-            ->count() === $times;
+                ->logs()
+                ->latest()
+                ->take($times)
+                ->get()
+                ->filter
+                ->isFailed()
+                ->count() === $times;
     }
 }

tests/Feature/Models/MailatorScheduleTest.php

@@ -5,6 +5,7 @@
 use Binarcode\LaravelMailator\Models\MailatorSchedule;
 use Binarcode\LaravelMailator\Tests\database\Factories\UserFactory;
 use Binarcode\LaravelMailator\Tests\Fixtures\InvoiceReminderMailable;
+use Binarcode\LaravelMailator\Tests\Fixtures\User;
 use Binarcode\LaravelMailator\Tests\TestCase;
 use Illuminate\Support\Facades\Mail;
 use Spatie\TestTime\TestTime;
@@ -114,4 +115,30 @@ public function test_recipients_merges(): void
 
         self::assertSame([$mail3, $mail2, $mail], $scheduler->recipients);
     }
+
+    public function test_unserialized_exception_store_exception_log(): void
+    {
+        Mail::fake();
+        Mail::assertNothingSent();
+
+        $scheduler = MailatorSchedule::init('Invoice reminder.')
+            ->recipients([
+                '[email protected]',
+            ])
+            ->mailable(
+                (new InvoiceReminderMailable($user = User::factory()->create()))->to('[email protected]')
+            )
+            ->days(1)
+            ->after(now()->addDays(7));
+
+        $scheduler->save();
+
+        $user->forceDelete();
+
+        $this->assertCount(0, $scheduler->logs);
+
+        $scheduler->getMailable();
+
+        $this->assertCount(1, $scheduler->logs()->get());
+    }
 }

tests/Fixtures/InvoiceReminderMailable.php

@@ -4,10 +4,18 @@
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
 
 class InvoiceReminderMailable extends Mailable
 {
     use Queueable;
+    use SerializesModels;
+
+    public function __construct(
+        private ?User $user = null,
+    )
+    {
+    }
 
     public function build()
     {