controller refactoring part 15

routes/admin.php

@@ -1,37 +1,46 @@
 <?php
 
-use Domain\Admin\Controllers\UserController;
-use Domain\Localization\Controllers\UpdateLanguageStringController;
+use Domain\Admin\Controllers\Dashboard\GetNewbiesController;
+use Domain\Admin\Controllers\Dashboard\GetWidgetsValuesController;
+use Domain\Admin\Controllers\Users\UserController;
+use Domain\Admin\Controllers\Users\ChangeUserRoleController;
+use Domain\Admin\Controllers\Users\ChangeUserStorageCapacityController;
+use Domain\Admin\Controllers\Users\DeleteUserController;
+use Domain\Admin\Controllers\Users\ResetUserPasswordController;
+use Domain\Admin\Controllers\Users\ShowUserInvoicesController;
+use Domain\Admin\Controllers\Users\ShowUserStorageCapacityController;
+use Domain\Admin\Controllers\Users\ShowUserSubscriptionController;
 use Domain\Plans\Controllers\PlansController;
 use Domain\Admin\Controllers\InvoiceController;
-use Domain\Admin\Controllers\DashboardController;
 use Domain\Pages\Controllers\AdminPagesController;
-use Domain\Localization\Controllers\LanguageController;
-use Domain\Settings\Controllers\AdminSettingsController;
-use Domain\Settings\Controllers\FlushCacheController;
-use Domain\Settings\Controllers\GetSettingsValueController;
 use Domain\Settings\Controllers\SetEmailController;
 use Domain\Settings\Controllers\SetStripeController;
+use Domain\Settings\Controllers\FlushCacheController;
+use Domain\Localization\Controllers\LanguageController;
+use Domain\Settings\Controllers\GetSettingsValueController;
 use Domain\Settings\Controllers\UpdateSettingValueController;
+use Domain\Localization\Controllers\UpdateLanguageStringController;
 
 // Dashboard
 Route::group(['prefix' => 'dashboard'], function () {
-    Route::get('/newbies', [DashboardController::class, 'newbies']);
-    Route::get('/', [DashboardController::class, 'index']);
+    Route::get('/newbies', GetNewbiesController::class);
+    Route::get('/', GetWidgetsValuesController::class);
 });
 
 // Users
 Route::group(['prefix' => 'users'], function () {
-    Route::patch('/{user}/capacity', [UserController::class, 'change_storage_capacity']);
-    Route::post('/{user}/reset-password', [UserController::class, 'reset_password']);
-    Route::get('/{user}/subscription', [UserController::class, 'subscription']);
-    Route::delete('/{user}/delete', [UserController::class, 'delete_user']);
-    Route::patch('/{user}/role', [UserController::class, 'change_role']);
-    Route::get('/{user}/invoices', [UserController::class, 'invoices']);
-    Route::get('/{user}/storage', [UserController::class, 'storage']);
-    Route::get('/{user}/detail', [UserController::class, 'details']);
-    Route::post('/create', [UserController::class, 'create_user']);
-    Route::get('/', [UserController::class, 'users']);
+    Route::patch('/{user}/capacity', ChangeUserStorageCapacityController::class);
+    Route::post('/{user}/reset-password', ResetUserPasswordController::class);
+    Route::get('/{user}/storage', ShowUserStorageCapacityController::class);
+    Route::patch('/{user}/role', ChangeUserRoleController::class);
+    Route::delete('/{user}/delete', DeleteUserController::class);
+
+    // Subscription
+    Route::get('/{user}/subscription', ShowUserSubscriptionController::class);
+    Route::get('/{user}/invoices', ShowUserInvoicesController::class);
+
+    // Resource
+    Route::apiResource('/', UserController::class);
 });
 
 // Plans

routes/api.php

@@ -11,10 +11,10 @@ use App\Users\Controllers\ForgotPasswordController;
 use Domain\Files\Controllers\UploadFilesController;
 use Domain\Folders\Controllers\FavouriteController;
 use Domain\Plans\Controllers\ActivePlansController;
-use Domain\Settings\Controllers\GetSettingsValueController;
 use Domain\Zipping\Controllers\ZipFolderController;
 use Domain\Folders\Controllers\CreateFolderController;
 use Domain\Sharing\Controllers\ShareViaEmailController;
+use Domain\Settings\Controllers\GetSettingsValueController;
 use Domain\Trash\Controllers\RestoreTrashContentController;
 use Domain\Browsing\Controllers\BrowseLatestFilesController;
 use Domain\Browsing\Controllers\BrowseSharedItemsController;

routes/user.php

@@ -1,21 +1,20 @@
 <?php
 
-use App\Users\Controllers\Account\AccountDetailsController;
-use App\Users\Controllers\Account\StorageCapacityController;
-use App\Users\Controllers\Account\UpdatePasswordController;
-use App\Users\Controllers\Account\UpdateProfileSettingsController;
-use App\Users\Controllers\AuthController;
-use App\Users\Controllers\Authentication\AccountAccessTokenController;
-use App\Users\Controllers\Authentication\CheckAccountController;
-use App\Users\Controllers\Verification\ResendVerificationEmail;
-use App\Users\Controllers\Verification\VerifyEmailController;
 use Domain\Invoices\Controllers\UserInvoicesController;
 use Domain\Payments\Controllers\PaymentMethodsController;
+use App\Users\Controllers\Account\AccountDetailsController;
+use App\Users\Controllers\Account\UpdatePasswordController;
+use App\Users\Controllers\Account\StorageCapacityController;
+use App\Users\Controllers\Verification\VerifyEmailController;
 use Domain\Subscriptions\Controllers\GetSetupIntentController;
+use App\Users\Controllers\Verification\ResendVerificationEmail;
+use App\Users\Controllers\Authentication\CheckAccountController;
+use App\Users\Controllers\Account\UpdateProfileSettingsController;
 use Domain\Subscriptions\Controllers\SubscriptionCancelController;
-use Domain\Subscriptions\Controllers\SubscriptionDetailsController;
 use Domain\Subscriptions\Controllers\SubscriptionResumeController;
+use Domain\Subscriptions\Controllers\SubscriptionDetailsController;
 use Domain\Subscriptions\Controllers\SubscriptionUpgradeController;
+use App\Users\Controllers\Authentication\AccountAccessTokenController;
 
 Route::post('/check', CheckAccountController::class);
 

routes/web.php

@@ -8,7 +8,6 @@ use Domain\Subscriptions\Controllers\StripeWebhookController;
 use Domain\SetupWizard\Controllers\CreateAdminAccountController;
 use Domain\Localization\Controllers\CurrentLocalizationController;
 
-
 // Setup Wizard
 Route::post('/admin-setup', CreateAdminAccountController::class);
 

src/App/Users/Controllers/Account/StorageCapacityController.php

@@ -1,11 +1,8 @@
 <?php
-
-
 namespace App\Users\Controllers\Account;
 
-
-use App\Users\Resources\UserStorageResource;
 use Illuminate\Support\Facades\Auth;
+use App\Users\Resources\UserStorageResource;
 
 class StorageCapacityController
 {

src/App/Users/Controllers/Account/UpdatePasswordController.php

@@ -1,13 +1,10 @@
 <?php
-
-
 namespace App\Users\Controllers\Account;
 
-
-use App\Http\Controllers\Controller;
-use App\Users\Requests\UpdateUserPasswordRequest;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
+use App\Users\Requests\UpdateUserPasswordRequest;
 
 class UpdatePasswordController extends Controller
 {

src/App/Users/Controllers/Account/UpdateProfileSettingsController.php

@@ -1,12 +1,9 @@
 <?php
-
-
 namespace App\Users\Controllers\Account;
 
-
-use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 

src/App/Users/Controllers/Authentication/AccountAccessTokenController.php

@@ -1,15 +1,12 @@
 <?php
-
-
 namespace App\Users\Controllers\Authentication;
 
-
-use App\Http\Controllers\Controller;
-use App\Users\Requests\UserCreateAccessTokenRequest;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
+use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Auth;
 use Laravel\Sanctum\PersonalAccessToken;
+use App\Users\Requests\UserCreateAccessTokenRequest;
 
 class AccountAccessTokenController extends Controller
 {
@@ -19,7 +16,8 @@ class AccountAccessTokenController extends Controller
     public function index(): Response
     {
         return response(
-            Auth::user()->tokens()->get(), 200
+            Auth::user()->tokens()->get(),
+            200
         );
     }
 

src/App/Users/Controllers/Authentication/CheckAccountController.php

@@ -2,9 +2,9 @@
 namespace App\Users\Controllers\Authentication;
 
 use App\Users\Models\User;
+use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use App\Users\Requests\CheckAccountRequest;
-use Illuminate\Http\Response;
 
 class CheckAccountController extends Controller
 {
@@ -14,7 +14,6 @@ class CheckAccountController extends Controller
     public function __invoke(
         CheckAccountRequest $request
     ): array | Response {
-
         $user = User::whereEmail($request->input('email'))
             ->first();
 

src/App/Users/Controllers/Verification/ResendVerificationEmail.php

@@ -1,20 +1,16 @@
 <?php
-
-
 namespace App\Users\Controllers\Verification;
 
-
-use App\Http\Controllers\Controller;
 use App\Users\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
 
 class ResendVerificationEmail extends Controller
 {
     public function __invoke(
         Request $request
     ): Response {
-
         $user = User::where('email', $request->input('email'))
             ->first();
 

src/App/Users/Controllers/Verification/VerifyEmailController.php

@@ -1,14 +1,11 @@
 <?php
-
-
 namespace App\Users\Controllers\Verification;
 
-
-use App\Http\Controllers\Controller;
 use App\Users\Models\User;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
 
 class VerifyEmailController extends Controller
 {
@@ -16,7 +13,6 @@ class VerifyEmailController extends Controller
         string $id,
         Request $request,
     ): RedirectResponse | Response {
-
         if (! $request->hasValidSignature()) {
             return response('Invalid or expired url provided.', 401);
         }

src/App/Users/Models/User.php

@@ -10,7 +10,6 @@ use Laravel\Sanctum\HasApiTokens;
 use Illuminate\Support\Collection;
 use Database\Factories\UserFactory;
 use Kyslik\ColumnSortable\Sortable;
-use Support\Services\HelperService;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Notifications\Notifiable;
 use App\Users\Notifications\ResetPassword;
@@ -215,10 +214,5 @@ class User extends Authenticatable implements MustVerifyEmail
             // Create user directory for his files
             Storage::makeDirectory("files/$user->id");
         });
-
-        static::deleted(function ($user) {
-            resolve(HelperService::class)
-                ->erase_user_data($user);
-        });
     }
 }

src/Domain/Admin/Actions/DeleteUserDataAction.php

@@ -0,0 +1,34 @@
+<?php
+
+
+namespace Domain\Admin\Actions;
+
+
+use App\Users\Models\User;
+use DB;
+use Illuminate\Support\Facades\Storage;
+
+class DeleteUserDataAction
+{
+    /**
+     * Delete all user data including files, folders, avatar etc.
+     */
+    public function __invoke(User $user)
+    {
+        // Delete user avatar if exists
+        if ($user->settings->getRawOriginal('avatar')) {
+            Storage::delete($user->settings->getRawOriginal('avatar'));
+        }
+
+        // Delete all user files
+        Storage::deleteDirectory("files/$user->id");
+
+        // Delete all user records in database
+        collect(['folders', 'files', 'user_settings', 'shares', 'favourite_folder', 'zips', 'traffic'])
+            ->each(function ($table) use ($user) {
+                DB::table($table)
+                    ->whereUserId($user->id)
+                    ->delete();
+            });
+    }
+}

src/Domain/Admin/Controllers/Dashboard/GetNewbiesController.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace Domain\Admin\Controllers\Dashboard;
+
+
+use App\Http\Controllers\Controller;
+use App\Users\Models\User;
+use App\Users\Resources\UsersCollection;
+
+class GetNewbiesController extends Controller
+{
+    public function __invoke(): UsersCollection
+    {
+        $users = User::sortable([
+            'created_at' => 'desc'
+        ])
+            ->paginate(10);
+
+        return new UsersCollection($users);
+    }
+}

src/Domain/Admin/Controllers/Dashboard/GetWidgetsValuesController.php

@@ -1,26 +1,17 @@
 <?php
-namespace Domain\Admin\Controllers;
 
-use ByteUnits\Metric;
-use App\Users\Models\User;
-use Laravel\Cashier\Subscription;
+
+namespace Domain\Admin\Controllers\Dashboard;
+
+
 use App\Http\Controllers\Controller;
-use App\Users\Resources\UsersCollection;
-use Domain\Subscriptions\Services\StripeService;
+use App\Users\Models\User;
+use ByteUnits\Metric;
+use Laravel\Cashier\Subscription;
 
-class DashboardController extends Controller
+class GetWidgetsValuesController extends Controller
 {
-    public function __construct(
-        private StripeService $stripe
-    ) {
-    }
-
-    /**
-     * Get data for dashboard
-     *
-     * @return array
-     */
-    public function index()
+    public function __invoke(): array
     {
         // Get total premium users
         $premium_users = Subscription::whereStripeStatus('active')
@@ -39,17 +30,4 @@ class DashboardController extends Controller
             'total_premium_users' => $premium_users,
         ];
     }
-
-    /**
-     * Get the newest users
-     *
-     * @return UsersCollection
-     */
-    public function newbies()
-    {
-        return new UsersCollection(
-            User::sortable(['created_at' => 'desc'])
-                ->paginate(10)
-        );
-    }
 }

src/Domain/Admin/Controllers/UserController.php

@@ -1,228 +0,0 @@
-<?php
-namespace Domain\Admin\Controllers;
-
-use App\Users\Models\User;
-use Illuminate\Http\Response;
-use App\Users\Models\UserSettings;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
-use App\Users\Resources\UserResource;
-use App\Users\Resources\UsersCollection;
-use Illuminate\Support\Facades\Password;
-use App\Users\Resources\UserSubscription;
-use App\Users\Resources\UserStorageResource;
-use Domain\Admin\Requests\ChangeRoleRequest;
-use Domain\Admin\Requests\CreateUserByAdmin;
-use Domain\Admin\Requests\DeleteUserRequest;
-use Domain\Invoices\Resources\InvoiceCollection;
-use Domain\Subscriptions\Services\StripeService;
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\Routing\ResponseFactory;
-use Domain\Admin\Requests\ChangeStorageCapacityRequest;
-
-class UserController extends Controller
-{
-    public function __construct(
-        private StripeService $stripe
-    ) {
-    }
-
-    /**
-     * Get user details
-     *
-     * @param User $user
-     * @return UserResource
-     */
-    public function details(User $user)
-    {
-        return new UserResource(
-            $user
-        );
-    }
-
-    /**
-     * Get user storage details
-     *
-     * @param User $user
-     * @return UserStorageResource
-     */
-    public function storage(User $user)
-    {
-        return new UserStorageResource(
-            $user
-        );
-    }
-
-    /**
-     * Get user storage details
-     *
-     * @param User $user
-     * @return InvoiceCollection
-     */
-    public function invoices(User $user)
-    {
-        return new InvoiceCollection(
-            $this
-                ->stripe
-                ->getUserInvoices($user)
-        );
-    }
-
-    /**
-     * Get user subscription details
-     *
-     * @param User $user
-     * @return UserSubscription|Application|ResponseFactory|Response
-     */
-    public function subscription(User $user)
-    {
-        if (! $user->stripeId() || ! $user->subscription('main')) {
-            return response("User doesn't have any subscription.", 404);
-        }
-
-        return new UserSubscription(
-            $user
-        );
-    }
-
-    /**
-     * Get all users
-     *
-     * @return UsersCollection
-     */
-    public function users()
-    {
-        return new UsersCollection(
-            User::sortable(['created_at', 'DESC'])
-                ->paginate(20)
-        );
-    }
-
-    /**
-     * Change user role
-     *
-     * @param ChangeRoleRequest $request
-     * @param User $user
-     * @return UserResource
-     */
-    public function change_role(ChangeRoleRequest $request, User $user)
-    {
-        // Demo preview
-        if (is_demo_account('howdy@hi5ve.digial')) {
-            return new UserResource($user);
-        }
-
-        // Update user role
-        $user->role = $request->input('attributes.role');
-        $user->save();
-
-        return new UserResource(
-            $user
-        );
-    }
-
-    /**
-     * Change user storage capacity
-     *
-     * @param ChangeStorageCapacityRequest $request
-     * @param User $user
-     * @return UserStorageResource
-     */
-    public function change_storage_capacity(ChangeStorageCapacityRequest $request, User $user)
-    {
-        $user
-            ->settings()
-            ->update(
-                $request->input('attributes')
-            );
-
-        return new UserStorageResource(
-            $user
-        );
-    }
-
-    /**
-     * Send user password reset link
-     *
-     * @param User $user
-     * @return ResponseFactory|Response
-     */
-    public function reset_password(User $user)
-    {
-        // Demo preview
-        if (is_demo()) {
-            return response('Done!', 204);
-        }
-
-        // Get password token
-        $token = Password::getRepository()
-            ->create($user);
-
-        // Send user email
-        $user->sendPasswordResetNotification($token);
-
-        return response('Done!', 204);
-    }
-
-    /**
-     * Create new user by admin
-     *
-     * @param CreateUserByAdmin $request
-     * @return UserResource|Application|ResponseFactory|Response
-     */
-    public function create_user(CreateUserByAdmin $request)
-    {
-        // Create user
-        $user = User::forceCreate([
-            'role'              => $request->role,
-            'email'             => $request->email,
-            'password'          => bcrypt($request->password),
-            'email_verified_at' => now(),
-        ]);
-
-        UserSettings::unguard();
-
-        $user
-            ->settings()
-            ->create([
-                'name'             => $request->name,
-                'avatar'           => store_avatar($request, 'avatar'),
-                'storage_capacity' => $request->storage_capacity,
-            ]);
-
-        UserSettings::reguard();
-
-        return response(new UserResource($user), 201);
-    }
-
-    /**
-     * Delete user with all user data
-     *
-     * @param DeleteUserRequest $request
-     * @param User $user
-     * @return ResponseFactory|Response
-     * @throws \Exception
-     */
-    public function delete_user(DeleteUserRequest $request, User $user)
-    {
-        if (is_demo()) {
-            return response('Done!', 204);
-        }
-
-        if ($user->subscribed('main')) {
-            abort(202, "You can\'t delete this account while user have active subscription.");
-        }
-
-        if ($user->id === Auth::id()) {
-            abort(406, "You can\'t delete your account");
-        }
-
-        if ($user->settings->name !== $request->name) {
-            abort(403, 'The name you typed is wrong!');
-        }
-
-        $user->delete();
-
-        return response('Done!', 204);
-    }
-}

src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php

@@ -0,0 +1,26 @@
+<?php
+namespace Domain\Admin\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Users\Models\User;
+use App\Users\Resources\UserResource;
+use Domain\Admin\Requests\ChangeRoleRequest;
+
+class ChangeUserRoleController extends Controller
+{
+    public function __invoke(
+        ChangeRoleRequest $request,
+        User $user,
+    ): UserResource {
+        if (is_demo_account($user->email)) {
+            return new UserResource($user);
+        }
+
+        // Update user role
+        $user->update([
+            'role' => $request->input('attributes.role'),
+        ]);
+
+        return new UserResource($user);
+    }
+}

src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php

@@ -0,0 +1,26 @@
+<?php
+namespace Domain\Admin\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Users\Models\User;
+use App\Users\Resources\UserStorageResource;
+use Domain\Admin\Requests\ChangeStorageCapacityRequest;
+
+class ChangeUserStorageCapacityController extends Controller
+{
+    /**
+     * Change user storage capacity
+     */
+    public function __invoke(
+        ChangeStorageCapacityRequest $request,
+        User $user,
+    ): UserStorageResource {
+        $user
+            ->settings()
+            ->update(
+                $request->input('attributes')
+            );
+
+        return new UserStorageResource($user);
+    }
+}

src/Domain/Admin/Controllers/Users/DeleteUserController.php

@@ -0,0 +1,45 @@
+<?php
+namespace Domain\Admin\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Users\Models\User;
+use Domain\Admin\Actions\DeleteUserDataAction;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
+use Domain\Admin\Requests\DeleteUserRequest;
+
+class DeleteUserController extends Controller
+{
+    /**
+     * Delete user with all user data
+     */
+    public function __invoke(
+        DeleteUserRequest $request,
+        User $user,
+        DeleteUserDataAction $deleteUserData,
+    ): Response {
+
+        if (is_demo()) {
+            return response('Done!', 204);
+        }
+
+        if ($user->subscribed('main')) {
+            abort(202, "You can\'t delete this account while user have active subscription.");
+        }
+
+        if ($user->id === Auth::id()) {
+            abort(406, "You can\'t delete your account");
+        }
+
+        if ($user->settings->name !== $request->name) {
+            abort(403, 'The name you typed is wrong!');
+        }
+
+        $user->delete();
+
+        // Delete all user data
+        ($deleteUserData)($user);
+
+        return response('Done!', 204);
+    }
+}

src/Domain/Admin/Controllers/Users/ResetUserPasswordController.php

@@ -0,0 +1,30 @@
+<?php
+namespace Domain\Admin\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Users\Models\User;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Password;
+use Illuminate\Contracts\Routing\ResponseFactory;
+
+class ResetUserPasswordController extends Controller
+{
+    /**
+     * Send user password reset link
+     */
+    public function __invoke(User $user): Response
+    {
+        if (is_demo()) {
+            return response('Done!', 204);
+        }
+
+        // Get password token
+        $token = Password::getRepository()
+            ->create($user);
+
+        // Send user email
+        $user->sendPasswordResetNotification($token);
+
+        return response('Done!', 204);
+    }
+}

src/Domain/Admin/Controllers/Users/ShowUserInvoicesController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Domain\Admin\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Users\Models\User;
+use Domain\Invoices\Resources\InvoiceCollection;
+use Domain\Subscriptions\Services\StripeService;
+
+class ShowUserInvoicesController extends Controller
+{
+    public function __construct(
+        private StripeService $stripe
+    ) {}
+
+    /**
+     * Get user storage details
+     */
+    public function __invoke(User $user): InvoiceCollection
+    {
+        $invoices = $this->stripe->getUserInvoices($user);
+
+        return new InvoiceCollection($invoices);
+    }
+}

src/Domain/Admin/Controllers/Users/ShowUserStorageCapacityController.php

@@ -0,0 +1,17 @@
+<?php
+namespace Domain\Admin\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Users\Models\User;
+use App\Users\Resources\UserStorageResource;
+
+class ShowUserStorageCapacityController extends Controller
+{
+    /**
+     * Get user storage details
+     */
+    public function __invoke(User $user): UserStorageResource
+    {
+        return new UserStorageResource($user);
+    }
+}

src/Domain/Admin/Controllers/Users/ShowUserSubscriptionController.php

@@ -0,0 +1,22 @@
+<?php
+namespace Domain\Admin\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Users\Models\User;
+use Illuminate\Http\Response;
+use App\Users\Resources\UserSubscription;
+
+class ShowUserSubscriptionController extends Controller
+{
+    /**
+     * Get user subscription details
+     */
+    public function __invoke(User $user): UserSubscription|Response
+    {
+        if (! $user->stripeId() || ! $user->subscription('main')) {
+            return response("User doesn't have any subscription.", 404);
+        }
+
+        return new UserSubscription($user);
+    }
+}

src/Domain/Admin/Controllers/Users/UserController.php

@@ -0,0 +1,60 @@
+<?php
+namespace Domain\Admin\Controllers\Users;
+
+use App\Users\Models\User;
+use Illuminate\Http\Response;
+use App\Users\Models\UserSettings;
+use App\Http\Controllers\Controller;
+use App\Users\Resources\UserResource;
+use App\Users\Resources\UsersCollection;
+use Domain\Admin\Requests\CreateUserByAdmin;
+
+class UserController extends Controller
+{
+    /**
+     * Get all users
+     */
+    public function index(): UsersCollection
+    {
+        $users = User::sortable(['created_at', 'DESC'])
+            ->paginate(20);
+
+        return new UsersCollection($users);
+    }
+
+    /**
+     * Get user details
+     */
+    public function show(User $user): UserResource
+    {
+        return new UserResource($user);
+    }
+
+    /**
+     * Create new user by admin
+     */
+    public function store(CreateUserByAdmin $request): Response
+    {
+        // Create user
+        $user = User::forceCreate([
+            'password'          => bcrypt($request->input('password')),
+            'role'              => $request->input('role'),
+            'email'             => $request->input('email'),
+            'email_verified_at' => now(),
+        ]);
+
+        UserSettings::unguard();
+
+        $user
+            ->settings()
+            ->create([
+                'storage_capacity' => $request->input('storage_capacity'),
+                'avatar'           => store_avatar($request, 'avatar'),
+                'name'             => $request->input('name'),
+            ]);
+
+        UserSettings::reguard();
+
+        return response(new UserResource($user), 201);
+    }
+}

src/Domain/Invoices/Controllers/UserInvoicesController.php

@@ -1,12 +1,9 @@
 <?php
-
-
 namespace Domain\Invoices\Controllers;
 
-
 use App\Http\Controllers\Controller;
-use Domain\Invoices\Resources\InvoiceCollection;
 use Illuminate\Support\Facades\Auth;
+use Domain\Invoices\Resources\InvoiceCollection;
 
 class UserInvoicesController extends Controller
 {

src/Domain/Localization/Controllers/LanguageController.php

@@ -5,10 +5,7 @@ use Illuminate\Http\Response;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
 use Domain\Localization\Models\Language;
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Localization\Resources\LanguageResource;
-use Domain\Localization\Requests\UpdateStringRequest;
 use Domain\Localization\Resources\LanguageCollection;
 use Domain\Localization\Requests\CreateLanguageRequest;
 use Domain\Localization\Requests\UpdateLanguageRequest;
@@ -23,7 +20,8 @@ class LanguageController extends Controller
         return response(
             new LanguageCollection(
                 Language::sortable(['created_at', 'DESC'])->get()
-            ), 200
+            ),
+            200
         );
     }
 
@@ -33,7 +31,8 @@ class LanguageController extends Controller
     public function show(Language $language): Response
     {
         return response(
-            new LanguageResource($language), 200
+            new LanguageResource($language),
+            200
         );
     }
 
@@ -60,7 +59,8 @@ class LanguageController extends Controller
      * Update language
      */
     public function update(
-        UpdateLanguageRequest $request, Language $language
+        UpdateLanguageRequest $request,
+        Language $language
     ): Response {
         // Abort in demo mode
         abort_if(is_demo(), 204, 'Done.');
@@ -97,7 +97,8 @@ class LanguageController extends Controller
         $language->delete();
 
         return response(
-            'Done', 204
+            'Done',
+            204
         );
     }
 }

src/Domain/Localization/Controllers/UpdateLanguageStringController.php

@@ -1,13 +1,10 @@
 <?php
-
-
 namespace Domain\Localization\Controllers;
 
-
+use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use Domain\Localization\Models\Language;
 use Domain\Localization\Requests\UpdateStringRequest;
-use Illuminate\Http\Response;
 
 class UpdateLanguageStringController extends Controller
 {
@@ -18,7 +15,6 @@ class UpdateLanguageStringController extends Controller
         UpdateStringRequest $request,
         Language $language,
     ): Response {
-
         // Abort in demo mode
         abort_if(is_demo(), 204, 'Done.');
 
@@ -32,7 +28,8 @@ class UpdateLanguageStringController extends Controller
         cache()->forget("language-translations-{$language->locale}");
 
         return response(
-            'Done', 204
+            'Done',
+            204
         );
     }
 }

src/Domain/Maintenance/Controllers/MaintenanceModeController.php

@@ -1,12 +1,9 @@
 <?php
-
-
 namespace Domain\Maintenance\Controllers;
 
-
-use App\Http\Controllers\Controller;
-use Artisan;
 use Gate;
+use Artisan;
+use App\Http\Controllers\Controller;
 
 class MaintenanceModeController extends Controller
 {

src/Domain/Maintenance/Controllers/UpgradeDatabaseController.php

@@ -1,12 +1,9 @@
 <?php
-
-
 namespace Domain\Maintenance\Controllers;
 
-
-use App\Http\Controllers\Controller;
-use Artisan;
 use Gate;
+use Artisan;
+use App\Http\Controllers\Controller;
 
 class UpgradeDatabaseController extends Controller
 {

src/Domain/Pages/Controllers/AdminPagesController.php

@@ -42,7 +42,8 @@ class AdminPagesController extends Controller
         );
 
         return response(
-            new PageResource($page), 204
+            new PageResource($page),
+            204
         );
     }
 }

src/Domain/Payments/Controllers/PaymentMethodsController.php

@@ -2,7 +2,6 @@
 namespace Domain\Payments\Controllers;
 
 use Auth;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Laravel\Cashier\PaymentMethod;
 use App\Http\Controllers\Controller;
@@ -17,7 +16,8 @@ class PaymentMethodsController extends Controller
 {
     public function __construct(
         private StripeService $stripe,
-    ) {}
+    ) {
+    }
 
     /**
      * Get user payment methods grouped by default and others

src/Domain/Settings/Controllers/AdminSettingsController.php

@@ -1,8 +1,8 @@
 <?php
 namespace Domain\Settings\Controllers;
 
-use Illuminate\Support\Collection;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
 

src/Domain/Settings/Controllers/FlushCacheController.php

@@ -1,12 +1,9 @@
 <?php
-
-
 namespace Domain\Settings\Controllers;
 
-
-use App\Http\Controllers\Controller;
 use Artisan;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
 
 class FlushCacheController extends Controller
 {

src/Domain/Settings/Controllers/SetEmailController.php

@@ -1,9 +1,6 @@
 <?php
-
-
 namespace Domain\Settings\Controllers;
 
-
 use Artisan;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

src/Domain/Settings/Controllers/SetStripeController.php

@@ -1,15 +1,12 @@
 <?php
-
-
 namespace Domain\Settings\Controllers;
 
-
 use Artisan;
-use Cartalyst\Stripe\Exception\UnauthorizedException;
 use Cartalyst\Stripe\Stripe;
-use Domain\Settings\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Domain\Settings\Models\Setting;
+use Cartalyst\Stripe\Exception\UnauthorizedException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class SetStripeController

src/Domain/Settings/Controllers/UpdateSettingValueController.php

@@ -1,13 +1,10 @@
 <?php
-
-
 namespace Domain\Settings\Controllers;
 
-
-use App\Http\Controllers\Controller;
-use Domain\Settings\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Domain\Settings\Models\Setting;
+use App\Http\Controllers\Controller;
 
 class UpdateSettingValueController extends Controller
 {

src/Domain/Subscriptions/Controllers/GetSetupIntentController.php

@@ -1,13 +1,10 @@
 <?php
-
-
 namespace Domain\Subscriptions\Controllers;
 
-
-use App\Http\Controllers\Controller;
 use Auth;
-use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
+use Domain\Subscriptions\Services\StripeService;
 
 /**
  * Generate setup intent
@@ -16,12 +13,14 @@ class GetSetupIntentController extends Controller
 {
     public function __construct(
         public StripeService $stripe,
-    ) {}
+    ) {
+    }
 
     public function __invoke(): Response
     {
         return response(
-            $this->stripe->getSetupIntent(Auth::user()), 201
+            $this->stripe->getSetupIntent(Auth::user()),
+            201
         );
     }
 }

src/Domain/Subscriptions/Controllers/SubscriptionCancelController.php

@@ -1,12 +1,9 @@
 <?php
-
-
 namespace Domain\Subscriptions\Controllers;
 
-
-use App\Http\Controllers\Controller;
 use Auth;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
 
 class SubscriptionCancelController extends Controller

src/Domain/Subscriptions/Controllers/SubscriptionDetailsController.php

@@ -1,12 +1,9 @@
 <?php
-
-
 namespace Domain\Subscriptions\Controllers;
 
-
+use Auth;
 use App\Http\Controllers\Controller;
 use App\Users\Resources\UserSubscription;
-use Auth;
 
 class SubscriptionDetailsController extends Controller
 {
@@ -25,7 +22,8 @@ class SubscriptionDetailsController extends Controller
         }
 
         return cache()->rememberForever(
-            $slug, fn() => new UserSubscription($user)
+            $slug,
+            fn () => new UserSubscription($user)
         );
     }
 }

src/Domain/Subscriptions/Controllers/SubscriptionResumeController.php

@@ -1,11 +1,9 @@
 <?php
-
-
 namespace Domain\Subscriptions\Controllers;
 
-use App\Http\Controllers\Controller;
 use Auth;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
 
 class SubscriptionResumeController extends Controller

src/Domain/Subscriptions/Controllers/SubscriptionUpgradeController.php

@@ -1,15 +1,12 @@
 <?php
-
-
 namespace Domain\Subscriptions\Controllers;
 
-
-use App\Http\Controllers\Controller;
 use Auth;
-use Domain\Subscriptions\Requests\StoreUpgradeAccountRequest;
-use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
+use Domain\Subscriptions\Services\StripeService;
+use Domain\Subscriptions\Requests\StoreUpgradeAccountRequest;
 
 /**
  * Upgrade account to subscription
@@ -18,7 +15,8 @@ class SubscriptionUpgradeController extends Controller
 {
     public function __construct(
         public StripeService $stripe,
-    ) {}
+    ) {
+    }
 
     public function __invoke(StoreUpgradeAccountRequest $request): Response
     {

src/Support/Services/HelperService.php

@@ -15,30 +15,6 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class HelperService
 {
-    /**
-     * Delete all user data including files, folders, avatar etc.
-     *
-     * @param $user
-     */
-    public function erase_user_data($user)
-    {
-        // Delete user avatar if exists
-        if ($user->settings->getRawOriginal('avatar')) {
-            Storage::delete($user->settings->getRawOriginal('avatar'));
-        }
-
-        // Delete all user files
-        Storage::deleteDirectory("files/$user->id");
-
-        // Delete all user records in database
-        collect(['folders', 'files', 'user_settings', 'shares', 'favourite_folder', 'zips'])
-            ->each(function ($table) use ($user) {
-                DB::table($table)
-                    ->whereUserId($user->id)
-                    ->delete();
-            });
-    }
-
     /**
      * Check access to requested directory
      *

tests/Domain/Admin/AdminTest.php

@@ -24,67 +24,6 @@ class AdminTest extends TestCase
         $this->setup = app()->make(SetupService::class);
     }
 
-    /**
-     * @test
-     */
-    public function it_get_dashboard_data()
-    {
-        $user = User::factory(User::class)
-            ->create(['role' => 'admin']);
-
-        File::factory(File::class)
-            ->count(2)
-            ->create(['filesize' => 1000000]);
-
-        Setting::forceCreate([
-            'name'  => 'license',
-            'value' => 'Regular',
-        ]);
-
-        DB::table('subscriptions')
-            ->insert([
-                'user_id'       => $user->id,
-                'name'          => 'main',
-                'stripe_id'     => 'sub_Hp4jgdIpPDDWXw',
-                'stripe_status' => 'active',
-            ]);
-
-        $this
-            ->actingAs($user)
-            ->getJson('/api/admin/dashboard')
-            ->assertStatus(200)
-            ->assertExactJson([
-                'license'             => 'Regular',
-                'app_version'         => config('vuefilemanager.version'),
-                'total_users'         => 1,
-                'total_used_space'    => '2.00MB',
-                'total_premium_users' => 1,
-            ]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_get_new_users_for_dashboard()
-    {
-        $users = User::factory(User::class)
-            ->count(5)
-            ->create(['role' => 'user']);
-
-        $admin = User::factory(User::class)
-            ->create(['role' => 'admin']);
-
-        Sanctum::actingAs($admin);
-
-        $users->each(function ($user) {
-            $this->getJson('/api/admin/dashboard/newbies')
-                ->assertStatus(200)
-                ->assertJsonFragment([
-                    'id' => $user->id,
-                ]);
-        });
-    }
-
     /**
      * @test
      */

tests/Domain/Admin/DashboardTest.php

@@ -0,0 +1,76 @@
+<?php
+
+
+namespace Tests\Domain\Admin;
+
+
+use App\Users\Models\User;
+use DB;
+use Domain\Files\Models\File;
+use Domain\Settings\Models\Setting;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class DashboardTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function it_get_dashboard_data()
+    {
+        $user = User::factory(User::class)
+            ->create(['role' => 'admin']);
+
+        File::factory(File::class)
+            ->count(2)
+            ->create(['filesize' => 1000000]);
+
+        Setting::forceCreate([
+            'name'  => 'license',
+            'value' => 'Regular',
+        ]);
+
+        DB::table('subscriptions')
+            ->insert([
+                'user_id'       => $user->id,
+                'name'          => 'main',
+                'stripe_id'     => 'sub_Hp4jgdIpPDDWXw',
+                'stripe_status' => 'active',
+            ]);
+
+        $this
+            ->actingAs($user)
+            ->getJson('/api/admin/dashboard')
+            ->assertStatus(200)
+            ->assertExactJson([
+                'license'             => 'Regular',
+                'app_version'         => config('vuefilemanager.version'),
+                'total_users'         => 1,
+                'total_used_space'    => '2.00MB',
+                'total_premium_users' => 1,
+            ]);
+    }
+
+    /**
+     * @test
+     */
+    public function it_get_new_users_for_dashboard()
+    {
+        $users = User::factory(User::class)
+            ->count(5)
+            ->create(['role' => 'user']);
+
+        $admin = User::factory(User::class)
+            ->create(['role' => 'admin']);
+
+        Sanctum::actingAs($admin);
+
+        $users->each(function ($user) {
+            $this->getJson('/api/admin/dashboard/newbies')
+                ->assertStatus(200)
+                ->assertJsonFragment([
+                    'id' => $user->id,
+                ]);
+        });
+    }
+}

tests/Domain/Languages/AdminLanguageTranslatorTest.php

@@ -1,11 +1,11 @@
 <?php
 namespace Tests\Domain\Languages;
 
+use Tests\TestCase;
 use App\Users\Models\User;
 use Domain\Settings\Models\Setting;
 use Domain\Localization\Models\Language;
 use Domain\SetupWizard\Services\SetupService;
-use Tests\TestCase;
 
 class AdminLanguageTranslatorTest extends TestCase
 {

tests/Domain/Pages/AdminPagesTest.php

@@ -1,13 +1,10 @@
 <?php
-
-
 namespace Tests\Domain\Pages;
 
-
-use App\Users\Models\User;
-use Domain\SetupWizard\Services\SetupService;
-use Laravel\Sanctum\Sanctum;
 use Tests\TestCase;
+use App\Users\Models\User;
+use Laravel\Sanctum\Sanctum;
+use Domain\SetupWizard\Services\SetupService;
 
 class AdminPagesTest extends TestCase
 {