feat: add "Lid toevoegen als deelnemer" shortcut for org members
Adds two new API endpoints to quickly add organisation members as event
persons with user_id pre-linked and status approved:
- GET /organisations/{org}/members/available-for-event/{event}
- POST /organisations/{org}/events/{event}/persons/from-member
Includes frontend dialog with member search, crowd type selection, and
click-to-add behavior in the Personen tab.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -8,7 +8,9 @@ use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Api\V1\UpdateMemberRequest;
|
||||
use App\Http\Resources\Api\V1\MemberCollection;
|
||||
use App\Http\Resources\Api\V1\MemberResource;
|
||||
use App\Models\Event;
|
||||
use App\Models\Organisation;
|
||||
use App\Models\Person;
|
||||
use App\Models\User;
|
||||
use App\Services\EmailChangeService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
@@ -84,6 +86,35 @@ final class MemberController extends Controller
|
||||
return response()->json(null, 204);
|
||||
}
|
||||
|
||||
public function availableForEvent(Organisation $organisation, Event $event): JsonResponse
|
||||
{
|
||||
if ($event->organisation_id !== $organisation->id) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
Gate::authorize('viewAny', [Person::class, $event]);
|
||||
|
||||
$existingUserIds = Person::withoutGlobalScopes()
|
||||
->where('event_id', $event->id)
|
||||
->whereNotNull('user_id')
|
||||
->pluck('user_id');
|
||||
|
||||
$members = $organisation->users()
|
||||
->whereNotIn('users.id', $existingUserIds)
|
||||
->select('users.id', 'users.first_name', 'users.last_name', 'users.email')
|
||||
->orderBy('users.first_name')
|
||||
->get()
|
||||
->map(fn (User $user) => [
|
||||
'id' => $user->id,
|
||||
'first_name' => $user->first_name,
|
||||
'last_name' => $user->last_name,
|
||||
'full_name' => $user->full_name,
|
||||
'email' => $user->email,
|
||||
]);
|
||||
|
||||
return response()->json(['data' => $members]);
|
||||
}
|
||||
|
||||
/**
|
||||
* POST /api/v1/organisations/{organisation}/members/{user}/change-email
|
||||
* Admin changes a member's email (sends verification to new address).
|
||||
|
||||
@@ -4,8 +4,10 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Enums\PersonStatus;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Controllers\Api\V1\Traits\VerifiesOrganisationEvent;
|
||||
use App\Http\Requests\Api\V1\StorePersonFromMemberRequest;
|
||||
use App\Http\Requests\Api\V1\StorePersonRequest;
|
||||
use App\Http\Requests\Api\V1\UpdatePersonRequest;
|
||||
use App\Http\Resources\Api\V1\PersonCollection;
|
||||
@@ -15,12 +17,14 @@ use App\Mail\RegistrationRejectedMail;
|
||||
use App\Models\Event;
|
||||
use App\Models\Organisation;
|
||||
use App\Models\Person;
|
||||
use App\Models\User;
|
||||
use App\Services\PersonIdentityService;
|
||||
use App\Services\TagSyncService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
final class PersonController extends Controller
|
||||
{
|
||||
@@ -115,6 +119,46 @@ final class PersonController extends Controller
|
||||
return response()->json(null, 204);
|
||||
}
|
||||
|
||||
public function createFromMember(StorePersonFromMemberRequest $request, Organisation $organisation, Event $event): JsonResponse
|
||||
{
|
||||
$this->verifyEventBelongsToOrganisation($organisation, $event);
|
||||
Gate::authorize('create', [Person::class, $event]);
|
||||
|
||||
$user = User::findOrFail($request->validated('user_id'));
|
||||
|
||||
if (Person::withoutGlobalScopes()->where('event_id', $event->id)->where('user_id', $user->id)->exists()) {
|
||||
throw ValidationException::withMessages([
|
||||
'user_id' => ['Dit lid is al toegevoegd aan dit evenement.'],
|
||||
]);
|
||||
}
|
||||
|
||||
if (!$user->organisations()->where('organisations.id', $event->organisation_id)->exists()) {
|
||||
throw ValidationException::withMessages([
|
||||
'user_id' => ['Dit lid behoort niet tot deze organisatie.'],
|
||||
]);
|
||||
}
|
||||
|
||||
$person = Person::create([
|
||||
'event_id' => $event->id,
|
||||
'crowd_type_id' => $request->validated('crowd_type_id'),
|
||||
'first_name' => $user->first_name,
|
||||
'last_name' => $user->last_name,
|
||||
'email' => $user->email,
|
||||
'status' => PersonStatus::APPROVED->value,
|
||||
]);
|
||||
|
||||
$person->user_id = $user->id;
|
||||
$person->save();
|
||||
|
||||
activity()
|
||||
->causedBy(auth()->user())
|
||||
->performedOn($person)
|
||||
->withProperties(['source' => 'from_member', 'user_name' => $user->full_name])
|
||||
->log('person.created_from_member');
|
||||
|
||||
return $this->created(new PersonResource($person->load('crowdType')));
|
||||
}
|
||||
|
||||
public function approve(Organisation $organisation, Event $event, Person $person): JsonResponse
|
||||
{
|
||||
$this->verifyEventBelongsToOrganisation($organisation, $event);
|
||||
|
||||
Reference in New Issue
Block a user