Merge pull request #300 from IFRCGo/feature/WN-310

Implemented bulk email sending by chunks for terms and conditions alert

Author: jajaramillo24

app/Http/Controllers/Terms/TermsController.php

@@ -152,18 +152,23 @@ public function create(Request $request): JsonResponse
 
         $terms = $this->terms->create((string) $request->get('version'), $request->get('content'), auth()->user()->id);
 
-        $users = $this->users->allNotifiablePublicUsers();
-        $emails = $users->pluck('email')->implode(',');
-        $route = route('login');
-        $subject = trans('terms.email.subject', ['app_name' => config('app.name')]);
-        $html = $this->mailApiService->buildTermsAndConditionsTemplate($route);
-
-        $this->mailApiService->sendMail(
-            $emails,
-            $subject,
-            $html,
-            true, // Send as bulk email
-        );
+        // commented out to avoid sending emails on every terms update
+        // $users = $this->users->allNotifiablePublicUsers();
+        // $route = route('login');
+        // $subject = trans('terms.email.subject', ['app_name' => config('app.name')]);
+        // $html = $this->mailApiService->buildTermsAndConditionsTemplate($route);
+
+        // $users->pluck('email')
+        // ->chunk(25)
+        // ->each(function ($emailChunk) use ($subject, $html) {
+        //     $emails = $emailChunk->implode(',');
+        //     $this->mailApiService->sendMail(
+        //         $emails,
+        //         $subject,
+        //         $html,
+        //         true
+        //     );
+        // });
 
 
         return TermsResource::make($terms)->response()->setStatusCode(JsonResponse::HTTP_CREATED);

app/Repositories/Access/UserRepository.php

@@ -237,10 +237,15 @@ public function reactivate(User $user)
 
     public function allNotifiablePublicUsers()
     {
-        return $this->query()->whereHas('roles', function ($query) {
-            $query->where('all', '=', 0);
-            $query->doesntHave('permissions');         })->whereHas('userProfile', function ($query) {
-            $query->where('notifications_enabled', '=', 1);
-        })->get();
+        return $this->query()
+            ->where('activated', true)
+            ->whereHas('roles', function ($query) {
+                $query->where('all', '=', 0)
+                    ->doesntHave('permissions');
+            })
+            ->whereHas('userProfile', function ($query) {
+                $query->where('notifications_enabled', '=', 1);
+            })
+            ->get();
     }
 }

resources/assets/js/components/App.vue

@@ -39,9 +39,7 @@
             <h2>
               {{ $t('landing.footer.subtitle_3') }}
             </h2>
-            <router-link class="footer-link" :to="{ name: 'terms-service' }">
-              {{ $t('landing.footer.terms_service') }}
-            </router-link>
+            <router-link class="footer-link" :to="{ name: 'legal_terms' }">  {{ $t('register_form.terms_conditions') }}</router-link>
           </div>
           <div>
             <h2>