Backend-WIP: Kontakt-Queue, Page-Cache, Validierungs-Feedback, i18n
Gebuendelt, da ueber gemeinsame lang-/Service-Dateien verschraenkt: - Kontakt-Nachrichten: contact_messages-Tabelle + Model/Enums/Factory, Admin-Queue (livewire/admin/contact-messages), ContactController persistiert das Anliegen zusaetzlich zur Brand-Mail - Page-Data-Cache (Services/Web/*PageData) + web-archive-Indizes auf press_releases - Validierungs-Feedback + Company-Portal-Restriction (Feature-Tests) - i18n-Auslagerung lang/de|en (auth, passwords, validation, static) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
ef5de54300
commit
72e6a3c210
60 changed files with 3963 additions and 327 deletions
|
|
@ -9,6 +9,7 @@ use App\Http\Requests\Api\V1\UpdatePressReleaseRequest;
|
|||
use App\Http\Resources\PressReleaseResource;
|
||||
use App\Models\Company;
|
||||
use App\Models\PressRelease;
|
||||
use App\Services\PressRelease\AiDeclarationRequiredException;
|
||||
use App\Services\PressRelease\BlacklistViolationException;
|
||||
use App\Services\PressRelease\BookingRequiredException;
|
||||
use App\Services\PressRelease\PressReleaseService;
|
||||
|
|
@ -151,6 +152,10 @@ class PressReleaseController extends Controller
|
|||
return response()->json([
|
||||
'message' => $exception->getMessage(),
|
||||
], 422);
|
||||
} catch (AiDeclarationRequiredException $exception) {
|
||||
return response()->json([
|
||||
'message' => $exception->getMessage(),
|
||||
], 422);
|
||||
} catch (BlacklistViolationException $exception) {
|
||||
return response()->json([
|
||||
'message' => $exception->getMessage(),
|
||||
|
|
|
|||
|
|
@ -2,19 +2,24 @@
|
|||
|
||||
namespace App\Http\Controllers\Web;
|
||||
|
||||
use App\Enums\ContactMessageTopic;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Mail\ContactRequestSubmitted;
|
||||
use App\Models\ContactMessage;
|
||||
use App\Support\WebPortalContext;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\RateLimiter;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
/**
|
||||
* Öffentliches Kontaktformular der Web-Domains. Versendet die Anfrage per
|
||||
* Mail an die Brand-Kontaktadresse (config domains.*.brand.contact_email,
|
||||
* Fallback: Absenderadresse der Anwendung). Kein Persistieren.
|
||||
* Öffentliches Kontaktformular der Web-Domains (Hub-Modal + schwebendes
|
||||
* Kontakt-Widget). Persistiert das Anliegen in der Admin-Queue „Kontakt"
|
||||
* (contact_messages) und versendet zusätzlich eine Mail an die Brand-
|
||||
* Kontaktadresse (config domains.*.brand.contact_email, Fallback:
|
||||
* Absenderadresse der Anwendung).
|
||||
*/
|
||||
class ContactController extends Controller
|
||||
{
|
||||
|
|
@ -30,16 +35,42 @@ class ContactController extends Controller
|
|||
'name' => ['required', 'string', 'max:255'],
|
||||
'email' => ['required', 'email', 'max:255'],
|
||||
'message' => ['required', 'string', 'min:10', 'max:5000'],
|
||||
'topic' => ['nullable', Rule::enum(ContactMessageTopic::class)],
|
||||
'page_url' => ['nullable', 'string', 'max:500'],
|
||||
], [
|
||||
'name.required' => __('web.launcher.validation_name'),
|
||||
'name.max' => __('web.launcher.validation_name'),
|
||||
'email.required' => __('web.launcher.validation_email'),
|
||||
'email.email' => __('web.launcher.validation_email'),
|
||||
'email.max' => __('web.launcher.validation_email'),
|
||||
'message.required' => __('web.launcher.validation_message'),
|
||||
'message.min' => __('web.launcher.validation_message_min'),
|
||||
'message.max' => __('web.launcher.validation_message_max'),
|
||||
]);
|
||||
|
||||
$this->ensureNotRateLimited($request);
|
||||
RateLimiter::hit($this->throttleKey($request), 3600);
|
||||
|
||||
$topic = ContactMessageTopic::tryFrom($validated['topic'] ?? '') ?? ContactMessageTopic::Contact;
|
||||
|
||||
ContactMessage::create([
|
||||
'portal' => $this->portal($request),
|
||||
'topic' => $topic,
|
||||
'name' => $validated['name'],
|
||||
'email' => $validated['email'],
|
||||
'message' => $validated['message'],
|
||||
'page_url' => $validated['page_url'] ?? null,
|
||||
'requester_ip' => $request->ip(),
|
||||
'user_id' => $request->user()?->id,
|
||||
]);
|
||||
|
||||
Mail::to($this->recipient())->send(new ContactRequestSubmitted(
|
||||
senderName: $validated['name'],
|
||||
senderEmail: $validated['email'],
|
||||
messageText: $validated['message'],
|
||||
host: $request->getHost(),
|
||||
topicLabel: $topic->label(),
|
||||
pageUrl: $validated['page_url'] ?? null,
|
||||
));
|
||||
|
||||
return $this->done();
|
||||
|
|
@ -47,7 +78,20 @@ class ContactController extends Controller
|
|||
|
||||
private function done(): RedirectResponse
|
||||
{
|
||||
return back()->with('contact-status', __('Vielen Dank für Ihre Nachricht. Wir melden uns schnellstmöglich bei Ihnen zurück.'));
|
||||
return back()->with('contact-status', __('web.launcher.success'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Portal-Kennung für die Admin-Queue, aus dem Host abgeleitet:
|
||||
* Hub (pressekonto) vs. Spoke-Portale.
|
||||
*/
|
||||
private function portal(Request $request): string
|
||||
{
|
||||
if (str_contains($request->getHost(), 'pressekonto')) {
|
||||
return 'pressekonto';
|
||||
}
|
||||
|
||||
return WebPortalContext::portalFromHost()->value;
|
||||
}
|
||||
|
||||
private function recipient(): string
|
||||
|
|
@ -72,7 +116,7 @@ class ContactController extends Controller
|
|||
$seconds = RateLimiter::availableIn($this->throttleKey($request));
|
||||
|
||||
throw ValidationException::withMessages([
|
||||
'message' => __('Zu viele Anfragen. Bitte versuchen Sie es in :minutes Minuten erneut.', [
|
||||
'message' => __('web.launcher.throttle', [
|
||||
'minutes' => max(1, (int) ceil($seconds / 60)),
|
||||
]),
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class ReportFormController extends Controller
|
|||
// Bot: ein ausgefülltes Honeypot-Feld → still und neutral abnicken,
|
||||
// bewusst VOR der Validierung (sonst verrät die Regel die Falle).
|
||||
if (filled($request->input('website')) || filled($request->input('homepage'))) {
|
||||
return back()->with('report-status', __('Vielen Dank. Ihre Meldung ist eingegangen.'));
|
||||
return back()->with('report-status', __('static.report_form.flash_honeypot'));
|
||||
}
|
||||
|
||||
$validated = $request->validate([
|
||||
|
|
@ -53,7 +53,7 @@ class ReportFormController extends Controller
|
|||
// bestem Wissen und Gewissen abgegeben wird (nur Weg 1).
|
||||
'truth_affirmed' => $way === 'rechtswidrig' ? ['accepted'] : ['nullable'],
|
||||
], [
|
||||
'truth_affirmed.accepted' => __('Bitte bestätigen Sie, dass Sie die Meldung nach bestem Wissen und Gewissen abgeben.'),
|
||||
'truth_affirmed.accepted' => __('static.report_form.validation_truth'),
|
||||
]);
|
||||
|
||||
$this->ensureNotRateLimited($request);
|
||||
|
|
@ -82,7 +82,7 @@ class ReportFormController extends Controller
|
|||
Mail::to($legalRequest->requester_email)->send(new LegalRequestReceived($legalRequest));
|
||||
Mail::to($this->operatorRecipient($request))->send(new LegalRequestSubmitted($legalRequest));
|
||||
|
||||
return back()->with('report-status', __('Vielen Dank. Ihre Meldung ist unter der Vorgangsnummer :reference eingegangen — Sie erhalten eine Eingangsbestätigung per E-Mail.', [
|
||||
return back()->with('report-status', __('static.report_form.flash_received', [
|
||||
'reference' => $legalRequest->reference(),
|
||||
]));
|
||||
}
|
||||
|
|
@ -140,7 +140,7 @@ class ReportFormController extends Controller
|
|||
$seconds = RateLimiter::availableIn($this->throttleKey($request));
|
||||
|
||||
throw ValidationException::withMessages([
|
||||
'message' => __('Zu viele Anfragen. Bitte versuchen Sie es in :minutes Minuten erneut.', [
|
||||
'message' => __('static.report_form.throttle', [
|
||||
'minutes' => max(1, (int) ceil($seconds / 60)),
|
||||
]),
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@ class TerminationController extends Controller
|
|||
'terminate_mode' => ['required', 'in:asap,date'],
|
||||
'terminate_at' => ['required_if:terminate_mode,date', 'nullable', 'date'],
|
||||
], [
|
||||
'reason.required_if' => __('Bitte geben Sie den Grund der außerordentlichen Kündigung an.'),
|
||||
'terminate_at.required_if' => __('Bitte geben Sie das gewünschte Beendigungsdatum an.'),
|
||||
'reason.required_if' => __('static.cancellation.validation_reason'),
|
||||
'terminate_at.required_if' => __('static.cancellation.validation_date'),
|
||||
]);
|
||||
|
||||
$this->ensureNotRateLimited($request);
|
||||
|
|
@ -79,7 +79,7 @@ class TerminationController extends Controller
|
|||
|
||||
private function done(): RedirectResponse
|
||||
{
|
||||
return back()->with('termination-status', __('Ihre Kündigung ist bei uns eingegangen. Sie erhalten umgehend eine automatische Eingangsbestätigung per E-Mail mit Datum und Uhrzeit des Zugangs.'));
|
||||
return back()->with('termination-status', __('static.cancellation.flash_received'));
|
||||
}
|
||||
|
||||
private function operatorRecipient(): string
|
||||
|
|
@ -102,7 +102,7 @@ class TerminationController extends Controller
|
|||
$seconds = RateLimiter::availableIn($this->throttleKey($request));
|
||||
|
||||
throw ValidationException::withMessages([
|
||||
'email' => __('Zu viele Anfragen. Bitte versuchen Sie es in :minutes Minuten erneut.', [
|
||||
'email' => __('static.cancellation.throttle', [
|
||||
'minutes' => max(1, (int) ceil($seconds / 60)),
|
||||
]),
|
||||
])->errorBag('termination');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue