From deb55dd6c89cdafd777f99382056110577e9d9c0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 29 Apr 2021 11:31:04 +1000
Subject: [PATCH] Add in constrained queries

---
 app/Http/Controllers/Auth/LoginController.php | 4 ++--
 app/Http/Controllers/BaseController.php       | 4 ++--
 app/Http/Middleware/QueryLogging.php          | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 08747f9c2411..1882fffce1fc 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -343,7 +343,7 @@ class LoginController extends BaseController
                     }
                 });
 
-                return $this->listResponse($cu);
+                return $this->timeConstrainedResponse($cu);
                 
             }
         }
@@ -384,7 +384,7 @@ class LoginController extends BaseController
                 }
             });
 
-            return $this->listResponse($cu);
+            return $this->timeConstrainedResponse($cu);
         }
 
         return response()
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 5ec9add2ec26..aec442c9c184 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -219,7 +219,7 @@ class BaseController extends Controller
 
             },
             'company.company_gateways' => function ($query) use ($user) {
-                $query->whereNotNull('updated_at');
+                $query->whereNotNull('updated_at')->with('gateway');
 
                 if(!$user->isAdmin())
                   $query->where('company_gateways.user_id', $user->id);
@@ -402,7 +402,7 @@ class BaseController extends Controller
 
             },
             'company.company_gateways' => function ($query) use ($user) {
-                $query->whereNotNull('created_at');
+                $query->whereNotNull('created_at')->with('gateway');
 
                 if(!$user->isAdmin())
                   $query->where('company_gateways.user_id', $user->id);
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 034c13b2376a..5597eaaeb471 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -36,9 +36,9 @@ class QueryLogging
     {
 
         // Enable query logging for development
-        if (!Ninja::isHosted() || !config('beacon.enabled')) {
-            return $next($request);
-        }
+        // if (!Ninja::isHosted() || !config('beacon.enabled')) {
+        //     return $next($request);
+        // }
 
         $timeStart = microtime(true);
         DB::enableQueryLog();
@@ -55,7 +55,7 @@ class QueryLogging
             nlog($request->method().' - '.$request->url().": $count queries - ".$time);
 
             //  if($count > 50)
-            //nlog($queries);
+            nlog($queries);
             
            LightLogs::create(new DbQuery($request->method(), $request->url(), $count, $time))
                  ->batch();