Merge pull request #2554 from maloun96/fix_logs

Fix logs

Author: binaryk

src/Models/Concerns/ConstraintsResolver.php

@@ -60,4 +60,15 @@ public function constraintsDescriptions(): array
                 return array_merge($base, $descriable::conditions());
             }, []);
     }
+
+    public function constraintsNotSatisfiedDescriptions(): array
+    {
+        return collect($this->constraints)
+            ->map(fn (string $event) => unserialize($event))
+            ->filter(fn ($event) => is_subclass_of($event, Descriptionable::class))
+            ->filter(fn ($event) => !$event->canSend($this, $this->logs))
+            ->reduce(function ($base, Descriptionable $descriable) {
+                return array_merge($base, $descriable::conditions());
+            }, []);
+    }
 }

src/Models/MailatorLog.php

@@ -2,13 +2,18 @@
 
 namespace Binarcode\LaravelMailator\Models;
 
+use Binarcode\LaravelMailator\Models\Concerns\ConstraintsResolver;
+use Binarcode\LaravelMailator\Models\Concerns\HasFuture;
+use Binarcode\LaravelMailator\Models\Concerns\HasTarget;
+use Binarcode\LaravelMailator\Support\ClassResolver;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * Class MailatorLog
  * @property string $status
  * @property Carbon $created_at
+ * @property array recipients
  * @package Binarcode\LaravelMailator\Models
  */
 class MailatorLog extends Model
@@ -32,7 +37,7 @@ public function getTable()
         'updated_at',
     ];
 
-    protected $cast = [
+    protected $casts = [
         'action_at' => 'datetime',
         'created_at' => 'datetime',
         'updated_at' => 'datetime',

src/Models/MailatorSchedule.php

@@ -20,6 +20,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Opis\Closure\SerializableClosure;
@@ -381,7 +382,8 @@ public function markAsSent(): self
     {
         $this->logs()
             ->create([
-//                'recipients' => $this->getRecipients(),
+                'recipients' => $this->getRecipients(),
+                'name' => $this->name,
                 'status' => MailatorLog::STATUS_SENT,
                 'action_at' => now(),
                 'created_at' => now(),
@@ -397,6 +399,8 @@ public function markAsSent(): self
     public function markAsFailed(string $failureReason): self
     {
         $this->logs()->create([
+            'recipients' => $this->getRecipients(),
+            'name' => $this->name,
             'status' => MailatorLog::STATUS_FAILED,
             'action_at' => now(),
             'created_at' => now(),