group users filter

src/Auth/Business/LuticateGroupsBusiness.php

@@ -25,9 +25,9 @@ class LuticateGroupsBusiness extends LuBusiness {
         return $group;
     }
 
-    public static function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX)
+    public static function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
     {
-        return LuticateGroupsDataAccess::getUsers($group_id, $page, $perPage);
+        return LuticateGroupsDataAccess::getUsers($group_id, $page, $perPage, $query);
     }
 
     public static function getByName($group_name)

src/Auth/Controller/LuticateGroupsController.php

@@ -39,11 +39,12 @@ class LuticateGroupsController extends LuController {
      * @param $group_id int The group id
      * @param int $page The page number, 0 based
      * @param int $perPage The number of items per page
+     * @param string $query The filter query
      * @return \Luticate\Utils\LuMultipleDbo
      */
-    public function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX)
+    public function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
     {
-        return LuticateGroupsBusiness::getUsers($group_id, $page, $perPage);
+        return LuticateGroupsBusiness::getUsers($group_id, $page, $perPage, $query);
     }
 
     /**

src/Auth/DataAccess/LuticateGroupsDataAccess.php

@@ -36,10 +36,16 @@ class LuticateGroupsDataAccess extends LuDataAccess {
             return null;
         return $group->toDbo();
     }
-    public static function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX)
+    public static function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
     {
-        $model = LuticateUsers::where("luticate_users_groups.group_id", "=", $group_id)
-            ->join("luticate_users_groups", "luticate_users.id", "=", "luticate_users_groups.user_id");
+        $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");
 
         $count = $model->count();