Refactor whereRaw calls to lowerLike function for column definition

daviddmd · Sep 23, 2023 · 09a3b95 · 09a3b95
1 parent 23d1ad6
commit 09a3b95
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 19 deletions.
diff --git a/app/Http/Controllers/AssetController.php b/app/Http/Controllers/AssetController.php
@@ -63,14 +63,14 @@ public function index(Request $request)
     public static function filterAsset($filter)
     {
         return Asset::where(function ($query) use ($filter) {
-            $query->whereRaw('LOWER("name") LIKE ?', [caseInsensitiveMatch($filter)])
-                ->orWhereRaw('LOWER("description") LIKE ?', [caseInsensitiveMatch($filter)])
-                ->orWhereRaw('LOWER("mac_address") LIKE ?', [caseInsensitiveMatch($filter)])
-                ->orWhereRaw('LOWER("ip_address") LIKE ?', [caseInsensitiveMatch($filter)])
-                ->orWhereRaw('LOWER("manufacturer") LIKE ?', [caseInsensitiveMatch($filter)])
-                ->orWhereRaw('LOWER("sku") LIKE ?', [caseInsensitiveMatch($filter)])
-                ->orWhereRaw('LOWER("location") LIKE ?', [caseInsensitiveMatch($filter)])
-                ->orWhereRaw('LOWER("fqdn") LIKE ?', [caseInsensitiveMatch($filter)]);
+            $query->whereRaw(lowerLike("name"), [caseInsensitiveMatch($filter)])
+                ->orWhereRaw(lowerLike("description"), [caseInsensitiveMatch($filter)])
+                ->orWhereRaw(lowerLike("mac_address"), [caseInsensitiveMatch($filter)])
+                ->orWhereRaw(lowerLike("ip_address"), [caseInsensitiveMatch($filter)])
+                ->orWhereRaw(lowerLike("manufacturer"), [caseInsensitiveMatch($filter)])
+                ->orWhereRaw(lowerLike("sku"), [caseInsensitiveMatch($filter)])
+                ->orWhereRaw(lowerLike("location"), [caseInsensitiveMatch($filter)])
+                ->orWhereRaw(lowerLike("fqdn"), [caseInsensitiveMatch($filter)]);
             if (is_int($filter)) {
                 $query->orWhere("id", "=", $filter);
             }

diff --git a/app/Http/Controllers/ControlController.php b/app/Http/Controllers/ControlController.php
@@ -28,8 +28,8 @@ public function index(Request $request)
     {
         $filter = $request->input("filter", "");
         if (!empty($filter)) {
-            $controls = Control::whereRaw('LOWER("name") LIKE ?', [caseInsensitiveMatch($filter)])->
-            orWhereRaw('LOWER("description") LIKE ?', [caseInsensitiveMatch($filter)])->
+            $controls = Control::whereRaw(lowerLike("name"), [caseInsensitiveMatch($filter)])->
+            orWhereRaw(lowerLike("description"), [caseInsensitiveMatch($filter)])->
             paginate(5)->withQueryString();
         }
         else {

diff --git a/app/Http/Controllers/ThreatController.php b/app/Http/Controllers/ThreatController.php
@@ -28,8 +28,8 @@ public function index(Request $request)
     {
         $filter = $request->input("filter", "");
         if (!empty($filter)) {
-            $threats = Threat::whereRaw('LOWER("name") LIKE ?', [caseInsensitiveMatch($filter)])->
-            orWhereRaw('LOWER("description") LIKE ?', [caseInsensitiveMatch($filter)])->
+            $threats = Threat::whereRaw(lowerLike("name"), [caseInsensitiveMatch($filter)])->
+            orWhereRaw(lowerLike("description"), [caseInsensitiveMatch($filter)])->
             paginate(5)->withQueryString();
         }
         else {

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -49,8 +49,8 @@ public function index(Request $request)
     public static function filterUser($filter)
     {
         return User::where(function ($query) use ($filter) {
-            $query->whereRaw('LOWER("name") LIKE ?', [caseInsensitiveMatch($filter)])->
-            orWhereRaw('LOWER("email") LIKE ?', [caseInsensitiveMatch($filter)]);
+            $query->whereRaw(lowerLike("name"), [caseInsensitiveMatch($filter)])->
+            orWhereRaw(lowerLike("email"), [caseInsensitiveMatch($filter)]);
             if (is_int($filter)) {
                 $query->orWhere("id", "=", $filter);
             }

diff --git a/app/Http/Livewire/AssetThreatsControlsManage.php b/app/Http/Livewire/AssetThreatsControlsManage.php
@@ -65,8 +65,8 @@ public function render()
             $filter = $this->threatSearchTerm;
             $search = Threat::whereNotIn("id", $this->asset->threats()->pluck("threat_id")->toArray())->
             where(function ($query) use ($filter) {
-                $query->whereRaw('LOWER("name") LIKE ?', [caseInsensitiveMatch($filter)])->
-                orWhereRaw('LOWER("description") LIKE ?', [caseInsensitiveMatch($filter)]);
+                $query->whereRaw(lowerLike("name"), [caseInsensitiveMatch($filter)])->
+                orWhereRaw(lowerLike("description"), [caseInsensitiveMatch($filter)]);
             })->get();
             if ($search->count() > 0) {
                 $this->threatsSearch = $search;

diff --git a/app/Http/Livewire/ThreatControlsManage.php b/app/Http/Livewire/ThreatControlsManage.php
@@ -40,8 +40,8 @@ public function render(): Factory|View|Application
             $filter = $this->searchTerm;
             $search = Control::whereNotIn("id", $controls->pluck("control_id")->toArray())->
             where(function ($query) use ($filter) {
-                $query->whereRaw('LOWER("name") LIKE ?', [caseInsensitiveMatch($filter)])->
-                orWhereRaw('LOWER("description") LIKE ?', [caseInsensitiveMatch($filter)]);
+                $query->whereRaw(lowerLike("name"), [caseInsensitiveMatch($filter)])->
+                orWhereRaw(lowerLike("description"), [caseInsensitiveMatch($filter)]);
             })->get();
             if ($search->count() > 0) {
                 $this->controls_search = $search;

diff --git a/app/helpers.php b/app/helpers.php
@@ -2,5 +2,10 @@
 
 function caseInsensitiveMatch($filter): string
 {
-    return sprintf("%%%s%%",trim(strtolower($filter)));
+    return sprintf("%%%s%%", trim(strtolower($filter)));
+}
+
+function lowerLike($column): string
+{
+    return sprintf('LOWER("%s") LIKE ?', $column);
 }