From aefaabdb1a788f1108d2980e02909820fca81abc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Jul 2024 21:40:43 +0100
Subject: [PATCH 1/3] Removed non-counts from allowed array

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

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 3374f1907..6a96fb728 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -247,10 +247,6 @@ class UsersController extends Controller
                         'jobtitle',
                         'username',
                         'employee_num',
-                        'assets',
-                        'accessories',
-                        'consumables',
-                        'licenses',
                         'groups',
                         'activated',
                         'created_at',

From 17a6335d133ad59acd2289fc8541cb2a6a44b679 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Jul 2024 22:12:06 +0100
Subject: [PATCH 2/3] Added test

Signed-off-by: snipe <snipe@snipe.net>
---
 tests/Feature/Users/Api/UserSearchTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/Feature/Users/Api/UserSearchTest.php b/tests/Feature/Users/Api/UserSearchTest.php
index 2b1d55797..fba18e67e 100644
--- a/tests/Feature/Users/Api/UserSearchTest.php
+++ b/tests/Feature/Users/Api/UserSearchTest.php
@@ -144,4 +144,15 @@ class UserSearchTest extends TestCase
             'User index contains unexpected user from another company'
         );
     }
+
+    public function testUsersIndexWhenInvalidSortFieldIsPassed()
+    {
+        $this->actingAsForApi(User::factory()->viewUsers()->create())
+            ->getJson(route('api.users.index', [
+                'sort' => 'assets',
+            ]))
+            ->assertOk()
+            ->assertStatus(200)
+            ->json();
+    }
 }

From 5e15cc3bbe4267d7d164e126af497a7789b69707 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Jul 2024 22:18:31 +0100
Subject: [PATCH 3/3] Added markIncompleteIfSqlite() method

Signed-off-by: snipe <snipe@snipe.net>
---
 tests/Feature/Users/Api/UserSearchTest.php | 2 ++
 tests/Support/CanSkipTests.php             | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/tests/Feature/Users/Api/UserSearchTest.php b/tests/Feature/Users/Api/UserSearchTest.php
index fba18e67e..dc0ffdc80 100644
--- a/tests/Feature/Users/Api/UserSearchTest.php
+++ b/tests/Feature/Users/Api/UserSearchTest.php
@@ -147,6 +147,8 @@ class UserSearchTest extends TestCase
 
     public function testUsersIndexWhenInvalidSortFieldIsPassed()
     {
+        $this->markIncompleteIfSqlite('This test is not compatible with SQLite');
+
         $this->actingAsForApi(User::factory()->viewUsers()->create())
             ->getJson(route('api.users.index', [
                 'sort' => 'assets',
diff --git a/tests/Support/CanSkipTests.php b/tests/Support/CanSkipTests.php
index 2a1eec10f..b29fdf88c 100644
--- a/tests/Support/CanSkipTests.php
+++ b/tests/Support/CanSkipTests.php
@@ -10,4 +10,11 @@ trait CanSkipTests
             $this->markTestIncomplete($message);
         }
     }
+
+    public function markIncompleteIfSqlite($message = 'Test skipped due to database driver being sqlite.')
+    {
+        if (config('database.default') === 'sqlite') {
+            $this->markTestIncomplete($message);
+        }
+    }
 }