From 9091951f4191a623fedb39c20a6deb0794d180cf Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 22 Nov 2022 08:42:53 +1100
Subject: [PATCH] Include bank transaction rules to first load

---
 app/Http/Controllers/BaseController.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 56400e7e1285..068168876a04 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -108,6 +108,7 @@ class BaseController extends Controller
           'company.system_logs',
           'company.bank_integrations',
           'company.bank_transactions',
+          'company.bank_transaction_rules',
         ];
 
     private $mini_load = [
@@ -126,6 +127,7 @@ class BaseController extends Controller
         'company.expense_categories',
         'company.subscriptions',
         'company.bank_integrations',
+        'company.bank_transaction_rules',
     ];
 
     public function __construct()
@@ -456,6 +458,13 @@ class BaseController extends Controller
                         $query->where('bank_transactions.user_id', $user->id);
                     }
                 },
+                'company.bank_transaction_rules'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at);
+
+                    if (! $user->isAdmin()) {
+                        $query->where('bank_transaction_rules.user_id', $user->id);
+                    }
+                },
             ]
         );
 
@@ -530,6 +539,12 @@ class BaseController extends Controller
                         $query->where('bank_integrations.user_id', $user->id);
                     }
                 },
+                'company.bank_transaction_rules'=> function ($query) use ($updated_at, $user) {
+
+                    if (! $user->isAdmin()) {
+                        $query->where('bank_transaction_rules.user_id', $user->id);
+                    }
+                },
             ]
         );