Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/Http/Controllers/Api/V1/MemberController.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public function index(Organization $organization, MemberIndexRequest $request):
$members = Member::query()
->whereBelongsTo($organization, 'organization')
->with(['user'])
->join('users', 'members.user_id', '=', 'users.id')
->orderBy('users.name')
->select('members.*')
->paginate(config('app.pagination_per_page_default'));

return MemberCollection::make($members);
Expand Down
24 changes: 24 additions & 0 deletions tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,30 @@ public function test_index_returns_members_of_organization(): void
$response->assertStatus(200);
}

public function test_index_returns_members_of_organization_sorted_by_name(): void
{
// Arrange
$data = $this->createUserWithPermission([
'members:view',
]);
$members = Member::factory()->forOrganization($data->organization)->createMany(4);

Passport::actingAs($data->user);

// Act
$response = $this->getJson(route('api.v1.members.index', $data->organization->getKey()));

// Assert
$response->assertStatus(200);
// 2 members in $data, 4 members in $members.
$response->assertJsonCount(6, 'data');

$memberNames = $members->merge([$data->member, $data->ownerMember])->pluck('user.name')->sort()->values()->all();
$this->assertEquals($memberNames, $response->json('data.*.name'));

$this->assertNotEquals($response->json('data.*.id'), $response->json('data.*.user_id'));
}

public function test_update_member_fails_if_user_has_no_permission_to_update_members(): void
{
// Arrange
Expand Down