Add --catch-up

Author: simonhamp

app/Console/Commands/SendLicenseExpiryWarnings.php

@@ -8,17 +8,22 @@
 
 class SendLicenseExpiryWarnings extends Command
 {
-    protected $signature = 'licenses:send-expiry-warnings';
+    protected $signature = 'licenses:send-expiry-warnings {--catch-up : Send missed warnings for licenses within warning windows}';
 
     protected $description = 'Send expiry warning emails for licenses that are expiring soon';
 
     public function handle(): int
     {
         $warningDays = [30, 7, 1];
         $totalSent = 0;
+        $catchUp = $this->option('catch-up');
+
+        if ($catchUp) {
+            $this->info('Running in catch-up mode - sending missed warnings...');
+        }
 
         foreach ($warningDays as $days) {
-            $sent = $this->sendWarningsForDays($days);
+            $sent = $this->sendWarningsForDays($days, $catchUp);
             $totalSent += $sent;
 
             $this->info("Sent {$sent} warning emails for licenses expiring in {$days} day(s)");
@@ -29,24 +34,38 @@ public function handle(): int
         return Command::SUCCESS;
     }
 
-    private function sendWarningsForDays(int $days): int
+    private function sendWarningsForDays(int $days, bool $catchUp = false): int
     {
-        $targetDate = now()->addDays($days)->startOfDay();
         $sent = 0;
 
-        // Find licenses that:
-        // 1. Expire on the target date
-        // 2. Don't have an active subscription (legacy licenses)
-        // 3. Haven't been sent a warning for this specific day count recently
-        $licenses = License::query()
-            ->whereDate('expires_at', $targetDate)
+        $query = License::query()
             ->whereNull('subscription_item_id') // Legacy licenses without subscriptions
-            ->whereDoesntHave('expiryWarnings', function ($query) use ($days) {
-                $query->where('warning_days', $days)
-                    ->where('sent_at', '>=', now()->subHours(23)); // Prevent duplicate emails within 23 hours
-            })
-            ->with('user')
-            ->get();
+            ->with('user');
+
+        if ($catchUp) {
+            // Catch-up mode: find licenses that are within the warning window but haven't received this warning yet
+            // For 30-day: expires within 30 days (but more than 7 days to avoid overlap)
+            // For 7-day: expires within 7 days (but more than 1 day)
+            // For 1-day: expires within 1 day (but hasn't expired yet)
+            $warningThresholds = [30 => 7, 7 => 1, 1 => 0];
+            $lowerBound = $warningThresholds[$days] ?? 0;
+
+            $query->where('expires_at', '>', now()->addDays($lowerBound)->startOfDay())
+                ->where('expires_at', '<=', now()->addDays($days)->endOfDay())
+                ->whereDoesntHave('expiryWarnings', function ($q) use ($days) {
+                    $q->where('warning_days', $days);
+                });
+        } else {
+            // Normal mode: only licenses expiring on the exact target date
+            $targetDate = now()->addDays($days)->startOfDay();
+            $query->whereDate('expires_at', $targetDate)
+                ->whereDoesntHave('expiryWarnings', function ($q) use ($days) {
+                    $q->where('warning_days', $days)
+                        ->where('sent_at', '>=', now()->subHours(23)); // Prevent duplicate emails within 23 hours
+                });
+        }
+
+        $licenses = $query->get();
 
         foreach ($licenses as $license) {
             if ($license->user) {