feat: complete email infrastructure with queue, templates, logging, and API

Adds the full transactional email system: - Redis queue (QUEUE_CONNECTION=redis), SES config in .env.example - 3 migrations: organisation_email_settings, organisation_email_templates, email_logs - EmailTemplateType and EmailLogStatus enums with Dutch defaults - EmailService as central entry point for all email sending - SendTransactionalEmail queued job with retries and idempotency - TransactionalMail mailable with responsive HTML + plain text templates - Organisation-level branding (colors, logo, footer, reply-to) - Per-type template overrides with {variable} substitution - Email log with filtering by status, type, date range, recipient - Preview and send-test endpoints for template management - API endpoints: email-settings, email-templates (CRUD), email-logs (read-only) - Integrated into existing flows: invitations, password reset, email verification, registration approval/rejection - 37 new tests across 4 test files, all existing tests updated Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-15 20:12:21 +02:00
parent c64875b6ef
commit 65978104d8
42 changed files with 2420 additions and 48 deletions
--- a/api/app/Http/Controllers/Api/V1/EmailLogController.php
+++ b/api/app/Http/Controllers/Api/V1/EmailLogController.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Enums\EmailLogStatus;
+use App\Enums\EmailTemplateType;
+use App\Http\Controllers\Controller;
+use App\Http\Resources\Api\V1\EmailLogResource;
+use App\Models\EmailLog;
+use App\Models\Organisation;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+
+final class EmailLogController extends Controller
+{
+    public function index(Request $request, Organisation $organisation): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $query = EmailLog::where('organisation_id', $organisation->id)
+            ->with('triggeredBy')
+            ->orderByDesc('created_at');
+
+        if ($search = $request->query('search')) {
+            $query->where('recipient_email', 'like', '%' . $search . '%');
+        }
+
+        if ($status = $request->query('status')) {
+            if (EmailLogStatus::tryFrom($status)) {
+                $query->where('status', $status);
+            }
+        }
+
+        if ($templateType = $request->query('template_type')) {
+            if (EmailTemplateType::tryFrom($templateType)) {
+                $query->where('template_type', $templateType);
+            }
+        }
+
+        if ($eventId = $request->query('event_id')) {
+            $query->where('event_id', $eventId);
+        }
+
+        if ($personId = $request->query('person_id')) {
+            $query->where('person_id', $personId);
+        }
+
+        if ($from = $request->query('from')) {
+            $query->where('created_at', '>=', $from);
+        }
+
+        if ($to = $request->query('to')) {
+            $query->where('created_at', '<=', $to);
+        }
+
+        $logs = $query->paginate($request->integer('per_page', 15));
+
+        return $this->success(EmailLogResource::collection($logs)->response()->getData(true));
+    }
+}
--- a/api/app/Http/Controllers/Api/V1/OrganisationEmailSettingsController.php
+++ b/api/app/Http/Controllers/Api/V1/OrganisationEmailSettingsController.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Api\V1\UpdateEmailSettingsRequest;
+use App\Http\Resources\Api\V1\EmailSettingsResource;
+use App\Models\Organisation;
+use App\Models\OrganisationEmailSettings;
+use App\Services\EmailService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Gate;
+
+final class OrganisationEmailSettingsController extends Controller
+{
+    public function __construct(
+        private readonly EmailService $emailService,
+    ) {}
+
+    public function show(Organisation $organisation): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $settings = $organisation->emailSettings;
+
+        if (! $settings) {
+            // Return defaults when no custom settings exist
+            return $this->success($this->emailService->resolveBranding($organisation));
+        }
+
+        return $this->success(new EmailSettingsResource($settings));
+    }
+
+    public function update(UpdateEmailSettingsRequest $request, Organisation $organisation): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $settings = OrganisationEmailSettings::updateOrCreate(
+            ['organisation_id' => $organisation->id],
+            $request->validated(),
+        );
+
+        activity('email_settings')
+            ->performedOn($settings)
+            ->causedBy($request->user())
+            ->log('email_settings.updated');
+
+        return $this->success(new EmailSettingsResource($settings->fresh()));
+    }
+}
--- a/api/app/Http/Controllers/Api/V1/OrganisationEmailTemplateController.php
+++ b/api/app/Http/Controllers/Api/V1/OrganisationEmailTemplateController.php
@@ -0,0 +1,188 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Enums\EmailTemplateType;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Api\V1\UpdateEmailTemplateRequest;
+use App\Models\Organisation;
+use App\Models\OrganisationEmailTemplate;
+use App\Services\EmailService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\View;
+
+final class OrganisationEmailTemplateController extends Controller
+{
+    public function __construct(
+        private readonly EmailService $emailService,
+    ) {}
+
+    public function index(Organisation $organisation): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $templates = $this->emailService->getAllTemplates($organisation);
+
+        return $this->success($templates);
+    }
+
+    public function show(Organisation $organisation, string $type): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $templateType = $this->resolveType($type);
+
+        $template = $this->emailService->resolveTemplate($templateType, $organisation);
+        $template['type'] = $templateType->value;
+        $template['label'] = $templateType->label();
+        $template['defaults'] = $templateType->defaults();
+
+        return $this->success($template);
+    }
+
+    public function update(UpdateEmailTemplateRequest $request, Organisation $organisation, string $type): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $templateType = $this->resolveType($type);
+
+        $template = OrganisationEmailTemplate::updateOrCreate(
+            [
+                'organisation_id' => $organisation->id,
+                'type' => $templateType->value,
+            ],
+            $request->validated(),
+        );
+
+        activity('email_template')
+            ->performedOn($template)
+            ->causedBy($request->user())
+            ->withProperties(['type' => $templateType->value])
+            ->log('email_template.updated');
+
+        $result = $this->emailService->resolveTemplate($templateType, $organisation);
+        $result['type'] = $templateType->value;
+        $result['label'] = $templateType->label();
+        $result['defaults'] = $templateType->defaults();
+
+        return $this->success($result);
+    }
+
+    public function destroy(Organisation $organisation, string $type): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $templateType = $this->resolveType($type);
+
+        OrganisationEmailTemplate::where('organisation_id', $organisation->id)
+            ->where('type', $templateType->value)
+            ->delete();
+
+        activity('email_template')
+            ->causedBy(request()->user())
+            ->withProperties(['type' => $templateType->value])
+            ->log('email_template.reset_to_default');
+
+        return $this->success(message: 'Template reset naar standaard.');
+    }
+
+    public function preview(Organisation $organisation, string $type): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $templateType = $this->resolveType($type);
+
+        $sampleVariables = [
+            'organisation_name' => $organisation->name,
+            'event_name' => 'Voorbeeldevenement',
+            'shift_title' => 'Bar medewerker',
+            'shift_date' => '15 juni 2026',
+            'shift_start' => '14:00',
+            'shift_end' => '22:00',
+            'section_name' => 'Hoofdpodium Bar',
+        ];
+
+        $template = $this->emailService->resolveTemplate($templateType, $organisation);
+
+        // Substitute sample variables
+        foreach ($template as $key => $value) {
+            if (is_string($value)) {
+                foreach ($sampleVariables as $var => $replacement) {
+                    $value = str_replace('{' . $var . '}', $replacement, $value);
+                }
+                $template[$key] = $value;
+            }
+        }
+
+        $branding = $this->emailService->resolveBranding($organisation);
+
+        $html = View::make('emails.transactional', [
+            'heading' => $template['heading'],
+            'bodyText' => $template['body_text'],
+            'buttonText' => $template['button_text'],
+            'actionUrl' => 'https://crewli.app/example',
+            'logoUrl' => $branding['logo_url'],
+            'primaryColor' => $branding['primary_color'],
+            'secondaryColor' => $branding['secondary_color'],
+            'footerText' => $branding['footer_text'],
+        ])->render();
+
+        return $this->success(['html' => $html]);
+    }
+
+    public function sendTest(Request $request, Organisation $organisation, string $type): JsonResponse
+    {
+        Gate::authorize('update', $organisation);
+
+        $request->validate([
+            'email' => ['required', 'email'],
+        ]);
+
+        $templateType = $this->resolveType($type);
+
+        $sampleVariables = [
+            'organisation_name' => $organisation->name,
+            'event_name' => 'Voorbeeldevenement',
+            'shift_title' => 'Bar medewerker',
+            'shift_date' => '15 juni 2026',
+            'shift_start' => '14:00',
+            'shift_end' => '22:00',
+            'section_name' => 'Hoofdpodium Bar',
+        ];
+
+        $this->emailService->send(
+            type: $templateType,
+            recipientEmail: $request->input('email'),
+            recipientName: 'Test Ontvanger',
+            variables: $sampleVariables,
+            actionUrl: 'https://crewli.app/example',
+            organisation: $organisation,
+            triggeredByUserId: $request->user()->id,
+        );
+
+        activity('email_template')
+            ->causedBy($request->user())
+            ->withProperties([
+                'type' => $templateType->value,
+                'test_email' => $request->input('email'),
+            ])
+            ->log('email.test_sent');
+
+        return $this->success(message: 'Testmail verzonden naar ' . $request->input('email') . '.');
+    }
+
+    private function resolveType(string $type): EmailTemplateType
+    {
+        $templateType = EmailTemplateType::tryFrom($type);
+
+        if (! $templateType) {
+            abort(404, 'Onbekend template type.');
+        }
+
+        return $templateType;
+    }
+}
--- a/api/app/Http/Controllers/Api/V1/PasswordResetController.php
+++ b/api/app/Http/Controllers/Api/V1/PasswordResetController.php
@@ -4,9 +4,10 @@ declare(strict_types=1);

 namespace App\Http\Controllers\Api\V1;

+use App\Enums\EmailTemplateType;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Notifications\ResetPasswordNotification;
+use App\Services\EmailService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
@@ -15,6 +16,10 @@ use Illuminate\Validation\Rules\Password as PasswordRule;

 final class PasswordResetController extends Controller
 {
+    public function __construct(
+        private readonly EmailService $emailService,
+    ) {}
+
    public function sendResetLink(Request $request): JsonResponse
    {
        $request->validate([
@@ -33,7 +38,16 @@ final class PasswordResetController extends Controller
        Password::sendResetLink(
            ['email' => strtolower($request->email)],
            function (User $user, string $token) use ($frontendUrl) {
-                $user->notify(new ResetPasswordNotification($token, $frontendUrl));
+                $organisation = $user->organisations()->first();
+
+                $this->emailService->send(
+                    type: EmailTemplateType::PASSWORD_RESET,
+                    recipientEmail: $user->email,
+                    recipientName: $user->first_name . ' ' . $user->last_name,
+                    actionUrl: $frontendUrl . '/reset-password?token=' . $token . '&email=' . urlencode($user->email),
+                    organisation: $organisation,
+                    userId: $user->id,
+                );
            }
        );

--- a/api/app/Http/Controllers/Api/V1/PersonController.php
+++ b/api/app/Http/Controllers/Api/V1/PersonController.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace App\Http\Controllers\Api\V1;

+use App\Enums\EmailTemplateType;
 use App\Enums\PersonStatus;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Api\V1\Traits\VerifiesOrganisationEvent;
@@ -12,18 +13,16 @@ use App\Http\Requests\Api\V1\StorePersonRequest;
 use App\Http\Requests\Api\V1\UpdatePersonRequest;
 use App\Http\Resources\Api\V1\PersonCollection;
 use App\Http\Resources\Api\V1\PersonResource;
-use App\Mail\RegistrationApprovedMail;
-use App\Mail\RegistrationRejectedMail;
 use App\Models\Event;
 use App\Models\Organisation;
 use App\Models\Person;
 use App\Models\User;
+use App\Services\EmailService;
 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
@@ -33,6 +32,7 @@ final class PersonController extends Controller
    public function __construct(
        private readonly PersonIdentityService $identityService,
        private readonly TagSyncService $tagSyncService,
+        private readonly EmailService $emailService,
    ) {}

    public function index(Request $request, Organisation $organisation, Event $event): PersonCollection
@@ -169,7 +169,20 @@ final class PersonController extends Controller
        $this->tagSyncService->syncFromRegistration($person);

        if ($person->email) {
-            Mail::to($person->email)->queue(new RegistrationApprovedMail($person, $event));
+            $this->emailService->send(
+                type: EmailTemplateType::REGISTRATION_APPROVED,
+                recipientEmail: $person->email,
+                recipientName: trim($person->first_name . ' ' . $person->last_name),
+                variables: [
+                    'event_name' => $event->name,
+                    'organisation_name' => $organisation->name,
+                ],
+                actionUrl: config('app.frontend_portal_url'),
+                organisation: $organisation,
+                eventId: $event->id,
+                personId: $person->id,
+                triggeredByUserId: auth()->id(),
+            );
        }

        return $this->success(new PersonResource($person->fresh()->load('crowdType')));
@@ -182,10 +195,20 @@ final class PersonController extends Controller

        $person->update(['status' => 'rejected']);

-        $reason = $request->input('reason');
-
        if ($person->email) {
-            Mail::to($person->email)->queue(new RegistrationRejectedMail($person, $event, $reason));
+            $this->emailService->send(
+                type: EmailTemplateType::REGISTRATION_REJECTED,
+                recipientEmail: $person->email,
+                recipientName: trim($person->first_name . ' ' . $person->last_name),
+                variables: [
+                    'event_name' => $event->name,
+                    'organisation_name' => $organisation->name,
+                ],
+                organisation: $organisation,
+                eventId: $event->id,
+                personId: $person->id,
+                triggeredByUserId: auth()->id(),
+            );
        }

        return $this->success(new PersonResource($person->fresh()->load('crowdType')));