Skip to content

Allow same nickname when merging members #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kdmnk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow same nickname when merging members #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/Http/Controllers/MemberController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function store(Request $request)
if ($group == null) abort(404, __('errors.invalid_invitation'));

$validator = Validator::make($request->all(), [
'nickname' => ['required', 'string', 'min:1', 'max:15', new UniqueNickname($group->id)],
'nickname' => ['required', 'string', 'min:1', 'max:15', new UniqueNickname($group->id, $request->merge_with_member_id)],
'merge_with_member_id' => ['nullable', new IsMember($group)]
]);
if ($validator->fails()) abort(400, $validator->errors()->first());
Expand Down
11 changes: 8 additions & 3 deletions app/Rules/UniqueNickname.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ class UniqueNickname implements Rule
{
/**
* Create a new rule instance.
* @param mixed $group_id
* @param int $group_id
* @param int|null $except_member_id
* @return void
*/
public function __construct($group_id)
public function __construct($group_id, $except_member_id)
{
$this->group = Group::find($group_id);
$this->except_member_id = $except_member_id;
}

/**
Expand All @@ -26,7 +28,10 @@ public function __construct($group_id)
*/
public function passes($attribute, $value)
{
return $this->group->members->where('member_data.nickname', $value)->count() == 0;
return $this->group->members
->where('member_data.nickname', $value)
->except([$this->except_member_id])
->count() == 0;
}

/**
Expand Down