th.guenther/mareike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code Styling

Browse Source
This commit is contained in:
Thomas Günther
2026-06-21 22:12:05 +02:00
parent aebb2f9aaa
commit c1ef1d71ad
49 changed files with 650 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Domains/Admin/Controllers/ManagedTenantContactGetController.php
+1 -2
View File
@@ -2,7 +2,6 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,7 +10,7 @@ class ManagedTenantContactGetController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
return response()->json([
'email' => $tenant->email,
app/Domains/Admin/Controllers/ManagedTenantContactUpdateController.php
+14 -10
View File
@@ -2,7 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Domains\Admin\Actions\UpdateTenantContact\UpdateTenantContactAction;
use App\Domains\Admin\Actions\UpdateTenantContact\UpdateTenantContactRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,18 +12,21 @@ class ManagedTenantContactUpdateController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
$tenant->update([
'email' => $request->input('email'),
'email_finance' => $request->input('email_finance'),
'postcode' => $request->input('postcode'),
'city' => $request->input('city'),
]);
$action = new UpdateTenantContactAction(new UpdateTenantContactRequest(
tenant: $tenant,
email: $request->input('email'),
emailFinance: $request->input('email_finance'),
postcode: $request->input('postcode'),
city: $request->input('city'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Kontaktdaten wurden gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/ManagedTenantGdprGetController.php
+1 -2
View File
@@ -2,7 +2,6 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,7 +10,7 @@ class ManagedTenantGdprGetController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
return response()->json([
'gdpr_text' => $tenant->gdpr_text ?? '',
app/Domains/Admin/Controllers/ManagedTenantGdprUpdateController.php
+12 -7
View File
@@ -2,24 +2,29 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Domains\Admin\Actions\UpdateTenantGdpr\UpdateTenantGdprAction;
use App\Domains\Admin\Actions\UpdateTenantGdpr\UpdateTenantGdprRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class ManagedTenantGdprUpdateController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
$tenant->update([
'gdpr_text' => $request->input('gdpr_text'),
]);
$action = new UpdateTenantGdprAction(new UpdateTenantGdprRequest(
tenant: $tenant,
gdprText: $request->input('gdpr_text'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Datenschutzerklärung wurde gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/ManagedTenantImpressGetController.php
+1 -2
View File
@@ -2,7 +2,6 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,7 +10,7 @@ class ManagedTenantImpressGetController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
return response()->json([
'impress_text' => $tenant->impress_text ?? '',
app/Domains/Admin/Controllers/ManagedTenantImpressUpdateController.php
+11 -7
View File
@@ -2,7 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Domains\Admin\Actions\UpdateTenantImpress\UpdateTenantImpressAction;
use App\Domains\Admin\Actions\UpdateTenantImpress\UpdateTenantImpressRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,15 +12,18 @@ class ManagedTenantImpressUpdateController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
$tenant->update([
'impress_text' => $request->input('impress_text'),
]);
$action = new UpdateTenantImpressAction(new UpdateTenantImpressRequest(
tenant: $tenant,
impressText: $request->input('impress_text'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Impressum wurde gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/ManagedTenantPaymentGetController.php
+1 -2
View File
@@ -2,7 +2,6 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,7 +10,7 @@ class ManagedTenantPaymentGetController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
return response()->json([
'account_iban' => $tenant->account_iban,
app/Domains/Admin/Controllers/ManagedTenantPaymentUpdateController.php
+13 -9
View File
@@ -2,7 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Domains\Admin\Actions\UpdateTenantPayment\UpdateTenantPaymentAction;
use App\Domains\Admin\Actions\UpdateTenantPayment\UpdateTenantPaymentRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,17 +12,20 @@ class ManagedTenantPaymentUpdateController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
$tenant->update([
'account_iban' => $request->input('account_iban'),
'account_bic' => $request->input('account_bic'),
'account_name' => $request->input('account_name'),
]);
$action = new UpdateTenantPaymentAction(new UpdateTenantPaymentRequest(
tenant: $tenant,
accountIban: $request->input('account_iban'),
accountBic: $request->input('account_bic'),
accountName: $request->input('account_name'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Bezahldaten wurden gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/TenantContactUpdateController.php
+13 -8
View File
@@ -2,6 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Domains\Admin\Actions\UpdateTenantContact\UpdateTenantContactAction;
use App\Domains\Admin\Actions\UpdateTenantContact\UpdateTenantContactRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -10,16 +12,19 @@ class TenantContactUpdateController extends CommonController
{
public function __invoke(Request $request): JsonResponse
{
$this->tenant->update([
'email' => $request->input('email'),
'email_finance' => $request->input('email_finance'),
'postcode' => $request->input('postcode'),
'city' => $request->input('city'),
]);
$action = new UpdateTenantContactAction(new UpdateTenantContactRequest(
tenant: $this->tenant,
email: $request->input('email'),
emailFinance: $request->input('email_finance'),
postcode: $request->input('postcode'),
city: $request->input('city'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Kontaktdaten wurden gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/TenantCreateController.php
+12 -18
View File
@@ -2,7 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Domains\Admin\Actions\CreateTenant\CreateTenantAction;
use App\Domains\Admin\Actions\CreateTenant\CreateTenantRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,25 +12,18 @@ class TenantCreateController extends CommonController
{
public function __invoke(Request $request): JsonResponse
{
$tenant = Tenant::create([
'name' => $request->input('name'),
'slug' => $request->input('slug'),
'url' => $request->input('url'),
'email' => '',
'email_finance' => '',
'account_name' => '',
'account_iban' => '',
'account_bic' => '',
'city' => '',
'postcode' => '',
'is_active_local_group' => true,
'has_active_instance' => true,
]);
$action = new CreateTenantAction(new CreateTenantRequest(
name: $request->input('name'),
slug: $request->input('slug'),
url: $request->input('url'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Stamm wurde angelegt.',
'slug' => $tenant->slug,
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
'slug' => $response->slug,
]);
}
}
app/Domains/Admin/Controllers/TenantEditPageController.php
+1 -2
View File
@@ -2,7 +2,6 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Providers\InertiaProvider;
use App\Scopes\CommonController;
use Illuminate\Http\Request;
@@ -12,7 +11,7 @@ class TenantEditPageController extends CommonController
{
public function __invoke(string $slug, Request $request): Response
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
$inertiaProvider = new InertiaProvider('Admin/TenantEdit', [
'tenant' => [
app/Domains/Admin/Controllers/TenantGdprUpdateController.php
+10 -5
View File
@@ -2,6 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Domains\Admin\Actions\UpdateTenantGdpr\UpdateTenantGdprAction;
use App\Domains\Admin\Actions\UpdateTenantGdpr\UpdateTenantGdprRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -10,13 +12,16 @@ class TenantGdprUpdateController extends CommonController
{
public function __invoke(Request $request): JsonResponse
{
$this->tenant->update([
'gdpr_text' => $request->input('gdpr_text'),
]);
$action = new UpdateTenantGdprAction(new UpdateTenantGdprRequest(
tenant: $this->tenant,
gdprText: $request->input('gdpr_text'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Datenschutzerklärung wurde gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/TenantGeneralGetController.php
+1 -2
View File
@@ -2,7 +2,6 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,7 +10,7 @@ class TenantGeneralGetController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
return response()->json([
'name' => $tenant->name,
app/Domains/Admin/Controllers/TenantGeneralUpdateController.php
+13 -9
View File
@@ -2,7 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Domains\Admin\Actions\UpdateTenantGeneral\UpdateTenantGeneralAction;
use App\Domains\Admin\Actions\UpdateTenantGeneral\UpdateTenantGeneralRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,17 +12,20 @@ class TenantGeneralUpdateController extends CommonController
{
public function __invoke(string $slug, Request $request): JsonResponse
{
$tenant = Tenant::where('slug', $slug)->firstOrFail();
$tenant = $this->adminTenants->findBySlug($slug);
$tenant->update([
'name' => $request->input('name'),
'slug' => $request->input('slug'),
'url' => $request->input('url'),
]);
$action = new UpdateTenantGeneralAction(new UpdateTenantGeneralRequest(
tenant: $tenant,
name: $request->input('name'),
slug: $request->input('slug'),
url: $request->input('url'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Allgemeine Daten wurden gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/TenantImpressUpdateController.php
+10 -5
View File
@@ -2,6 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Domains\Admin\Actions\UpdateTenantImpress\UpdateTenantImpressAction;
use App\Domains\Admin\Actions\UpdateTenantImpress\UpdateTenantImpressRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -10,13 +12,16 @@ class TenantImpressUpdateController extends CommonController
{
public function __invoke(Request $request): JsonResponse
{
$this->tenant->update([
'impress_text' => $request->input('impress_text'),
]);
$action = new UpdateTenantImpressAction(new UpdateTenantImpressRequest(
tenant: $this->tenant,
impressText: $request->input('impress_text'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Impressum wurde gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/TenantListApiController.php
+4 -3
View File
@@ -2,7 +2,6 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,7 +10,9 @@ class TenantListApiController extends CommonController
{
public function __invoke(Request $request): JsonResponse
{
$tenants = Tenant::where('has_active_instance', true)->get()->map(function ($tenant) {
$tenants = $this->adminTenants->getActiveTenants();
$mapped = $tenants->map(function ($tenant) {
return [
'name' => $tenant->name,
'slug' => $tenant->slug,
@@ -20,6 +21,6 @@ class TenantListApiController extends CommonController
];
});
return response()->json(['tenants' => $tenants]);
return response()->json(['tenants' => $mapped]);
}
}
app/Domains/Admin/Controllers/TenantPaymentUpdateController.php
+12 -7
View File
@@ -2,6 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Domains\Admin\Actions\UpdateTenantPayment\UpdateTenantPaymentAction;
use App\Domains\Admin\Actions\UpdateTenantPayment\UpdateTenantPaymentRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -10,15 +12,18 @@ class TenantPaymentUpdateController extends CommonController
{
public function __invoke(Request $request): JsonResponse
{
$this->tenant->update([
'account_iban' => $request->input('account_iban'),
'account_bic' => $request->input('account_bic'),
'account_name' => $request->input('account_name'),
]);
$action = new UpdateTenantPaymentAction(new UpdateTenantPaymentRequest(
tenant: $this->tenant,
accountIban: $request->input('account_iban'),
accountBic: $request->input('account_bic'),
accountName: $request->input('account_name'),
));
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Bezahldaten wurden gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}
app/Domains/Admin/Controllers/UserDetailGetController.php
+3 -6
View File
@@ -3,8 +3,6 @@
namespace App\Domains\Admin\Controllers;
use App\Enumerations\UserRole;
use App\Models\Tenant;
use App\Models\User;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -13,13 +11,12 @@ class UserDetailGetController extends CommonController
{
public function __invoke(int $id, Request $request): JsonResponse
{
$user = User::findOrFail($id);
$user = $this->adminUsers->findById($id);
$userData = $user->toArray();
unset($userData['password'], $userData['remember_token'], $userData['activation_token'], $userData['activation_token_expires_at']);
$tenantNames = Tenant::pluck('name', 'slug');
$tenantNames = $this->adminTenants->getTenantNames();
$userData['nicename'] = $user->getNicename();
$userData['fullname'] = $user->getFullName();
$userData['local_group_name'] = $tenantNames[$user->local_group] ?? $user->local_group;
@@ -29,7 +26,7 @@ class UserDetailGetController extends CommonController
'isOwnUser' => auth()->id() === $user->id,
'isLvTenant' => $this->tenant->slug === 'lv',
'userRoles' => UserRole::all()->map(fn($role) => ['slug' => $role->slug, 'name' => $role->name]),
'localGroups' => Tenant::where('is_active_local_group', true)->get()->map(fn($t) => ['slug' => $t->slug, 'name' => $t->name]),
'localGroups' => $this->adminTenants->getActiveLocalGroups()->map(fn($t) => ['slug' => $t->slug, 'name' => $t->name]),
]);
}
}
app/Domains/Admin/Controllers/UserListApiController.php
+4 -14
View File
@@ -2,8 +2,6 @@
namespace App\Domains\Admin\Controllers;
use App\Models\Tenant;
use App\Models\User;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -12,18 +10,10 @@ class UserListApiController extends CommonController
{
public function __invoke(Request $request): JsonResponse
{
$tenantNames = Tenant::pluck('name', 'slug');
$tenantNames = $this->adminTenants->getTenantNames();
$users = $this->adminUsers->getListForTenant($this->tenant->slug);
$query = User::query();
if ($this->tenant->slug === 'lv') {
$query->orderBy('lastname')->orderBy('firstname');
} else {
$query->where('local_group', $this->tenant->slug)
->orderBy('lastname')->orderBy('firstname');
}
$users = $query->get()->map(function ($user) use ($tenantNames) {
$mapped = $users->map(function ($user) use ($tenantNames) {
return [
'id' => $user->id,
'firstname' => $user->firstname,
@@ -35,6 +25,6 @@ class UserListApiController extends CommonController
];
});
return response()->json(['users' => $users]);
return response()->json(['users' => $mapped]);
}
}
app/Domains/Admin/Controllers/UserResetPasswordController.php
+1 -2
View File
@@ -3,7 +3,6 @@
namespace App\Domains\Admin\Controllers;
use App\Domains\UserManagement\Actions\GenerateActivationToken\GenerateActivationTokenCommand;
use App\Models\User;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -12,7 +11,7 @@ class UserResetPasswordController extends CommonController
{
public function __invoke(int $id, Request $request): JsonResponse
{
$user = User::findOrFail($id);
$user = $this->adminUsers->findById($id);
if (!$user->email) {
return response()->json([
app/Domains/Admin/Controllers/UserToggleActiveController.php
+11 -14
View File
@@ -2,7 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Models\User;
use App\Domains\Admin\Actions\ToggleUserActive\ToggleUserActiveAction;
use App\Domains\Admin\Actions\ToggleUserActive\ToggleUserActiveRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,23 +12,19 @@ class UserToggleActiveController extends CommonController
{
public function __invoke(int $id, Request $request): JsonResponse
{
$user = User::findOrFail($id);
$user = $this->adminUsers->findById($id);
if (auth()->id() === $user->id) {
return response()->json([
'status' => 'error',
'message' => 'Du kannst dich nicht selbst deaktivieren.',
]);
}
$action = new ToggleUserActiveAction(new ToggleUserActiveRequest(
user: $user,
currentUserId: auth()->id(),
));
$user->update(['active' => !$user->active]);
$status = $user->active ? 'aktiviert' : 'deaktiviert';
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Benutzer*in wurde ' . $status . '.',
'active' => $user->active,
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
'active' => $response->active,
]);
}
}
app/Domains/Admin/Controllers/UserUpdateController.php
+12 -23
View File
@@ -2,7 +2,8 @@
namespace App\Domains\Admin\Controllers;
use App\Models\User;
use App\Domains\Admin\Actions\UpdateUser\UpdateUserAction;
use App\Domains\Admin\Actions\UpdateUser\UpdateUserRequest;
use App\Scopes\CommonController;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -11,32 +12,20 @@ class UserUpdateController extends CommonController
{
public function __invoke(int $id, Request $request): JsonResponse
{
$user = User::findOrFail($id);
$isOwnUser = auth()->id() === $user->id;
$isLvTenant = $this->tenant->slug === 'lv';
$user = $this->adminUsers->findById($id);
$allowedFields = [
'firstname', 'lastname', 'nickname', 'email', 'phone', 'birthday',
'membership_id', 'address_1', 'address_2', 'postcode', 'city',
'eating_habits', 'swimming_permission', 'first_aid_permission',
'bank_account_owner', 'bank_account_iban',
'medications', 'allergies', 'intolerances',
'user_role_local_group',
];
$action = new UpdateUserAction(new UpdateUserRequest(
user: $user,
data: $request->all(),
isOwnUser: auth()->id() === $user->id,
isLvTenant: $this->tenant->slug === 'lv',
));
if ($isLvTenant) {
$allowedFields[] = 'local_group';
if (!$isOwnUser) {
$allowedFields[] = 'user_role_main';
}
}
$data = $request->only($allowedFields);
$user->update($data);
$response = $action->execute();
return response()->json([
'status' => 'success',
'message' => 'Benutzerdaten wurden gespeichert.',
'status' => $response->success ? 'success' : 'error',
'message' => $response->message,
]);
}
}