Optimierung 5.2 (Teil 1): ProvidesUserFormRules-Concern

Die zwischen Benutzer-Anlegen und -Bearbeiten identischen Validierungsbloecke
liegen jetzt in ProvidesUserFormRules: userIdentityRules(?int $ignore) (E-Mail-
Unique ignoriert beim Bearbeiten den eigenen Datensatz), userRolesAndCompaniesRules()
und userBillingRules(). Beide Formulare nutzen die Array-Spreads; die nur im
Bearbeiten genutzten Profil-/Kontakt-Regeln bleiben dort inline. Ungenutzten
Rule-Import aus dem Anlegen-Formular entfernt.

Offen (mit User abzustimmen, UI-/Divergenz-lastig): gemeinsamer Save-Service und
die Blade-Feld-Components.

31 User-Tests gruen.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

app/Livewire/Concerns/ProvidesUserFormRules.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Livewire\Concerns;
+
+use App\Enums\Portal;
+use App\Enums\RegistrationType;
+use Illuminate\Validation\Rule;
+
+/**
+ * Gemeinsame Validierungsregeln der Benutzer-Formulare (Anlegen/Bearbeiten).
+ * Nur die zwischen beiden Formularen identischen Blöcke leben hier; die rein
+ * im Bearbeiten genutzten Profil-/Kontakt-Regeln bleiben dort inline.
+ */
+trait ProvidesUserFormRules
+{
+    /**
+     * Identitäts-Stammdaten. Beim Bearbeiten ignoriert die E-Mail-Unique-Regel
+     * den eigenen Datensatz.
+     *
+     * @return array<string, mixed>
+     */
+    protected function userIdentityRules(?int $ignoreUserId = null): array
+    {
+        $emailUnique = Rule::unique('users', 'email');
+
+        if ($ignoreUserId !== null) {
+            $emailUnique = $emailUnique->ignore($ignoreUserId);
+        }
+
+        return [
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'email', $emailUnique],
+            'portal' => ['required', Rule::in(array_map(static fn (Portal $portal): string => $portal->value, Portal::cases()))],
+            'registrationType' => ['required', Rule::in(array_map(static fn (RegistrationType $type): string => $type->value, RegistrationType::cases()))],
+            'language' => ['required', 'string', Rule::in(['de', 'en'])],
+        ];
+    }
+
+    /**
+     * Rollen-Auswahl plus Firmen-Verknüpfungen mit Pivot-Rolle.
+     *
+     * @return array<string, mixed>
+     */
+    protected function userRolesAndCompaniesRules(): array
+    {
+        return [
+            'selectedRoles' => ['required', 'array', 'min:1'],
+            'selectedRoles.*' => ['string', Rule::exists('roles', 'name')],
+            'linkedCompanyIds' => ['array'],
+            'linkedCompanyIds.*' => ['integer', Rule::exists('companies', 'id')],
+            'companyRoles' => ['array'],
+            'companyRoles.*' => ['string', Rule::in(['member', 'responsible', 'owner'])],
+        ];
+    }
+
+    /**
+     * Rechnungsadresse (optional; nur gespeichert, wenn vollständig).
+     *
+     * @return array<string, mixed>
+     */
+    protected function userBillingRules(): array
+    {
+        return [
+            'billing.salutation_key' => ['nullable', 'string', 'max:20'],
+            'billing.title' => ['nullable', 'string', 'max:80'],
+            'billing.name' => ['nullable', 'string', 'max:255'],
+            'billing.address1' => ['nullable', 'string', 'max:255'],
+            'billing.address2' => ['nullable', 'string', 'max:255'],
+            'billing.postal_code' => ['nullable', 'string', 'max:20'],
+            'billing.city' => ['nullable', 'string', 'max:120'],
+            'billing.country_code' => ['nullable', 'string', 'size:2'],
+        ];
+    }
+}

dev/optimize/entwicklungsplan.md

@@ -82,7 +82,7 @@ Keine Fachlogik-Änderung. Reduziert erreichbare Demo-Komponenten und Altlasten.
 ## Phase 5 — Admin-CRUD & Auth: Concerns + Blade-Components (risikoarm)
 
 - [x] **5.1 Tabellen-Concerns** — `HasSortableTable::sort()` (5 byte-identische Kopien zentralisiert; `$sortBy`/`$sortDir`-Defaults bleiben in der Komponente, da sie divergieren) und `HasFullTextSearch::supportsFullTextSearch()` (9 byte-identische Kopien — 4 Index-Listen + 5 Firmen-Comboboxen; nicht mehr genutzte `DB`-Imports entfernt). `AdminPerformanceCache::activeInactiveStats(Builder)` bündelt den identischen `SUM(CASE WHEN is_active)`-Block der Benutzer- und Firmenliste. Tests: erweiterte `AdminPerformanceCacheTest`; abgesichert durch 99 `Admin/`-Tests. **Bewusst zurückgestellt:** `HasResettableFilters` (die `updatedXxxFilter()` divergieren — manche normalisieren zusätzlich Werte; ein generischer `updated()`-Hook wäre eine Verhaltensänderung) und eine gemeinsame `hydrateRelationCounts()` (Count-Hydration unterscheidet sich je Tabelle real).
-- [ ] **5.2 User create/edit entdoppeln** — `UserFormRules`-Provider + `UserUpsertService`/`SaveUserAction` (`save()` trägt ~175 Zeilen). Markup → `<x-admin.billing-fields>`, `<x-admin.company-link-picker>`, `<x-admin.role-checkboxes>`. Kontakt → `ValidatesContactData`-Concern + `<x-contact-fields>`.
+- [~] **5.2 User create/edit entdoppeln** — **Teil 1 erledigt:** `ProvidesUserFormRules`-Concern bündelt die zwischen Anlegen/Bearbeiten identischen Validierungsblöcke (`userIdentityRules(?int $ignore)`, `userRolesAndCompaniesRules()`, `userBillingRules()`); die nur im Bearbeiten genutzten Profil-/Kontakt-Regeln bleiben dort inline. Beide Formulare nutzen die Spreads, 31 User-Tests grün. **Offen (bewusst, mit User abzustimmen):** gemeinsamer `UserUpsertService`/`SaveUserAction` für die ~175-Zeilen-`save()` (Anlegen/Bearbeiten divergieren stark — Bearbeiten trägt zusätzlich Profil, Kontakte, Passwort, 2FA), sowie die Blade-Feld-Components (`billing-fields`, `company-link-picker`, `role-checkboxes`, `contact-fields`) — Markup-Extraktion braucht visuelle QA (analog zur zurückgestellten 2.8).
 - [ ] **5.3 Formatierungs-Components/Enum** — `Portal::badgeColor()` + `<x-portal.portal-badge>`; `<x-portal.status-badge>`; `PressReleaseStatus`-Enum-Methoden; `<x-portal.money>`, `<x-portal.datetime>`, `Category::localizedName()`, `Contact::displayName()`.
 - [ ] **5.4 Seiten-Struktur-Components** — `<x-portal.page-header>`, `<x-portal.stat-cards>`, `<x-portal.table-panel>`, `<x-portal.table-pagination>`, `<x-portal.empty-state>`, `<x-portal.searchable-select>`. (Muster: bestehende `<x-portal.stat-card>`/`components.portal.pagination`.)
 - [ ] **5.5 Flash/Auth-Components** — `<x-portal.alert :dismissible>` + `<x-session-status>` app-weit; `<x-password-input>`, `<x-form-field>`/`<x-email-input>`; `ensureNotRateLimited()/throttleKey()`-Trait (login/magic-link divergieren); `<x-auth.divider-actions>`.

resources/views/livewire/admin/users/create.blade.php

@@ -6,7 +6,6 @@ use App\Models\Company;
 use App\Models\User;
 use App\Services\Admin\AdminPerformanceCache;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Validation\Rule;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
 use Livewire\Volt\Component;
@@ -15,6 +14,7 @@ use Spatie\Permission\Models\Role;
 new #[Layout('components.layouts.app'), Title('Benutzer anlegen')] class extends Component
 {
     use \App\Livewire\Concerns\HasFullTextSearch;
+    use \App\Livewire\Concerns\ProvidesUserFormRules;
 
     public string $name = '';
 
@@ -109,25 +109,9 @@ new #[Layout('components.layouts.app'), Title('Benutzer anlegen')] class extends
     public function save(): void
     {
         $validated = $this->validate([
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'email', Rule::unique('users', 'email')],
-            'portal' => ['required', Rule::in(array_map(static fn (Portal $portal): string => $portal->value, Portal::cases()))],
-            'registrationType' => ['required', Rule::in(array_map(static fn (RegistrationType $type): string => $type->value, RegistrationType::cases()))],
-            'language' => ['required', 'string', Rule::in(['de', 'en'])],
-            'selectedRoles' => ['required', 'array', 'min:1'],
-            'selectedRoles.*' => ['string', Rule::exists('roles', 'name')],
-            'linkedCompanyIds' => ['array'],
-            'linkedCompanyIds.*' => ['integer', Rule::exists('companies', 'id')],
-            'companyRoles' => ['array'],
-            'companyRoles.*' => ['string', Rule::in(['member', 'responsible', 'owner'])],
-            'billing.salutation_key' => ['nullable', 'string', 'max:20'],
-            'billing.title' => ['nullable', 'string', 'max:80'],
-            'billing.name' => ['nullable', 'string', 'max:255'],
-            'billing.address1' => ['nullable', 'string', 'max:255'],
-            'billing.address2' => ['nullable', 'string', 'max:255'],
-            'billing.postal_code' => ['nullable', 'string', 'max:20'],
-            'billing.city' => ['nullable', 'string', 'max:120'],
-            'billing.country_code' => ['nullable', 'string', 'size:2'],
+            ...$this->userIdentityRules(),
+            ...$this->userRolesAndCompaniesRules(),
+            ...$this->userBillingRules(),
         ]);
 
         $user = User::query()->create([

resources/views/livewire/admin/users/edit.blade.php

@@ -17,6 +17,7 @@ use Spatie\Permission\Models\Role;
 new #[Layout('components.layouts.app'), Title('Benutzer bearbeiten')] class extends Component
 {
     use \App\Livewire\Concerns\HasFullTextSearch;
+    use \App\Livewire\Concerns\ProvidesUserFormRules;
 
     #[Locked]
     public int $id;
@@ -376,11 +377,7 @@ new #[Layout('components.layouts.app'), Title('Benutzer bearbeiten')] class exte
     public function save(): void
     {
         $validated = $this->validate([
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'email', Rule::unique('users', 'email')->ignore($this->id)],
-            'portal' => ['required', Rule::in(array_map(static fn (Portal $portal): string => $portal->value, Portal::cases()))],
-            'registrationType' => ['required', Rule::in(array_map(static fn (RegistrationType $type): string => $type->value, RegistrationType::cases()))],
-            'language' => ['required', 'string', Rule::in(['de', 'en'])],
+            ...$this->userIdentityRules($this->id),
             'profile.salutation_key' => ['nullable', 'string', 'max:20'],
             'profile.title' => ['nullable', 'string', 'max:80'],
             'profile.first_name' => ['nullable', 'string', 'max:80'],
@@ -397,12 +394,7 @@ new #[Layout('components.layouts.app'), Title('Benutzer bearbeiten')] class exte
             'profile.tax_exempt' => ['boolean'],
             'profile.tax_exempt_reason' => ['nullable', 'string', 'max:1000'],
             'profile.disable_footer_code' => ['boolean'],
-            'selectedRoles' => ['required', 'array', 'min:1'],
-            'selectedRoles.*' => ['string', Rule::exists('roles', 'name')],
-            'linkedCompanyIds' => ['array'],
-            'linkedCompanyIds.*' => ['integer', Rule::exists('companies', 'id')],
-            'companyRoles' => ['array'],
-            'companyRoles.*' => ['string', Rule::in(['member', 'responsible', 'owner'])],
+            ...$this->userRolesAndCompaniesRules(),
             'contactForms' => ['array'],
             'contactForms.*.id' => ['required', 'integer', Rule::exists('contacts', 'id')],
             'contactForms.*.company_id' => ['required', 'integer', Rule::exists('companies', 'id')],
@@ -411,14 +403,7 @@ new #[Layout('components.layouts.app'), Title('Benutzer bearbeiten')] class exte
             'contactForms.*.email' => ['nullable', 'email', 'max:255'],
             'contactForms.*.phone' => ['nullable', 'string', 'max:40'],
             'contactForms.*.responsibility' => ['nullable', 'string', 'max:255'],
-            'billing.salutation_key' => ['nullable', 'string', 'max:20'],
-            'billing.title' => ['nullable', 'string', 'max:80'],
-            'billing.name' => ['nullable', 'string', 'max:255'],
-            'billing.address1' => ['nullable', 'string', 'max:255'],
-            'billing.address2' => ['nullable', 'string', 'max:255'],
-            'billing.postal_code' => ['nullable', 'string', 'max:20'],
-            'billing.city' => ['nullable', 'string', 'max:120'],
-            'billing.country_code' => ['nullable', 'string', 'size:2'],
+            ...$this->userBillingRules(),
         ]);
 
         $user = User::query()->findOrFail($this->id);