group users filter

src/Auth/DataAccess/LuticateGroupsDataAccess.php

@@ -38,14 +38,12 @@ class LuticateGroupsDataAccess extends LuDataAccess {
     }
     public static function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
     {
-        $model = LuticateUsers::where("luticate_users_groups.group_id", "=", $group_id);
-        if (!is_null($query) && $query != "") {
-            $model->where("luticate_users.username", "ilike", "%" . $query . "%")
-                ->where("luticate_users.email", "ilike", "%" . $query . "%")
-                ->where("luticate_users.firstname", "ilike", "%" . $query . "%")
-                ->where("luticate_users.lastname", "ilike", "%" . $query . "%");
-        }
-        $model->join("luticate_users_groups", "luticate_users.id", "=", "luticate_users_groups.user_id");
+        $model = LuticateUsers::where("luticate_users.username", "ilike", "%" . $query . "%")
+            ->where("luticate_users.email", "ilike", "%" . $query . "%", "or")
+            ->where("luticate_users.firstname", "ilike", "%" . $query . "%", "or")
+            ->where("luticate_users.lastname", "ilike", "%" . $query . "%", "or")
+            ->where("luticate_users_groups.group_id", "=", $group_id, "and")
+            ->join("luticate_users_groups", "luticate_users.id", "=", "luticate_users_groups.user_id");
 
         $count = $model->count();