fix: coding error in NotifyProjectClosureDueJob.php and add rate limiter

Author: keenthekeen

app/Jobs/NotifyProjectClosureDueJob.php

@@ -3,9 +3,11 @@
 namespace App\Jobs;
 
 use App\Models\Project;
+use App\Models\ProjectParticipant;
 use App\Notifications\ClosureDueNotification;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
@@ -18,13 +20,21 @@ public function handle(): void {
         Project::where('created_at', '>=', now()->subYear())
             ->where('year', '>=', 2567)
             ->where('period_end', '<=', now()->subDays(2))
+            ->where('period_end', '>=', now()->subDays(20))
             ->whereNull('closure_reminded_at')
             ->get()
-            ->filter(fn(Project $project) => $project->canSubmitClosure() and $project->documents()->where('tag', 'summary')->isEmpty())
+            ->filter(fn(Project $project) => $project->canSubmitClosure() and $project->documents()->where('tag', 'summary')->doesntExist())
             ->each(function (Project $project) {
                 $project->participants()->with('user')->get()
                     ->reject(fn($participant) => $participant->type == 'attendee' and $participant->user?->student_id < 6700000000)
-                    ->each(fn($participant) => $participant->user->notify(new ClosureDueNotification($project, $participant)));
+                    ->pipe(function (Collection $participants) {
+                        // select all organizers + other participants not more than 30 people
+                        $organizers = $participants->where('type', 'organizer');
+                        $others = $participants->where('type', '!=', 'organizer')->take(max(0, 30 - $organizers->count()));
+
+                        return $organizers->merge($others);
+                    })
+                    ->each(fn(ProjectParticipant $participant) => $participant->user->notify(new ClosureDueNotification($project, $participant)));
                 $project->update(['closure_reminded_at' => now()]);
             });
     }

app/Notifications/ClosureApprovalNotification.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Queue\Middleware\RateLimited;
 
 /**
  * Notification sent to project organizers when the faculty staff updates the remark on project closure.
@@ -17,6 +18,10 @@ class ClosureApprovalNotification extends Notification implements ShouldQueue {
     public function __construct(public Project $project) {
     }
 
+    public function middleware(): array {
+        return [(new RateLimited('mails'))->releaseAfter(3600)];
+    }
+
     public function via($notifiable): array {
         return ['mail'];
     }

app/Notifications/ClosureDueNotification.php

@@ -8,13 +8,18 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Queue\Middleware\RateLimited;
 
 class ClosureDueNotification extends Notification implements ShouldQueue {
     use Queueable;
 
     public function __construct(public Project $project, public ProjectParticipant $participant) {
     }
 
+    public function middleware(): array {
+        return [(new RateLimited('mails'))->releaseAfter(3600)];
+    }
+
     public function via($notifiable): array {
         return ['mail'];
     }

app/Providers/AppServiceProvider.php

@@ -3,6 +3,8 @@
 namespace App\Providers;
 
 use App\Checks\StorageCheck;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\ServiceProvider;
 use Spatie\Health\Checks\Checks\CacheCheck;
 use Spatie\Health\Checks\Checks\DatabaseCheck;
@@ -48,5 +50,6 @@ public function boot()
             UsedDiskSpaceCheck::new()->warnWhenUsedSpaceIsAbovePercentage(90)
                 ->failWhenUsedSpaceIsAbovePercentage(95),
         ]);
+        RateLimiter::for('mails', fn() => Limit::perHour(100));
     }
 }