Removes password from the volunteer registration form. Account creation is now deferred to the approval step: Backend: - Registration creates Person without User (user_id=null) - On approval, system finds or creates User by person.email - New accounts get a "set password" email with activation link - Existing accounts get a portal link email - Added registration_source column to persons (self/organizer) - Fuzzy name matching skipped for self-registered persons - person.email is always source of truth for account linking Frontend: - Registration form no longer collects password - Email check shows info alert with login suggestion - New wachtwoord-instellen.vue page for account activation - PasswordRequirements.vue component (reused on reset page) - Success page updated with activation messaging Tests: 837 passed (all updated for new flow) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
205 lines
6.7 KiB
PHP
205 lines
6.7 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Services;
|
|
|
|
use App\Enums\PersonStatus;
|
|
use App\Mail\RegistrationConfirmationMail;
|
|
use App\Models\CrowdType;
|
|
use App\Models\Event;
|
|
use App\Models\Person;
|
|
use App\Models\User;
|
|
use App\Models\VolunteerAvailability;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\Log;
|
|
use Illuminate\Support\Facades\Mail;
|
|
use Illuminate\Validation\ValidationException;
|
|
|
|
final class VolunteerRegistrationService
|
|
{
|
|
public function __construct(
|
|
private readonly RegistrationFormFieldService $registrationFormFieldService,
|
|
private readonly PersonSectionPreferenceService $personSectionPreferenceService,
|
|
private readonly TagSyncService $tagSyncService,
|
|
) {}
|
|
|
|
/**
|
|
* @param array<string, mixed> $validated
|
|
*
|
|
* @throws ValidationException
|
|
*/
|
|
public function register(Event $event, array $validated, ?User $user): Person
|
|
{
|
|
if ($event->status !== 'registration_open') {
|
|
throw ValidationException::withMessages([
|
|
'event' => ['This event is not accepting registrations.'],
|
|
]);
|
|
}
|
|
|
|
$festivalEvent = $this->resolveFestivalEvent($event);
|
|
$email = strtolower($user?->email ?? $validated['email']);
|
|
|
|
$this->checkDuplicateRegistration($festivalEvent, $email);
|
|
|
|
$volunteerCrowdType = $this->resolveVolunteerCrowdType($event);
|
|
|
|
$person = DB::transaction(function () use ($festivalEvent, $validated, $user, $email, $volunteerCrowdType): Person {
|
|
$person = Person::updateOrCreate(
|
|
[
|
|
'event_id' => $festivalEvent->id,
|
|
'email' => $email,
|
|
],
|
|
[
|
|
'crowd_type_id' => $volunteerCrowdType->id,
|
|
'first_name' => $validated['first_name'] ?? $user->first_name,
|
|
'last_name' => $validated['last_name'] ?? $user->last_name,
|
|
'phone' => $validated['phone'] ?? null,
|
|
'date_of_birth' => $validated['date_of_birth'] ?? null,
|
|
'status' => PersonStatus::PENDING,
|
|
'registration_source' => 'self',
|
|
'custom_fields' => [
|
|
'tshirt_size' => $validated['tshirt_size'] ?? null,
|
|
'first_aid' => $validated['first_aid'] ?? false,
|
|
'allergies' => $validated['allergies'] ?? null,
|
|
'driving_licence' => $validated['driving_licence'] ?? false,
|
|
'motivation' => $validated['motivation'] ?? null,
|
|
'motivation_other' => $validated['motivation_other'] ?? null,
|
|
],
|
|
]
|
|
);
|
|
|
|
// Link to authenticated user directly (they already have an account)
|
|
if ($user) {
|
|
$person->user_id = $user->id;
|
|
$person->save();
|
|
}
|
|
|
|
$this->syncAvailabilities($person, $festivalEvent, $validated['availabilities'] ?? []);
|
|
|
|
if (!empty($validated['field_values'])) {
|
|
$this->registrationFormFieldService->upsertPersonValues(
|
|
$person,
|
|
$validated['field_values']
|
|
);
|
|
}
|
|
|
|
if (!empty($validated['section_preferences'])) {
|
|
$this->personSectionPreferenceService->replacePreferences(
|
|
$person,
|
|
$validated['section_preferences']
|
|
);
|
|
}
|
|
|
|
// Trigger tag sync if user_id is known
|
|
if ($person->user_id) {
|
|
$this->tagSyncService->syncFromRegistration($person);
|
|
}
|
|
|
|
$source = $user ? 'authenticated_form' : 'public_form';
|
|
|
|
$activityLogger = activity('volunteer_registration')
|
|
->performedOn($person)
|
|
->withProperties([
|
|
'source' => $source,
|
|
'event_id' => $festivalEvent->id,
|
|
'person_id' => $person->id,
|
|
'email' => $email,
|
|
]);
|
|
|
|
if ($user) {
|
|
$activityLogger->causedBy($user);
|
|
}
|
|
|
|
$activityLogger->log('person.registered');
|
|
|
|
return $person;
|
|
});
|
|
|
|
// Send confirmation email (queued, outside transaction)
|
|
Mail::to($person->email)->queue(new RegistrationConfirmationMail($person, $festivalEvent));
|
|
|
|
return $person;
|
|
}
|
|
|
|
private function resolveFestivalEvent(Event $event): Event
|
|
{
|
|
if ($event->isSubEvent()) {
|
|
return $event->parent;
|
|
}
|
|
|
|
return $event;
|
|
}
|
|
|
|
/**
|
|
* @throws ValidationException
|
|
*/
|
|
private function checkDuplicateRegistration(Event $festivalEvent, string $email): void
|
|
{
|
|
$existing = Person::where('event_id', $festivalEvent->id)
|
|
->where('email', $email)
|
|
->first();
|
|
|
|
if ($existing === null) {
|
|
return;
|
|
}
|
|
|
|
if ($existing->status !== PersonStatus::REJECTED->value) {
|
|
throw ValidationException::withMessages([
|
|
'email' => ['Already registered for this event.'],
|
|
]);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @throws \RuntimeException
|
|
*/
|
|
private function resolveVolunteerCrowdType(Event $event): CrowdType
|
|
{
|
|
$crowdType = CrowdType::where('organisation_id', $event->organisation_id)
|
|
->where('system_type', 'VOLUNTEER')
|
|
->first();
|
|
|
|
if ($crowdType === null) {
|
|
Log::error('No volunteer crowd type configured', [
|
|
'organisation_id' => $event->organisation_id,
|
|
'event_id' => $event->id,
|
|
]);
|
|
|
|
abort(500, 'No volunteer crowd type configured for this organisation.');
|
|
}
|
|
|
|
return $crowdType;
|
|
}
|
|
|
|
/**
|
|
* @param array<int, array<string, mixed>> $availabilities
|
|
*/
|
|
private function syncAvailabilities(Person $person, Event $festivalEvent, array $availabilities): void
|
|
{
|
|
if (empty($availabilities)) {
|
|
return;
|
|
}
|
|
|
|
VolunteerAvailability::where('person_id', $person->id)->delete();
|
|
|
|
$validTimeSlotIds = $festivalEvent->getAllRelevantTimeSlots()
|
|
->where('person_type', 'VOLUNTEER')
|
|
->pluck('id')
|
|
->toArray();
|
|
|
|
foreach ($availabilities as $availability) {
|
|
if (! in_array($availability['time_slot_id'], $validTimeSlotIds, true)) {
|
|
continue;
|
|
}
|
|
|
|
VolunteerAvailability::create([
|
|
'person_id' => $person->id,
|
|
'time_slot_id' => $availability['time_slot_id'],
|
|
'preference_level' => $availability['preference_level'] ?? 3,
|
|
'submitted_at' => now(),
|
|
]);
|
|
}
|
|
}
|
|
}
|