diff --git a/app/Jobs/SendMissingOrderReminderJob.php b/app/Jobs/SendMissingOrderReminderJob.php index 4eaab14e..8951dbdc 100644 --- a/app/Jobs/SendMissingOrderReminderJob.php +++ b/app/Jobs/SendMissingOrderReminderJob.php @@ -15,14 +15,16 @@ use Domain\Enums\OrderStatus; use Domain\Models\ValueObjects\IcsContent; use Domain\Models\ValueObjects\Matricule; use Domain\Services\PickupSchedulingService; +use Illuminate\Contracts\Queue\ShouldBeUnique; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Queue\Queueable; use Illuminate\Support\Carbon; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\Date; use Illuminate\Support\Facades\Gate; -class SendMissingOrderReminderJob implements ShouldQueue +class SendMissingOrderReminderJob implements ShouldBeUnique, ShouldQueue { use Queueable; @@ -30,6 +32,13 @@ class SendMissingOrderReminderJob implements ShouldQueue public const int HOURS_BEFORE_CUTOFF = 6; + public int $uniqueFor = 3600; + + public function uniqueId(): string + { + return Date::now()->format('o-\WW'); + } + public function handle(PickupSchedulingService $schedulingService, IcsGeneratorService $icsGenerator): void { $pickupDay = Carbon::now()->next($schedulingService->getPickupDay()->value); diff --git a/app/Jobs/SendReminderMail.php b/app/Jobs/SendReminderMail.php index d9678339..cf52c508 100644 --- a/app/Jobs/SendReminderMail.php +++ b/app/Jobs/SendReminderMail.php @@ -11,19 +11,28 @@ use App\Models\Order; use App\Notifications\OrderTodayReminderNotification; use Domain\Enums\OrderStatus; use Domain\Models\ValueObjects\Matricule; +use Illuminate\Contracts\Queue\ShouldBeUnique; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Queue\Queueable; +use Illuminate\Support\Facades\Date; use Money\MoneyFormatter; -class SendReminderMail implements ShouldQueue +class SendReminderMail implements ShouldBeUnique, ShouldQueue { use Queueable; + public int $uniqueFor = 3600; + public function __construct( private readonly MoneyFormatter $moneyFormatter ) { } + public function uniqueId(): string + { + return Date::now()->format('Y-m-d'); + } + public function handle(): void { $orders = Order::query()