From b72cac3511216b156b8c59f0d0b3a5c39c5925a0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 3 Mar 2022 19:03:35 -0800
Subject: [PATCH 1/3] Adds ldap_import and assets_count filter to user API
 endpoint

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/UsersController.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 8ef6a7f050..69915a0c35 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -132,6 +132,14 @@ class UsersController extends Controller
             $users = $users->where('users.manager_id','=',$request->input('manager_id'));
         }
 
+        if ($request->filled('ldap_import')) {
+            $users = $users->where('users.ldap_import', '=', $request->input('ldap_import'));
+        }
+
+        if ($request->filled('assets_count')) {
+           $users->has('assets', '=', $request->input('assets_count'));
+        }
+
         if ($request->filled('search')) {
             $users = $users->TextSearch($request->input('search'));
         }

From a53a67be4a5f9327bb49b30aebadb67bd879e964 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 3 Mar 2022 19:08:08 -0800
Subject: [PATCH 2/3] Added consumables, licenses, accessories count filters
 too

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/UsersController.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 69915a0c35..335fcdeecb 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -140,6 +140,18 @@ class UsersController extends Controller
            $users->has('assets', '=', $request->input('assets_count'));
         }
 
+        if ($request->filled('consumables_count')) {
+            $users->has('consumables', '=', $request->input('consumables_count'));
+        }
+
+        if ($request->filled('licenses_count')) {
+            $users->has('licenses', '=', $request->input('licenses_count'));
+        }
+
+        if ($request->filled('accessories_count')) {
+            $users->has('accessories', '=', $request->input('accessories_count'));
+        }
+
         if ($request->filled('search')) {
             $users = $users->TextSearch($request->input('search'));
         }

From 6abe8f296b5d9f1820040c1cb9b50abfa9e6006e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 3 Mar 2022 19:12:03 -0800
Subject: [PATCH 3/3] =?UTF-8?q?We=20don=E2=80=99t=20need=20the=20users=20t?=
 =?UTF-8?q?able=20here?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/UsersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 335fcdeecb..d797e2dd32 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -133,7 +133,7 @@ class UsersController extends Controller
         }
 
         if ($request->filled('ldap_import')) {
-            $users = $users->where('users.ldap_import', '=', $request->input('ldap_import'));
+            $users = $users->where('ldap_import', '=', $request->input('ldap_import'));
         }
 
         if ($request->filled('assets_count')) {