From 9b629c80d95ddf0cdf71061c2a26b1ee2e6a81e8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 27 Aug 2022 18:49:34 +1000 Subject: [PATCH] Refactor to nested queries to improve query planner --- app/Http/Controllers/BaseController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index b142609f9986..5f6bd8dfa9ab 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -298,6 +298,11 @@ class BaseController extends Controller if (! $user->hasPermission('view_product')) { $query->where('products.user_id', $user->id)->orWhere('products.assigned_user_id', $user->id); + + $query->whereNested(function($query) use ($user) { + $query->where('products.user_id', $user->id)->orWhere('products.assigned_user_id', $user->id); + }); + } }, 'company.projects'=> function ($query) use ($updated_at, $user) {