From 7b5f4d014a39cae7d0c90971d85cc78a15ba366a Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Thu, 7 Jul 2022 15:27:10 +0200
Subject: [PATCH] Group conditions in order to avoid querying removed records
 accidentally.

---
 application/models/Categories_model.php | 2 ++
 application/models/Consents_model.php   | 2 ++
 application/models/Roles_model.php      | 2 ++
 application/models/Services_model.php   | 2 ++
 application/models/Settings_model.php   | 2 ++
 application/models/Users_model.php      | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/application/models/Categories_model.php b/application/models/Categories_model.php
index 0467fe20..8f6f50f5 100644
--- a/application/models/Categories_model.php
+++ b/application/models/Categories_model.php
@@ -292,8 +292,10 @@ class Categories_model extends EA_Model {
             ->db
             ->select()
             ->from('categories')
+            ->group_start()
             ->like('name', $keyword)
             ->or_like('description', $keyword)
+            ->group_end()
             ->limit($limit)
             ->offset($offset)
             ->order_by($order_by)
diff --git a/application/models/Consents_model.php b/application/models/Consents_model.php
index 5df6beb9..da79c7f5 100644
--- a/application/models/Consents_model.php
+++ b/application/models/Consents_model.php
@@ -274,10 +274,12 @@ class Consents_model extends EA_Model {
             ->db
             ->select()
             ->from('consents')
+            ->group_start()
             ->like('first_name', $keyword)
             ->or_like('last_name', $keyword)
             ->or_like('email', $keyword)
             ->or_like('ip', $keyword)
+            ->group_end()
             ->limit($limit)
             ->offset($offset)
             ->order_by($order_by)
diff --git a/application/models/Roles_model.php b/application/models/Roles_model.php
index 32ebec3c..48924284 100644
--- a/application/models/Roles_model.php
+++ b/application/models/Roles_model.php
@@ -358,8 +358,10 @@ class Roles_model extends EA_Model {
             ->db
             ->select()
             ->from('roles')
+            ->group_start()
             ->like('name', $keyword)
             ->or_like('slug', $keyword)
+            ->group_end()
             ->limit($limit)
             ->offset($offset)
             ->order_by($order_by)
diff --git a/application/models/Services_model.php b/application/models/Services_model.php
index 3754b9ab..1d2b1c19 100644
--- a/application/models/Services_model.php
+++ b/application/models/Services_model.php
@@ -382,8 +382,10 @@ class Services_model extends EA_Model {
             ->db
             ->select()
             ->from('services')
+            ->group_start()
             ->like('name', $keyword)
             ->or_like('description', $keyword)
+            ->group_end()
             ->limit($limit)
             ->offset($offset)
             ->order_by($order_by)
diff --git a/application/models/Settings_model.php b/application/models/Settings_model.php
index 9d0c4651..ee2cf658 100644
--- a/application/models/Settings_model.php
+++ b/application/models/Settings_model.php
@@ -291,8 +291,10 @@ class Settings_model extends EA_Model {
             ->db
             ->select()
             ->from('settings')
+            ->group_start()
             ->like('name', $keyword)
             ->or_like('value', $keyword)
+            ->group_end()
             ->limit($limit)
             ->offset($offset)
             ->order_by($order_by)
diff --git a/application/models/Users_model.php b/application/models/Users_model.php
index 607cfe71..abb8f5a6 100644
--- a/application/models/Users_model.php
+++ b/application/models/Users_model.php
@@ -409,6 +409,7 @@ class Users_model extends EA_Model {
             ->db
             ->select()
             ->from('users')
+            ->group_start()
             ->like('first_name', $keyword)
             ->or_like('last_name', $keyword)
             ->or_like('email', $keyword)
@@ -419,6 +420,7 @@ class Users_model extends EA_Model {
             ->or_like('state', $keyword)
             ->or_like('zip_code', $keyword)
             ->or_like('notes', $keyword)
+            ->group_end()
             ->limit($limit)
             ->offset($offset)
             ->order_by($order_by)