nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-05 18:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

- it_update_member_permission_in_team_folder

Browse Source 
- it_remove_member_from_team_folder
- it_add_member_into_team_folder
This commit is contained in:
Peter Papp
2021-08-24 18:28:20 +02:00
parent bcfe813e1e
commit dfa82535eb
5 changed files with 213 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/migrations/2021_08_24_092726_create_team_folder_members_table.php
View File

@@ -15,7 +15,7 @@ class CreateTeamFolderMembersTable extends Migration
{
Schema::create('team_folder_members', function (Blueprint $table) {
$table->uuid('folder_id');
$table->uuid('member_id');
$table->uuid('user_id');
$table->string('permission');
$table->charset = 'utf8mb4';
$table->collation = 'utf8mb4_unicode_ci';

2
src/Domain/Teams/Controllers/BrowseSharedWithMeController.php
View File

@@ -32,7 +32,7 @@ class BrowseSharedWithMeController
if (! $rootId) {
$folderIds = DB::table('team_folder_members')
->where('member_id', Auth::id())
->where('user_id', Auth::id())
->pluck('folder_id');
$folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])

2
src/Domain/Teams/Controllers/InvitationsController.php
View File

@@ -23,7 +23,7 @@ class InvitationsController extends Controller
DB::table('team_folder_members')
->insert([
'folder_id' => $invitation->folder_id,
'member_id' => $user->id,
'user_id' => $user->id,
'permission' => 'can-edit',
]);

41
src/Domain/Teams/Controllers/TeamFoldersController.php
View File

@@ -11,6 +11,7 @@ use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
use Domain\Teams\DTO\CreateTeamFolderData;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
class TeamFoldersController extends Controller
{
@@ -61,12 +62,52 @@ class TeamFoldersController extends Controller
return response($folder, 201);
}
public function update(Request $request, Folder $folder)
{
$existingMembers = DB::table('team_folder_members')
->where('folder_id', $folder->id)
->pluck('user_id');
$deletedMembers = $existingMembers
->filter(fn ($memberId) => ! in_array(
$memberId, collect($request->input('members'))->pluck('id')->toArray()
));
$newMembers = collect($request->input('members'))
->filter(fn ($member) => ! Str::isUuid($member['id']));
// Invite team members
if ($newMembers->isNotEmpty()) {
($this->inviteMembers)($newMembers->toArray(), $folder);
}
if ($deletedMembers->isNotEmpty()) {
DB::table('team_folder_members')
->whereIn('user_id', $deletedMembers->toArray())
->delete();
}
// Update privileges
collect($request->input('members'))
->each(function ($member) {
DB::table('team_folder_members')
->where('user_id', $member['id'])
->update([
'permission' => $member['permission'],
]);
});
return response('Done', 201);
}
public function destroy(Folder $folder): Response
{
$folder->update([
'team_folder' => 0,
]);
// TODO: delete invitations
DB::table('team_folder_members')
->where('folder_id', $folder->id)
->delete();

179
tests/Domain/Teams/TeamsTest.php
View File

@@ -134,7 +134,7 @@ class TeamsTest extends TestCase
])
->assertDatabaseHas('team_folder_members', [
'folder_id' => $folder->id,
'member_id' => $member->id,
'user_id' => $member->id,
'permission' => 'can-edit',
]);
}
@@ -172,22 +172,181 @@ class TeamsTest extends TestCase
])
->assertDatabaseMissing('team_folder_members', [
'folder_id' => $folder->id,
'member_id' => $member->id,
'user_id' => $member->id,
]);
}
/**
*
* @test
*/
public function it_add_member_into_team_folder()
{
$user = User::factory(User::class)
->create();
$members = User::factory(User::class)
->count(2)
->create();
$folder = Folder::factory()
->create([
'user_id' => $user->id,
'team_folder' => 1,
]);
DB::table('team_folder_members')
->insert([
[
'folder_id' => $folder->id,
'user_id' => $members[0]->id,
'permission' => 'can-edit',
],
[
'folder_id' => $folder->id,
'user_id' => $members[1]->id,
'permission' => 'can-edit',
],
]);
$this
->actingAs($user)
->patchJson("/api/teams/folders/{$folder->id}", [
'members' => [
[
'id' => $members[0]->id,
'email' => 'john@internal.com',
'permission' => 'can-edit',
],
[
'id' => $members[1]->id,
'email' => 'jane@external.com',
'permission' => 'can-view',
],
[
'id' => null,
'email' => 'new@member.com',
'permission' => 'can-view',
],
],
])
->assertCreated();
$this
->assertDatabaseCount('team_folder_members', 2)
->assertDatabaseHas('team_folders_invitations', [
'email' => 'new@member.com',
'permission' => 'can-view',
]);
Notification::assertTimesSent(1, InvitationIntoTeamFolder::class);
}
/**
*
* @test
*/
public function it_remove_member_from_team_folder()
{
$user = User::factory(User::class)
->create();
$members = User::factory(User::class)
->count(2)
->create();
$folder = Folder::factory()
->create([
'user_id' => $user->id,
'team_folder' => 1,
]);
DB::table('team_folder_members')
->insert([
[
'folder_id' => $folder->id,
'user_id' => $members[0]->id,
'permission' => 'can-edit',
],
[
'folder_id' => $folder->id,
'user_id' => $members[1]->id,
'permission' => 'can-edit',
],
]);
$this
->actingAs($user)
->patchJson("/api/teams/folders/{$folder->id}", [
'members' => [
[
'id' => $members[0]->id,
'email' => 'john@internal.com',
'permission' => 'can-edit',
],
],
])
->assertCreated();
$this
->assertDatabaseCount('team_folder_members', 1)
->assertDatabaseMissing('team_folder_members', [
'user_id' => $members[1]->id,
]);
}
/**
* @test
*/
public function it_update_member_permission_in_team_folder()
{
$user = User::factory(User::class)
->create();
$members = User::factory(User::class)
->count(2)
->create();
$folder = Folder::factory()
->create([
'user_id' => $user->id,
'team_folder' => 1,
]);
DB::table('team_folder_members')
->insert([
[
'folder_id' => $folder->id,
'user_id' => $members[0]->id,
'permission' => 'can-edit',
],
[
'folder_id' => $folder->id,
'user_id' => $members[1]->id,
'permission' => 'can-edit',
],
]);
$this
->actingAs($user)
->patchJson("/api/teams/folders/{$folder->id}", [
'members' => [
[
'id' => $members[0]->id,
'email' => 'john@internal.com',
'permission' => 'can-edit',
],
[
'id' => $members[1]->id,
'email' => 'jane@external.com',
'permission' => 'can-view',
],
],
])
->assertCreated();
$this->assertDatabaseHas('team_folder_members', [
'user_id' => $members[1]->id,
'permission' => 'can-view',
]);
}
/**
@@ -212,12 +371,12 @@ class TeamsTest extends TestCase
->insert([
[
'folder_id' => $folder->id,
'member_id' => $members[0]->id,
'user_id' => $members[0]->id,
'permission' => 'can-edit',
],
[
'folder_id' => $folder->id,
'member_id' => $members[1]->id,
'user_id' => $members[1]->id,
'permission' => 'can-edit',
],
]);
@@ -269,8 +428,8 @@ class TeamsTest extends TestCase
$file = File::factory()
->create([
'folder_id' => $folder->id,
'user_id' => $user->id,
'folder_id' => $folder->id,
'user_id' => $user->id,
]);
$this
@@ -304,12 +463,12 @@ class TeamsTest extends TestCase
->insert([
[
'folder_id' => $folders[0]->id,
'member_id' => $member->id,
'user_id' => $member->id,
'permission' => 'can-edit',
],
[
'folder_id' => $folders[1]->id,
'member_id' => $member->id,
'user_id' => $member->id,
'permission' => 'can-edit',
],
]);