From 4b00d3a82a1308f3d3c1e7a607514163222bdfd7 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 19 Sep 2020 20:05:29 +1000
Subject: [PATCH] Improve eager loading

---
 app/Http/Controllers/BaseController.php | 6 ++++--
 app/Jobs/Util/SendFailedEmails.php      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 8801eda1a129..81772a8beed4 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -71,6 +71,7 @@ class BaseController extends Controller
           'company.clients.gateway_tokens',
           'company.clients.documents',
           'company.products',
+          'company.products.documents',
           'company.recurring_invoices',
           'company.invoices.invitations.contact',
           'company.invoices.invitations.company',
@@ -92,6 +93,7 @@ class BaseController extends Controller
           'company.tasks',
           'company.projects',
           'company.designs',
+          'company.documents',
           'company.webhooks',
           'company.tokens_hashed',
         ];
@@ -202,7 +204,7 @@ class BaseController extends Controller
         $query->with(
           [
             'company' => function ($query) use ($updated_at) {
-                $query->whereNotNull('updated_at');
+                $query->whereNotNull('updated_at')->with('documents');
             },
             'company.clients' => function ($query) use ($updated_at) {
                 $query->where('clients.updated_at', '>=', $updated_at)->with('contacts', 'gateway_tokens','documents');
@@ -217,7 +219,7 @@ class BaseController extends Controller
                 $query->whereNotNull('updated_at');
             },
             'company.products' => function ($query) use ($updated_at) {
-                $query->where('updated_at', '>=', $updated_at);
+                $query->where('updated_at', '>=', $updated_at)->with('documents');
             },
             'company.recurring_invoices'=> function ($query) use ($updated_at) {
                 $query->where('updated_at', '>=', $updated_at)->with('company');
diff --git a/app/Jobs/Util/SendFailedEmails.php b/app/Jobs/Util/SendFailedEmails.php
index e9975213e0ef..329ed566c00b 100644
--- a/app/Jobs/Util/SendFailedEmails.php
+++ b/app/Jobs/Util/SendFailedEmails.php
@@ -56,7 +56,7 @@ class SendFailedEmails implements ShouldQueue
 
     private function processEmails()
     {
-        \Log::error('processing emails');
+        //\Log::error('processing emails');
         //info("process emails");
         //@todo check that the quota is available for the job