From 5b63e0fd81b7b3ba9173da24e6beea4fa6066d17 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 3 Dec 2022 09:50:55 +1100
Subject: [PATCH] Fixes for latency when sending emails

---
 app/Http/Controllers/EmailController.php | 2 ++
 app/Jobs/Entity/EmailEntity.php          | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index d03a98a11fdd..a96946ca6871 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -136,11 +136,13 @@ class EmailController extends BaseController
         }
 
         $entity_obj->invitations->each(function ($invitation) use ($data, $entity_string, $entity_obj, $template) {
+
             if (! $invitation->contact->trashed() && $invitation->contact->email) {
                 $entity_obj->service()->markSent()->save();
 
                 EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data)->delay(now()->addSeconds(2));
             }
+            
         });
 
         $entity_obj = $entity_obj->fresh();
diff --git a/app/Jobs/Entity/EmailEntity.php b/app/Jobs/Entity/EmailEntity.php
index 6abd46369ed0..cf3cd96bab82 100644
--- a/app/Jobs/Entity/EmailEntity.php
+++ b/app/Jobs/Entity/EmailEntity.php
@@ -90,7 +90,6 @@ class EmailEntity implements ShouldQueue
 
         $this->template_data = $template_data;
 
-        $this->email_entity_builder = $this->resolveEmailBuilder();
     }
 
     /**
@@ -106,6 +105,8 @@ class EmailEntity implements ShouldQueue
             return;
         }
 
+        $this->email_entity_builder = $this->resolveEmailBuilder();
+
         /* Set DB */
         MultiDB::setDB($this->company->db);