- it_update_member_permission_in_team_folder

- it_remove_member_from_team_folder
- it_add_member_into_team_folder
This commit is contained in:
Peter Papp
2021-08-24 18:38:43 +02:00
parent dfa82535eb
commit 49c147f609
8 changed files with 41 additions and 26 deletions
@@ -4,7 +4,7 @@
namespace Domain\Teams\Actions;
use Domain\Folders\Models\Folder;
use Domain\Teams\Models\TeamFoldersInvitation;
use Domain\Teams\Models\TeamFolderInvitation;
use Domain\Teams\Notifications\InvitationIntoTeamFolder;
use Illuminate\Support\Facades\Notification;
@@ -18,7 +18,7 @@ class InviteMembersIntoTeamFolderAction
->each(function ($member) use ($folder) {
// Create invitation
$invitation = TeamFoldersInvitation::create([
$invitation = TeamFolderInvitation::create([
'permission' => $member['permission'],
'email' => $member['email'],
'folder_id' => $folder->id,
@@ -4,14 +4,14 @@ namespace Domain\Teams\Controllers;
use App\Http\Controllers\Controller;
use App\Users\Models\User;
use Domain\Teams\Models\TeamFoldersInvitation;
use Domain\Teams\Models\TeamFolderInvitation;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\DB;
class InvitationsController extends Controller
{
public function update(
TeamFoldersInvitation $invitation
TeamFolderInvitation $invitation
): Response {
$user = User::where('email', $invitation->email)
->firstOrFail();
@@ -31,7 +31,7 @@ class InvitationsController extends Controller
}
public function destroy(
TeamFoldersInvitation $invitation
TeamFolderInvitation $invitation
): Response {
$invitation->update([
@@ -68,11 +68,14 @@ class TeamFoldersController extends Controller
->where('folder_id', $folder->id)
->pluck('user_id');
// Get deleted members from request
// TODO: vymazat uzivatela z pozvankou
$deletedMembers = $existingMembers
->filter(fn ($memberId) => ! in_array(
$memberId, collect($request->input('members'))->pluck('id')->toArray()
));
// Get newly added members from request
$newMembers = collect($request->input('members'))
->filter(fn ($member) => ! Str::isUuid($member['id']));
@@ -81,6 +84,7 @@ class TeamFoldersController extends Controller
($this->inviteMembers)($newMembers->toArray(), $folder);
}
// Remove team members from team folder
if ($deletedMembers->isNotEmpty()) {
DB::table('team_folder_members')
->whereIn('user_id', $deletedMembers->toArray())
@@ -106,7 +110,9 @@ class TeamFoldersController extends Controller
'team_folder' => 0,
]);
// TODO: delete invitations
DB::table('team_folder_invitations')
->where('folder_id', $folder->id)
->delete();
DB::table('team_folder_members')
->where('folder_id', $folder->id)
@@ -3,7 +3,7 @@ namespace Domain\Teams\Models;
use Illuminate\Support\Str;
use Illuminate\Database\Eloquent\Model;
use Database\Factories\TeamFoldersInvitationFactory;
use Database\Factories\TeamFolderInvitationFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
* @property string created_at
* @property string updated_at
*/
class TeamFoldersInvitation extends Model
class TeamFolderInvitation extends Model
{
use HasFactory;
@@ -29,9 +29,9 @@ class TeamFoldersInvitation extends Model
protected $keyType = 'string';
protected static function newFactory(): TeamFoldersInvitationFactory
protected static function newFactory(): TeamFolderInvitationFactory
{
return TeamFoldersInvitationFactory::new();
return TeamFolderInvitationFactory::new();
}
protected static function boot()
@@ -5,7 +5,7 @@ use App\Users\Models\User;
use Illuminate\Bus\Queueable;
use Domain\Folders\Models\Folder;
use Illuminate\Notifications\Notification;
use Domain\Teams\Models\TeamFoldersInvitation;
use Domain\Teams\Models\TeamFolderInvitation;
use Illuminate\Notifications\Messages\MailMessage;
class InvitationIntoTeamFolder extends Notification
@@ -14,7 +14,7 @@ class InvitationIntoTeamFolder extends Notification
public function __construct(
public Folder $teamFolder,
public TeamFoldersInvitation $invitation,
public TeamFolderInvitation $invitation,
) {
}