ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17141 from marcusmoore/fixes/undefined-manages_users_count-on-user

Browse Source 
Fixed bad method calls in user index api call
This commit is contained in:
snipe
2025-06-11 10:26:13 +01:00
committed by GitHub
parent 9a012ca01e 0d3d2e2e78
commit 3443f02c0a
2 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/UsersController.php
View File

@@ -207,11 +207,11 @@ class UsersController extends Controller
}
if ($request->filled('manages_users_count')) {
$users->has('manages_users_count', '=', $request->input('manages_users_count'));
$users->has('managesUsers', '=', $request->input('manages_users_count'));
}
if ($request->filled('manages_locations_count')) {
$users->has('manages_locations_count', '=', $request->input('manages_locations_count'));
$users->has('managedLocations', '=', $request->input('manages_locations_count'));
}
if ($request->filled('autoassign_licenses')) {

60
tests/Feature/Users/Api/IndexUsersTest.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
namespace Tests\Feature\Users\Api;
use App\Models\Location;
use App\Models\User;
use Illuminate\Testing\Fluent\AssertableJson;
use Tests\TestCase;
class IndexUsersTest extends TestCase
{
public function testRequiresPermission()
{
$this->actingAsForApi(User::factory()->create())
->getJson(route('api.users.index'))
->assertForbidden();
}
public function testReturnsManagedUsersCountCorrectly()
{
$manager = User::factory()->create(['first_name' => 'Manages Users']);
User::factory()->create(['first_name' => 'Does Not Manage Users']);
User::factory()->create(['manager_id' => $manager->id]);
User::factory()->create(['manager_id' => $manager->id]);
$response = $this->actingAsForApi(User::factory()->viewUsers()->create())
->getJson(route('api.users.index', [
'manages_users_count' => 2,
]))
->assertOk();
$response->assertJson(function (AssertableJson $json) {
$json->has('rows', 1)
->where('rows.0.first_name', 'Manages Users')
->etc();
});
}
public function testReturnsManagedLocationsCountCorrectly()
{
$manager = User::factory()->create(['first_name' => 'Manages Locations']);
User::factory()->create(['first_name' => 'Does Not Manage Locations']);
Location::factory()->create(['manager_id' => $manager->id]);
Location::factory()->create(['manager_id' => $manager->id]);
$response = $this->actingAsForApi(User::factory()->viewUsers()->create())
->getJson(route('api.users.index', [
'manages_locations_count' => 2,
]))
->assertOk();
$response->assertJson(function (AssertableJson $json) {
$json->has('rows', 1)
->where('rows.0.first_name', 'Manages Locations')
->etc();
});
}
}