Force mark as completed.

Author: binaryk

src/Actions/ResolveGarbageAction.php

@@ -31,7 +31,11 @@ public function shouldMarkComplete(MailatorSchedule $schedule): bool
             return false;
         }
 
-        if (! $schedule->nextTrigger()) {
+        if (!$schedule->nextTrigger()) {
+            return true;
+        }
+
+        if ($schedule->failedLastTimes(3)) {
             return true;
         }
 

src/Constraints/OnceConstraint.php

@@ -10,7 +10,7 @@ class OnceConstraint implements SendScheduleConstraint
     public function canSend(MailatorSchedule $schedule, Collection $logs): bool
     {
         return $schedule->isOnce()
-            ? $logs->count() === 0
+            ? is_null($schedule->last_sent_at)
             : true;
     }
 }

src/Models/MailatorLog.php

@@ -43,4 +43,9 @@ public function isSent(): bool
     {
         return $this->status === static::STATUS_SENT;
     }
+
+    public function isFailed(): bool
+    {
+        return $this->status === static::STATUS_FAILED;
+    }
 }

src/Models/MailatorSchedule.php

@@ -3,19 +3,22 @@
 namespace Binarcode\LaravelMailator\Models;
 
 use Binarcode\LaravelMailator\Actions\Action;
+use Binarcode\LaravelMailator\Actions\ResolveGarbageAction;
 use Binarcode\LaravelMailator\Constraints\SendScheduleConstraint;
 use Binarcode\LaravelMailator\Jobs\SendMailJob;
 use Binarcode\LaravelMailator\Models\Builders\MailatorSchedulerBuilder;
 use Binarcode\LaravelMailator\Models\Concerns\ConstraintsResolver;
 use Binarcode\LaravelMailator\Models\Concerns\HasFuture;
 use Binarcode\LaravelMailator\Models\Concerns\HasTarget;
 use Binarcode\LaravelMailator\Support\ClassResolver;
+use Binarcode\LaravelMailator\Support\ConverterEnum;
 use Carbon\Carbon;
 use Carbon\CarbonInterface;
 use Closure;
 use Exception;
 use Illuminate\Contracts\Mail\Mailable;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
@@ -55,24 +58,6 @@ public function getTable()
         return config('mailator.schedulers_table_name', 'mailator_schedulers');
     }
 
-    public const MINUTES_IN_HOUR = 60;
-    public const MINUTES_IN_DAY = 60 * 60;
-    public const MINUTES_IN_WEEK = 168 * 60;
-    public const HOURS_IN_DAY = 24;
-    public const HOURS_IN_WEEK = 168;
-
-    public const FREQUENCY_IN_HOURS = [
-        'single' => PHP_INT_MAX,
-        'hourly' => 1,
-        'daily' => self::HOURS_IN_DAY,
-        'weekly' => self::HOURS_IN_WEEK,
-    ];
-
-    const DELAY_OPTIONS = [
-        '24' => 'Days',
-        '168' => 'Weeks',
-    ];
-
     public const TIME_FRAME_ORIGIN_BEFORE = 'before';
     public const TIME_FRAME_ORIGIN_AFTER = 'after';
 
@@ -169,14 +154,14 @@ public function hourly(): self
         return $this;
     }
 
-    public function daily()
+    public function daily(): static
     {
         $this->frequency_option = static::FREQUENCY_OPTIONS_DAILY;
 
         return $this;
     }
 
-    public function weekly()
+    public function weekly(): static
     {
         $this->frequency_option = static::FREQUENCY_OPTIONS_WEEKLY;
 
@@ -256,12 +241,12 @@ public function toDays(): int
     {
         //let's say we have 1 day and 2 hours till day job ends
         //so we will floor it to 1, and will send the reminder in time
-        return (int) floor($this->delay_minutes / static::MINUTES_IN_DAY);
+        return (int) floor($this->delay_minutes / ConverterEnum::MINUTES_IN_DAY);
     }
 
     public function toHours(): int
     {
-        return (int) floor($this->delay_minutes / static::MINUTES_IN_HOUR);
+        return (int) floor($this->delay_minutes / ConverterEnum::MINUTES_IN_HOUR);
     }
 
     public function minutes(int $number): self
@@ -273,21 +258,21 @@ public function minutes(int $number): self
 
     public function hours(int $number): self
     {
-        $this->delay_minutes = $number * static::MINUTES_IN_HOUR;
+        $this->delay_minutes = $number * ConverterEnum::MINUTES_IN_HOUR;
 
         return $this;
     }
 
     public function days(int $number): self
     {
-        $this->delay_minutes = $number * static::MINUTES_IN_DAY;
+        $this->delay_minutes = $number * ConverterEnum::MINUTES_IN_DAY;
 
         return $this;
     }
 
-    public function weeks(int $number)
+    public function weeks(int $number): static
     {
-        $this->delay_minutes = $number * static::MINUTES_IN_WEEK;
+        $this->delay_minutes = $number * ConverterEnum::MINUTES_IN_WEEK;
 
         return $this;
     }
@@ -319,7 +304,7 @@ public function when(Closure $closure): self
         return $this;
     }
 
-    public function logs()
+    public function logs(): HasMany
     {
         return $this->hasMany(MailatorLog::class, 'mailator_schedule_id');
     }
@@ -329,10 +314,13 @@ public function shouldSend(): bool
         try {
             $this->load('logs');
 
+
             return $this->configurationsPasses() && $this->whenPasses() && $this->eventsPasses();
         } catch (Exception | Throwable $e) {
             $this->markAsFailed($e->getMessage());
 
+            app(ResolveGarbageAction::class)->handle($this);
+
             return false;
         }
     }
@@ -480,4 +468,16 @@ public function markComplete(): self
 
         return $this;
     }
+
+    public function failedLastTimes(int $times): bool
+    {
+        return $this
+            ->logs()
+            ->latest()
+            ->take($times)
+            ->get()
+            ->filter
+            ->isFailed()
+            ->count() === $times;
+    }
 }

src/Support/ConverterEnum.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Binarcode\LaravelMailator\Support;
+
+class ConverterEnum
+{
+    public const MINUTES_IN_HOUR = 60;
+    public const MINUTES_IN_DAY = 60 * 60;
+    public const MINUTES_IN_WEEK = 168 * 60;
+    public const HOURS_IN_DAY = 24;
+    public const HOURS_IN_WEEK = 168;
+
+
+
+}

tests/Feature/SchedulerGarbageTest.php

@@ -3,6 +3,8 @@
 namespace Binarcode\LaravelMailator\Tests\Feature;
 
 use Binarcode\LaravelMailator\Models\MailatorSchedule;
+use Binarcode\LaravelMailator\Tests\Fixtures\Actions\NoopAction;
+use Binarcode\LaravelMailator\Tests\Fixtures\Constraints\FailingConstraint;
 use Binarcode\LaravelMailator\Tests\Fixtures\CustomAction;
 use Binarcode\LaravelMailator\Tests\Fixtures\User;
 use Binarcode\LaravelMailator\Tests\TestCase;
@@ -44,4 +46,37 @@ public function test_executed_schedulers_filtered_out(): void
                 ->get()
         );
     }
+
+    public function test_three_failed_is_considered_completed(): void
+    {
+        Mail::fake();
+        Mail::assertNothingSent();
+
+        $schedule = MailatorSchedule::init('Invoice reminder.')
+            ->days(1)
+            ->before(now()->addDays(2))
+            ->constraint(new FailingConstraint)
+            ->actionClass(new NoopAction);
+
+        $schedule->save();
+
+        self::assertCount(
+            1,
+            MailatorSchedule::query()
+                ->ready()
+                ->get()
+        );
+
+        $this->travel(1)->days();
+        MailatorSchedule::run();
+        MailatorSchedule::run();
+        MailatorSchedule::run();
+
+        self::assertCount(
+            0,
+            MailatorSchedule::query()
+                ->ready()
+                ->get()
+        );
+    }
 }