[TM-1423] add conditional to skip recipients to monitoring partners

app/Jobs/SendDailyDigestNotificationsJob.php

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Mail\TaskDigestMail;
+use App\Models\Traits\SkipRecipientsTrait;
 use App\Models\V2\Tasks\Task;
 use App\StateMachines\ReportStatusStateMachine;
 use Carbon\Carbon;
@@ -19,6 +20,7 @@ class SendDailyDigestNotificationsJob implements ShouldQueue
     use InteractsWithQueue;
     use Queueable;
     use SerializesModels;
+    use SkipRecipientsTrait;
 
     private $task;
 
@@ -36,6 +38,7 @@ public function __construct(Task $task)
     public function handle(): void
     {
         $users = $this->task->project->users()->get();
+        $users = $this->skipRecipients($users);
         $usersGroupedByLocale = $users->groupBy('locale');
         $taskDueAt = Carbon::parse($this->task->due_at);
 

app/Jobs/V2/SendEntityStatusChangeEmailsJob.php

@@ -3,6 +3,7 @@
 namespace App\Jobs\V2;
 
 use App\Mail\EntityStatusChange as EntityStatusChangeMail;
+use App\Models\Traits\SkipRecipientsTrait;
 use App\Models\V2\EntityModel;
 use App\StateMachines\EntityStatusStateMachine;
 use Illuminate\Bus\Queueable;
@@ -18,6 +19,7 @@ class SendEntityStatusChangeEmailsJob implements ShouldQueue
     use InteractsWithQueue;
     use Queueable;
     use SerializesModels;
+    use SkipRecipientsTrait;
 
     private EntityModel $entity;
 
@@ -35,18 +37,14 @@ public function handle(): void
         }
 
         $usersFromProject = $this->entity->project->users;
+        // TODO: This is a temporary hack to avoid spamming folks that have a funky role right now. In the future,
+        // they will have a different role, and we can simply skip sending this email to anybody with that role.
+        $usersFromProject = $this->skipRecipients($usersFromProject);
         if (empty($usersFromProject)) {
             return;
         }
 
-        // TODO: This is a temporary hack to avoid spamming folks that have a funky role right now. In the future,
-        // they will have a different role, and we can simply skip sending this email to anybody with that role.
-        $skipRecipients = collect(explode(',', getenv('ENTITY_UPDATE_DO_NOT_EMAIL')));
         foreach ($usersFromProject as $user) {
-            if ($skipRecipients->contains($user['email_address'])) {
-                continue;
-            }
-
             Mail::to($user['email_address'])->send(new EntityStatusChangeMail($this->entity, $user));
         }
     }

app/Jobs/V2/SendReportReminderEmailsJob.php

@@ -3,6 +3,7 @@
 namespace App\Jobs\V2;
 
 use App\Mail\ReportReminder as ReportReminderMail;
+use App\Models\Traits\SkipRecipientsTrait;
 use App\Models\V2\EntityModel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -17,6 +18,7 @@ class SendReportReminderEmailsJob implements ShouldQueue
     use InteractsWithQueue;
     use Queueable;
     use SerializesModels;
+    use SkipRecipientsTrait;
 
     private EntityModel $entity;
 
@@ -32,6 +34,8 @@ public function handle(): void
     {
 
         $users = $this->entity->project->users;
+        $users = $this->skipRecipients($users);
+
         if (empty($users)) {
             return;
         }

app/Models/Traits/SkipRecipientsTrait.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models\Traits;
+
+use Illuminate\Support\Collection;
+
+trait SkipRecipientsTrait
+{
+    public function skipRecipients(Collection $users): Collection
+    {
+        $skipRecipients = collect(explode(',', getenv('ENTITY_UPDATE_DO_NOT_EMAIL')));
+
+        return $users->filter(function ($user) use ($skipRecipients) {
+            return ! $skipRecipients->contains($user->email_address ?? $user['email_address']);
+        });
+    }
+}