Code improvements

app/Domains/Admin/Controllers/UserDetailGetController.php

@@ -23,7 +23,7 @@ class UserDetailGetController extends CommonController
 
         return response()->json([
             'user' => $userData,
-            'isOwnUser' => auth()->id() === $user->id,
+            'isOwnUser' => currentUser()?->id === $user->id,
             'isLvTenant' => $this->tenant->slug === 'lv',
             'userRoles' => UserRole::all()->map(fn($role) => ['slug' => $role->slug, 'name' => $role->name]),
             'localGroups' => $this->adminTenants->getActiveLocalGroups()->map(fn($t) => ['slug' => $t->slug, 'name' => $t->name]),

app/Domains/Admin/Controllers/UserToggleActiveController.php

@@ -16,7 +16,7 @@ class UserToggleActiveController extends CommonController
 
         $action = new ToggleUserActiveAction(new ToggleUserActiveRequest(
             user: $user,
-            currentUserId: auth()->id(),
+            currentUserId: currentUser()?->id,
         ));
 
         $response = $action->execute();

app/Domains/Admin/Controllers/UserUpdateController.php

@@ -17,7 +17,7 @@ class UserUpdateController extends CommonController
         $action = new UpdateUserAction(new UpdateUserRequest(
             user: $user,
             data: $request->all(),
-            isOwnUser: auth()->id() === $user->id,
+            isOwnUser: currentUser()?->id === $user->id,
             isLvTenant: $this->tenant->slug === 'lv',
         ));
 

app/Domains/Budget/Actions/CreateEstimate/CreateEstimateAction.php

@@ -25,7 +25,7 @@ class CreateEstimateAction {
 
         if ($this->request->estimateId === 0) {
             $estimate = CostUnitEstimate::create(array_merge([
-                'tenant' => app('tenant')->slug,
+                'tenant' => currentTenant()->slug,
                 'cost_unit_id' => $this->request->costUnit->id,
                 'type' => $this->request->estimateType,
                 'description' => $this->request->description,
@@ -33,7 +33,7 @@ class CreateEstimateAction {
         } else {
             $estimate = CostUnitEstimate::find($this->request->estimateId);
             $estimate->update(array_merge([
-                'tenant' => app('tenant')->slug,
+                'tenant' => currentTenant()->slug,
                 'cost_unit_id' => $this->request->costUnit->id,
                 'type' => $this->request->estimateType,
                 'description' => $this->request->description,

app/Domains/CostUnit/Actions/CreateCostUnit/CreateCostUnitCommand.php

@@ -15,7 +15,7 @@ class CreateCostUnitCommand {
         $response = new CreateCostUnitResponse();
         $costUnit = CostUnit::create([
             'name' => $this->request->name,
-            'tenant' => app('tenant')->slug,
+            'tenant' => currentTenant()->slug,
             'type' => $this->request->type,
             'billing_deadline' => $this->request->billingDeadline,
             'distance_allowance' => $this->request->distanceAllowance->getAmount(),

app/Domains/Dashboard/Controllers/PersonalDataController.php

@@ -13,7 +13,7 @@ class PersonalDataController extends CommonController
             return redirect()->intended('/login');
         }
 
-        $user = auth()->user();
+        $user = currentUser();
         $data = $this->users->getPersonalData($user);
 
         $inertiaProvider = new InertiaProvider('Dashboard/PersonalData', [

app/Domains/Dashboard/Controllers/StorePersonalDataController.php

@@ -12,7 +12,7 @@ class StorePersonalDataController extends CommonController
 {
     public function __invoke(Request $request): JsonResponse
     {
-        $user = auth()->user();
+        $user = currentUser();
 
         $actionRequest = new UpdatePersonalDataRequest(
             user:               $user,

app/Domains/Event/Actions/CreateEvent/CreateEventCommand.php

@@ -28,7 +28,7 @@ class CreateEventCommand {
         }
 
 
-        $tenant = app('tenant');
+        $tenant = currentTenant();
 
         // Anlage als Ganzes: der Event-Teil der Rechnungsnummer wird unter der Sperre vergeben und muss
         // im selben Zug geschrieben werden, sonst könnten zwei gleichzeitige Anlagen denselben erhalten.
@@ -91,12 +91,12 @@ class CreateEventCommand {
                 ]);
             }
 
-            if (app('tenant')->slug === 'lv') {
+            if (currentTenant()->slug === 'lv') {
                 foreach(Tenant::where(['is_active_local_group' => true])->get() as $tenant) {
                     EventLocalGroups::create(['event_id' => $event->id, 'local_group_id' => $tenant->id]);
                 }
             } else {
-                EventLocalGroups::create(['event_id' => $event->id, 'local_group_id' => app('tenant')->id]);
+                EventLocalGroups::create(['event_id' => $event->id, 'local_group_id' => currentTenant()->id]);
             }
 
 

app/Domains/Event/Actions/GenerateIcal/GenerateIcalCommand.php

@@ -13,7 +13,7 @@ class GenerateIcalCommand
         $participant = $this->request->participant;
         $event = $participant->event;
 
-        $uid = $participant->identifier . '@' . app('tenant')->slug;
+        $uid = $participant->identifier . '@' . currentTenant()->slug;
         $dtStart = $event->start_date->format('Ymd');
         $dtEnd = $event->end_date->copy()->addDay()->format('Ymd');
         $now = now()->format('Ymd\THis\Z');
@@ -24,7 +24,7 @@ class GenerateIcalCommand
         $icalContent = implode("\r\n", [
                 'BEGIN:VCALENDAR',
                 'VERSION:2.0',
-                'PRODID:-//' . app('tenant')->name . '//Veranstaltungskalender//DE',
+                'PRODID:-//' . currentTenant()->name . '//Veranstaltungskalender//DE',
                 'CALSCALE:GREGORIAN',
                 'METHOD:PUBLISH',
                 'BEGIN:VEVENT',

app/Domains/Event/Actions/GenerateIcalForDeadline/GenerateIcalForDeadlineCommand.php

@@ -21,11 +21,11 @@ class GenerateIcalForDeadlineCommand {
         $icalContent = implode("\r\n", [
                 'BEGIN:VCALENDAR',
                 'VERSION:2.0',
-                'PRODID:-//' . app('tenant')->name . '//Veranstaltungskalender//DE',
+                'PRODID:-//' . currentTenant()->name . '//Veranstaltungskalender//DE',
                 'CALSCALE:GREGORIAN',
                 'METHOD:PUBLISH',
                 'BEGIN:VEVENT',
-                'UID:payment-deadline-' . $event->identifier . '@' . app('tenant')->slug,
+                'UID:payment-deadline-' . $event->identifier . '@' . currentTenant()->slug,
                 'DTSTAMP:' . $now,
                 'DTSTART;VALUE=DATE:' . $dtDate,
                 'DTEND;VALUE=DATE:' . $dtDate,

app/Domains/Event/Actions/SetParticipationFees/SetParticipationFeesCommand.php

@@ -18,7 +18,7 @@ class SetParticipationFeesCommand {
         $this->cleanBefore();
 
         $this->request->event->participationFee1()->associate(EventParticipationFee::create([
-            'tenant' => app('tenant')->slug,
+            'tenant' => currentTenant()->slug,
             'type' => $this->request->participationFeeFirst['type'],
             'name' => $this->request->participationFeeFirst['name'],
             'description' => $this->request->participationFeeFirst['description'],
@@ -29,7 +29,7 @@ class SetParticipationFeesCommand {
 
         if ($this->request->participationFeeSecond !== null) {
             $this->request->event->participationFee2()->associate(EventParticipationFee::create([
-                'tenant' => app('tenant')->slug,
+                'tenant' => currentTenant()->slug,
                 'type' => $this->request->participationFeeSecond['type'],
                 'name' => $this->request->participationFeeSecond['name'],
                 'description' => $this->request->participationFeeSecond['description'],
@@ -41,7 +41,7 @@ class SetParticipationFeesCommand {
 
         if ($this->request->participationFeeThird !== null) {
             $this->request->event->participationFee3()->associate(EventParticipationFee::create([
-                'tenant' => app('tenant')->slug,
+                'tenant' => currentTenant()->slug,
                 'type' => $this->request->participationFeeThird['type'],
                 'name' => $this->request->participationFeeThird['name'],
                 'description' => $this->request->participationFeeThird['description'],
@@ -53,7 +53,7 @@ class SetParticipationFeesCommand {
 
         if ($this->request->participationFeeFourth !== null) {
             $this->request->event->participationFee4()->associate(EventParticipationFee::create([
-                'tenant' => app('tenant')->slug,
+                'tenant' => currentTenant()->slug,
                 'type' => $this->request->participationFeeFourth['type'],
                 'name' => $this->request->participationFeeFourth['name'],
                 'description' => $this->request->participationFeeFourth['description'],

app/Domains/Event/Controllers/CreateController.php

@@ -21,7 +21,7 @@ use Illuminate\Http\Request;
 class CreateController extends CommonController {
     public function __invoke() {
         return new InertiaProvider('Event/Create', [
-            'emailAddress' => auth()->user()->email,
+            'emailAddress' => currentUserOrFail()->email,
             'eventAccount' => $this->tenant->account_name,
             'eventIban' => $this->tenant->account_iban,
             'eventPayPerDay' => $this->tenant->slug === 'lv' ? true : false,

app/Domains/Event/Controllers/MailCompose/SendController.php

@@ -38,7 +38,7 @@ class SendController extends CommonController
             }
         }
 
-        $user = auth()->user();
+        $user = currentUser();
         $reportSubject = sprintf('Sendebericht für Nachricht mit Betreff "%s"', $subject);
 
         Mail::to($user->email)->send(new ManualMailsReportMail(

app/Domains/Event/Controllers/SignupController.php

@@ -35,8 +35,9 @@ class SignupController extends CommonController {
             'lastname' => '',
         ];
 
-        if (auth()->check()) {
-            $user = new UserResource(auth()->user())->toArray($request);
+        $currentUser = currentUser();
+        if ($currentUser !== null) {
+            $user = new UserResource($currentUser)->toArray($request);
 
             $participantData = [
                 'id' => $user['id'],

app/Domains/Invoice/Actions/ChangeStatus/ChangeStatusCommand.php

@@ -22,7 +22,7 @@ class ChangeStatusCommand {
         switch ($this->request->status) {
             case InvoiceStatus::INVOICE_STATUS_APPROVED:
                 $this->request->invoice->status = InvoiceStatus::INVOICE_STATUS_APPROVED;
-                $this->request->invoice->approved_by = auth()->user()->id;
+                $this->request->invoice->approved_by = currentUserOrFail()->id;
                 $this->request->invoice->approved_at = now();
 
                 if ($this->request->invoice->contact_email !== null) {
@@ -35,7 +35,7 @@ class ChangeStatusCommand {
 
             case InvoiceStatus::INVOICE_STATUS_DENIED:
                 $this->request->invoice->status = InvoiceStatus::INVOICE_STATUS_DENIED;
-                $this->request->invoice->denied_by = auth()->user()->id;
+                $this->request->invoice->denied_by = currentUserOrFail()->id;
                 $this->request->invoice->denied_at = now();
                 $this->request->invoice->denied_reason = $this->request->comment;
                 if ($this->request->invoice->contact_email !== null) {

app/Domains/Invoice/Actions/CreateInvoice/CreateInvoiceCommand.php

@@ -24,7 +24,7 @@ class CreateInvoiceCommand {
         }
 
         $invoice = Invoice::create([
-            'tenant' => app('tenant')->slug,
+            'tenant' => currentTenant()->slug,
             'cost_unit_id' => $this->request->costUnit->id,
             'invoice_number' => $this->generateInvoiceNumber(),
             'status' => InvoiceStatus::INVOICE_STATUS_NEW,
@@ -61,7 +61,7 @@ class CreateInvoiceCommand {
         }
 
         if ($this->request->costUnit->mail_on_new) {
-            $recipients = [app('tenant')->email_finance];
+            $recipients = [currentTenant()->email_finance];
 
             foreach ($this->request->costUnit->treasurers()->get() as $treasurer) {
                 if (!in_array($treasurer->email, $recipients)) {
@@ -83,7 +83,7 @@ class CreateInvoiceCommand {
 
     private function generateInvoiceNumber() : string {
         $lastInvoiceNumber = Invoice::query()
-            ->where('tenant', app('tenant')->slug)
+            ->where('tenant', currentTenant()->slug)
             ->whereYear('created_at', date('Y'))
             ->count();
 

app/Domains/Invoice/Actions/UploadInvoice/UploadInvoiceCommand.php

@@ -19,7 +19,7 @@ class UploadInvoiceCommand {
         $uploadDir = sprintf(
             '%1$s%2$s/%3$s',
             WebDavProvider::INVOICE_PREFIX,
-            app('tenant')->url,
+            currentTenant()->url,
             $this->request->invoice->costUnit()->first()->name
         );
 

app/Domains/ParticipantInvoice/Actions/CreateParticipantInvoice/CreateParticipantInvoiceCommand.php

@@ -35,7 +35,7 @@ class CreateParticipantInvoiceCommand
         $this->participant = $request->participant;
         $this->event = $request->participant->event;
 
-        // Über die Relation und nicht über app('tenant'): die Rechnung hängt an der Veranstaltung,
+        // Über die Relation und nicht über currentTenant(): die Rechnung hängt an der Veranstaltung,
         // nicht am gerade aktiven Mandanten. `$event->tenant` liefert das Slug-Attribut, nicht die
         // Relation -- deshalb der ausdrückliche Aufruf.
         $this->sender = $this->event->tenant()->first();

app/Domains/ParticipantRefund/Actions/AcceptRefund/AcceptRefundCommand.php

@@ -141,7 +141,7 @@ class AcceptRefundCommand
      * Die Kostenstelle der Veranstaltung.
      *
      * Ohne Zugriffsprüfung, weil hier niemand angemeldet ist -- der Teili bestätigt über seinen Token.
-     * Der Repository-Check greift sonst auf `auth()->user()->id` zu und liefe in einen Fehler.
+     * Der Repository-Check greift sonst auf `currentUserOrFail()->id` zu und liefe in einen Fehler.
      *
      * Bewusst ohne Prüfung auf `allow_new`/`archived`: Eine Erstattung fällt oft erst nach dem Ende der
      * Veranstaltung an, wenn die Kostenstelle längst geschlossen ist. Sie gehört trotzdem dorthin -- und

app/Domains/ParticipantRefund/Actions/ReleaseRefund/ReleaseRefundCommand.php

@@ -63,7 +63,7 @@ class ReleaseRefundCommand
                 'retained_amount' => $this->request->retainedAmount(),
                 'retention_reason' => $this->retentionReason(),
                 'retention_reason_note' => $this->retentionReasonNote(),
-                'released_by' => auth()->id(),
+                'released_by' => currentUser()?->id,
                 'released_at' => now(),
             ]);
 
@@ -101,7 +101,7 @@ class ReleaseRefundCommand
             accountIban: (string) $this->request->accountIban,
             // Niemand kreuzt hier eine Erklärung an; wer die Angaben aufgenommen hat, hält `captured_by`
             // fest, und der Beleg weist es aus.
-            capturedBy: auth()->id(),
+            capturedBy: currentUser()?->id,
         ))->execute();
 
         if (!$acceptResponse->success) {

app/Domains/UserManagement/Controllers/EmailVerificationController.php

@@ -23,7 +23,7 @@ use Illuminate\Http\Request;
 class EmailVerificationController extends CommonController
 {
     public function verifyEmailForm(Request $request) {
-        $inertiaProvider = new InertiaProvider('UserManagement/VerifyEmail', ['appName' => app('tenant')->name]);
+        $inertiaProvider = new InertiaProvider('UserManagement/VerifyEmail', ['appName' => currentTenant()->name]);
         return $inertiaProvider->render();
     }
 

app/Domains/UserManagement/Controllers/LoginController.php

@@ -17,7 +17,7 @@ class LoginController extends CommonController {
         }
 
 
-        $inertiaProvider = new InertiaProvider('UserManagement/Login', ['errors' => $errors, 'appName' => app('tenant')->name]);
+        $inertiaProvider = new InertiaProvider('UserManagement/Login', ['errors' => $errors, 'appName' => currentTenant()->name]);
         return $inertiaProvider->render();
     }
 
@@ -45,8 +45,8 @@ class LoginController extends CommonController {
             ]);
         }
 
-        $user = Auth::user();
-        $tenant = app('tenant');
+        $user = currentUserOrFail();
+        $tenant = currentTenant();
 
         // Auf "lv" darf sich grundsätzlich jeder aktive Nutzer einloggen.
         // Auf Sub-Tenants gilt:

app/Domains/UserManagement/Controllers/ProfileController.php

@@ -13,7 +13,7 @@ class ProfileController extends CommonController
             return redirect()->intended('/login');
         }
 
-        $user = auth()->user();
+        $user = currentUser();
 
         $inertiaProvider = new InertiaProvider('UserManagement/Profile', [
             'username' => $user->username,

app/Domains/UserManagement/Controllers/RegistrationController.php

@@ -26,8 +26,8 @@ class RegistrationController extends CommonController {
 
         $inertiaProvider = new InertiaProvider('UserManagement/Registration', [
             'errors' => $errors,
-            'appName' => app('tenant')->name,
-            'tenant' => app('tenant'),
+            'appName' => currentTenant()->name,
+            'tenant' => currentTenant(),
         ]);
         return $inertiaProvider->render();
     }
@@ -46,7 +46,7 @@ class RegistrationController extends CommonController {
         $userRoleMain = UserRole::USER_ROLE_USER;
         $userRoleLocalGroup = UserRole::USER_ROLE_USER;
 
-        $localGroup = app('tenant')->slug === 'lv' ? $request->get('localGroup') : app('tenant')->slug;
+        $localGroup = currentTenant()->slug === 'lv' ? $request->get('localGroup') : currentTenant()->slug;
 
 
         $registrationRequest = new UserRegistrationRequest(

app/Domains/UserManagement/Controllers/StoreProfileController.php

@@ -7,6 +7,7 @@ use App\Domains\UserManagement\Actions\UserChangePassword\UserChangePasswordRequ
 use App\Scopes\CommonController;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class StoreProfileController extends CommonController
 {
@@ -27,11 +28,11 @@ class StoreProfileController extends CommonController
             return response()->json(['success' => false, 'message' => 'Die Passwörter stimmen nicht überein.'], 422);
         }
 
-        $actionRequest = new UserChangePasswordRequest(auth()->user(), $password);
+        $actionRequest = new UserChangePasswordRequest(currentUserOrFail(), $password);
         $command = new UserChangePasswordCommand($actionRequest);
         $command->execute();
 
-        auth()->logout();
+        Auth::logout();
         return response()->json(['success' => true, 'message' => 'Dein Passwort wurde erfolgreich geändert.']);
     }
 }