From 62c018835a1cced084bf34ead2758e390244899c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 31 Jan 2018 13:04:31 +1100 Subject: [PATCH 1/2] Update BaseAPIController.php force == comparator --- app/Http/Controllers/BaseAPIController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BaseAPIController.php b/app/Http/Controllers/BaseAPIController.php index 35956179e4c0..100df801a0f6 100644 --- a/app/Http/Controllers/BaseAPIController.php +++ b/app/Http/Controllers/BaseAPIController.php @@ -99,11 +99,11 @@ class BaseAPIController extends Controller $query->with($includes); - if ($updatedAt = intval(Input::get('updated_at'))) { + if ($updatedAt == intval(Input::get('updated_at'))) { $query->where('updated_at', '>=', date('Y-m-d H:i:s', $updatedAt)); } - if ($clientPublicId = Input::get('client_id')) { + if ($clientPublicId == Input::get('client_id')) { $filter = function ($query) use ($clientPublicId) { $query->where('public_id', '=', $clientPublicId); }; From df8b896cf3fc5c1210a7661db88a6228cb214961 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 31 Jan 2018 13:16:30 +1100 Subject: [PATCH 2/2] Update BaseAPIController.php Refactor If blocks. --- app/Http/Controllers/BaseAPIController.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/BaseAPIController.php b/app/Http/Controllers/BaseAPIController.php index 100df801a0f6..5b59a5b38b8a 100644 --- a/app/Http/Controllers/BaseAPIController.php +++ b/app/Http/Controllers/BaseAPIController.php @@ -99,15 +99,17 @@ class BaseAPIController extends Controller $query->with($includes); - if ($updatedAt == intval(Input::get('updated_at'))) { - $query->where('updated_at', '>=', date('Y-m-d H:i:s', $updatedAt)); + if (Input::get('updated_at') > 0) { + $updatedAt = intval(Input::get('updated_at')); + $query->where('updated_at', '>=', date('Y-m-d H:i:s', $updatedAt)); } - - if ($clientPublicId == Input::get('client_id')) { - $filter = function ($query) use ($clientPublicId) { + + if (Input::get('client_id') > 0) { + $clientPublicId = Input::get('client_id'); + $filter = function ($query) use ($clientPublicId) { $query->where('public_id', '=', $clientPublicId); - }; - $query->whereHas('client', $filter); + }; + $query->whereHas('client', $filter); } if (! Utils::hasPermission('view_all')) {