controller refactoring part 16

public/mix-manifest.json

@@ -81,8 +81,8 @@
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=10416cb784a62f3c8fd7",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=43888143d0a6afe67d7a",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=5979a154f760a992e617",
-    "/chunks/user.js": "/chunks/user.js?id=41076be9126702330159",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=0d0040fbb5361bb061d6",
+    "/chunks/user.js": "/chunks/user.js?id=6ba666410f40ecdc965d",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=355fa2701524f0feccf0",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=ecebc7e50b64744420c3",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=7ae038f6b4a4683c5bdb",
     "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=1395c30e08946026fbc4",
@@ -286,5 +286,7 @@
     "/chunks/upgrade-billing.3c553438a1090569af54.hot-update.js": "/chunks/upgrade-billing.3c553438a1090569af54.hot-update.js",
     "/chunks/settings-invoices.4ab4d27b8447516929d2.hot-update.js": "/chunks/settings-invoices.4ab4d27b8447516929d2.hot-update.js",
     "/chunks/profile.5902d31a95da744acd2b.hot-update.js": "/chunks/profile.5902d31a95da744acd2b.hot-update.js",
-    "/chunks/settings~chunks/settings-password.5902d31a95da744acd2b.hot-update.js": "/chunks/settings~chunks/settings-password.5902d31a95da744acd2b.hot-update.js"
+    "/chunks/settings~chunks/settings-password.5902d31a95da744acd2b.hot-update.js": "/chunks/settings~chunks/settings-password.5902d31a95da744acd2b.hot-update.js",
+    "/chunks/user-create.ca38aa5d23cce5399b5d.hot-update.js": "/chunks/user-create.ca38aa5d23cce5399b5d.hot-update.js",
+    "/chunks/user.8e87c89c5f6cc9b7d635.hot-update.js": "/chunks/user.8e87c89c5f6cc9b7d635.hot-update.js"
 }

resources/js/views/Admin/Users/User.vue

@@ -131,7 +131,7 @@
         },
         methods: {
             fetchUser() {
-                axios.get('/api/admin/users/' + this.$route.params.id + '/detail')
+                axios.get('/api/admin/users/' + this.$route.params.id)
                     .then(response => {
                         this.user = response.data
                         this.isLoading = false

resources/js/views/Admin/Users/UserCreate.vue

@@ -162,7 +162,7 @@
 
                 // Send request to get user token
                 axios
-                    .post('/api/admin/users/create', formData, {
+                    .post('/api/admin/users', formData, {
                         headers: {
                             'Content-Type': 'multipart/form-data',
                         }

routes/admin.php

@@ -1,25 +1,26 @@
 <?php
 
-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\Users\UserController;
 use Domain\Pages\Controllers\AdminPagesController;
 use Domain\Settings\Controllers\SetEmailController;
 use Domain\Settings\Controllers\SetStripeController;
 use Domain\Settings\Controllers\FlushCacheController;
+use Domain\Invoices\Controllers\AdminInvoiceController;
 use Domain\Localization\Controllers\LanguageController;
+use Domain\Plans\Controllers\PlanSubscribersController;
+use Domain\Admin\Controllers\Users\DeleteUserController;
 use Domain\Settings\Controllers\GetSettingsValueController;
+use Domain\Admin\Controllers\Dashboard\GetNewbiesController;
+use Domain\Admin\Controllers\Users\ChangeUserRoleController;
 use Domain\Settings\Controllers\UpdateSettingValueController;
+use Domain\Admin\Controllers\Users\ShowUserInvoicesController;
+use Domain\Admin\Controllers\Users\ResetUserPasswordController;
+use Domain\Admin\Controllers\Dashboard\GetWidgetsValuesController;
+use Domain\Admin\Controllers\Users\ShowUserSubscriptionController;
 use Domain\Localization\Controllers\UpdateLanguageStringController;
+use Domain\Admin\Controllers\Users\ShowUserStorageCapacityController;
+use Domain\Admin\Controllers\Users\ChangeUserStorageCapacityController;
 
 // Dashboard
 Route::group(['prefix' => 'dashboard'], function () {
@@ -38,26 +39,19 @@ Route::group(['prefix' => 'users'], function () {
     // Subscription
     Route::get('/{user}/subscription', ShowUserSubscriptionController::class);
     Route::get('/{user}/invoices', ShowUserInvoicesController::class);
-
-    // Resource
-    Route::apiResource('/', UserController::class);
 });
 
+Route::apiResource('/users', UserController::class);
+
 // Plans
-Route::group(['prefix' => 'plans'], function () {
-    Route::get('/{id}/subscribers', [PlansController::class, 'subscribers']);
-    Route::delete('/{id}', [PlansController::class, 'delete']);
-    Route::patch('/{id}', [PlansController::class, 'update']);
-    Route::get('/{id}', [PlansController::class, 'show']);
-    Route::post('/', [PlansController::class, 'store']);
-    Route::get('/', [PlansController::class, 'index']);
-});
+Route::get('/plans/{id}/subscribers', PlanSubscribersController::class);
+Route::apiResource('/', PlansController::class);
 
 // Pages
 Route::apiResource('/pages', AdminPagesController::class);
 
 // Invoices
-Route::get('/invoices', [InvoiceController::class, 'index']);
+Route::get('/invoices', [AdminInvoiceController::class, 'index']);
 
 // Settings
 Route::group(['prefix' => 'settings'], function () {

routes/user.php

@@ -1,11 +1,11 @@
 <?php
 
-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\Invoices\Controllers\UserProfileInvoiceController;
 use Domain\Subscriptions\Controllers\GetSetupIntentController;
 use App\Users\Controllers\Verification\ResendVerificationEmail;
 use App\Users\Controllers\Authentication\CheckAccountController;
@@ -40,7 +40,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
         Route::get('/setup-intent', GetSetupIntentController::class);
 
         Route::apiResource('/payment-cards', PaymentMethodsController::class);
-        Route::get('/invoices', UserInvoicesController::class);
+        Route::get('/invoices', UserProfileInvoiceController::class);
         Route::get('/', SubscriptionDetailsController::class);
 
         Route::post('/upgrade', SubscriptionUpgradeController::class);

routes/web.php

@@ -1,8 +1,8 @@
 <?php
 
-use Domain\Admin\Controllers\InvoiceController;
 use Domain\Homepage\Controllers\IndexController;
 use Domain\Sharing\Controllers\OGSiteController;
+use Domain\Admin\Controllers\AdminInvoiceController;
 use Domain\Sharing\Controllers\SharePublicIndexController;
 use Domain\Subscriptions\Controllers\StripeWebhookController;
 use Domain\SetupWizard\Controllers\CreateAdminAccountController;
@@ -13,7 +13,7 @@ Route::post('/admin-setup', CreateAdminAccountController::class);
 
 // Subscription Services
 Route::post('/stripe/webhook', [StripeWebhookController::class, 'handleWebhook']);
-Route::get('/invoice/{customer}/{token}', [InvoiceController::class, 'show'])->middleware(['auth:sanctum']);
+Route::get('/invoice/{customer}/{token}', [AdminInvoiceController::class, 'show'])->middleware(['auth:sanctum']);
 
 // Translations
 Route::get('/translations/{lang}', CurrentLocalizationController::class);

src/Domain/Admin/Actions/DeleteUserDataAction.php

@@ -1,11 +1,8 @@
 <?php
-
-
 namespace Domain\Admin\Actions;
 
-
-use App\Users\Models\User;
 use DB;
+use App\Users\Models\User;
 use Illuminate\Support\Facades\Storage;
 
 class DeleteUserDataAction
@@ -31,4 +28,4 @@ class DeleteUserDataAction
                     ->delete();
             });
     }
-}
+}

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

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

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

@@ -1,13 +1,10 @@
 <?php
-
-
 namespace Domain\Admin\Controllers\Dashboard;
 
-
-use App\Http\Controllers\Controller;
-use App\Users\Models\User;
 use ByteUnits\Metric;
+use App\Users\Models\User;
 use Laravel\Cashier\Subscription;
+use App\Http\Controllers\Controller;
 
 class GetWidgetsValuesController extends Controller
 {
@@ -30,4 +27,4 @@ class GetWidgetsValuesController extends Controller
             'total_premium_users' => $premium_users,
         ];
     }
-}
+}

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

@@ -1,8 +1,8 @@
 <?php
 namespace Domain\Admin\Controllers\Users;
 
-use App\Http\Controllers\Controller;
 use App\Users\Models\User;
+use App\Http\Controllers\Controller;
 use App\Users\Resources\UserResource;
 use Domain\Admin\Requests\ChangeRoleRequest;
 
@@ -17,9 +17,8 @@ class ChangeUserRoleController extends Controller
         }
 
         // Update user role
-        $user->update([
-            'role' => $request->input('attributes.role'),
-        ]);
+        $user->role = $request->input('attributes.role');
+        $user->update();
 
         return new UserResource($user);
     }

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

@@ -1,8 +1,8 @@
 <?php
 namespace Domain\Admin\Controllers\Users;
 
-use App\Http\Controllers\Controller;
 use App\Users\Models\User;
+use App\Http\Controllers\Controller;
 use App\Users\Resources\UserStorageResource;
 use Domain\Admin\Requests\ChangeStorageCapacityRequest;
 

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

@@ -1,12 +1,12 @@
 <?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 App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Domain\Admin\Requests\DeleteUserRequest;
+use Domain\Admin\Actions\DeleteUserDataAction;
 
 class DeleteUserController extends Controller
 {
@@ -18,7 +18,6 @@ class DeleteUserController extends Controller
         User $user,
         DeleteUserDataAction $deleteUserData,
     ): Response {
-
         if (is_demo()) {
             return response('Done!', 204);
         }

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

@@ -1,11 +1,10 @@
 <?php
 namespace Domain\Admin\Controllers\Users;
 
-use App\Http\Controllers\Controller;
 use App\Users\Models\User;
 use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Password;
-use Illuminate\Contracts\Routing\ResponseFactory;
 
 class ResetUserPasswordController extends Controller
 {

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

@@ -1,9 +1,8 @@
 <?php
-
 namespace Domain\Admin\Controllers\Users;
 
-use App\Http\Controllers\Controller;
 use App\Users\Models\User;
+use App\Http\Controllers\Controller;
 use Domain\Invoices\Resources\InvoiceCollection;
 use Domain\Subscriptions\Services\StripeService;
 
@@ -11,7 +10,8 @@ class ShowUserInvoicesController extends Controller
 {
     public function __construct(
         private StripeService $stripe
-    ) {}
+    ) {
+    }
 
     /**
      * Get user storage details

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

@@ -1,8 +1,8 @@
 <?php
 namespace Domain\Admin\Controllers\Users;
 
-use App\Http\Controllers\Controller;
 use App\Users\Models\User;
+use App\Http\Controllers\Controller;
 use App\Users\Resources\UserStorageResource;
 
 class ShowUserStorageCapacityController extends Controller

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

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

src/Domain/Invoices/Controllers/AdminInvoiceController.php

@@ -1,12 +1,12 @@
 <?php
-namespace Domain\Admin\Controllers;
+namespace Domain\Invoices\Controllers;
 
+use Illuminate\View\View;
 use App\Http\Controllers\Controller;
-use Domain\Invoices\Resources\InvoiceResource;
 use Domain\Subscriptions\Services\StripeService;
 use Domain\Admin\Resources\InvoiceAdminCollection;
 
-class InvoiceController extends Controller
+class AdminInvoiceController extends Controller
 {
     public function __construct(
         private StripeService $stripe
@@ -15,10 +15,8 @@ class InvoiceController extends Controller
 
     /**
      * Get all invoices
-     *
-     * @return InvoiceAdminCollection
      */
-    public function index()
+    public function index(): InvoiceAdminCollection
     {
         return new InvoiceAdminCollection(
             $this->stripe->getInvoices()['data']
@@ -27,12 +25,8 @@ class InvoiceController extends Controller
 
     /**
      * Get single invoice by invoice $token
-     *
-     * @param $customer
-     * @param $token
-     * @return InvoiceResource|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
      */
-    public function show($customer, $token)
+    public function show(string $customer, string $token): View
     {
         return view('vuefilemanager.invoice')
             ->with('settings', get_settings_in_json())

src/Domain/Invoices/Controllers/UserProfileInvoiceController.php

@@ -5,7 +5,7 @@ use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Domain\Invoices\Resources\InvoiceCollection;
 
-class UserInvoicesController extends Controller
+class UserProfileInvoiceController extends Controller
 {
     /**
      * Get user invoices

src/Domain/Plans/Controllers/PlanSubscribersController.php

@@ -0,0 +1,24 @@
+<?php
+namespace Domain\Plans\Controllers;
+
+use App\Users\Models\User;
+use Laravel\Cashier\Subscription;
+use App\Http\Controllers\Controller;
+use App\Users\Resources\UsersCollection;
+
+class PlanSubscribersController extends Controller
+{
+    /**
+     * Get plan subscriptions
+     */
+    public function __invoke(string $id): UsersCollection
+    {
+        $subscribers = Subscription::whereStripePlan($id)
+            ->pluck('user_id');
+
+        $users = User::sortable()
+            ->findMany($subscribers);
+
+        return new UsersCollection($users);
+    }
+}

src/Domain/Plans/Controllers/PlansController.php

@@ -1,18 +1,12 @@
 <?php
 namespace Domain\Plans\Controllers;
 
-use App\Users\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Laravel\Cashier\Subscription;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Cache;
-use App\Users\Resources\UsersCollection;
 use Domain\Plans\Resources\PlanResource;
 use Domain\Plans\Resources\PlanCollection;
 use Domain\Subscriptions\Services\StripeService;
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\Routing\ResponseFactory;
 
 class PlansController extends Controller
 {
@@ -23,60 +17,43 @@ class PlansController extends Controller
 
     /**
      * Get all plans
-     *
-     * @return PlanCollection|Application|ResponseFactory|Response
      */
-    public function index()
+    public function index(): Response
     {
         // Store or Get plans to cache
-        if (Cache::has('plans')) {
-            $plans = Cache::get('plans');
-        } else {
-            $plans = Cache::rememberForever('plans', function () {
+        $plans = cache()
+            ->rememberForever('plans', function () {
                 return $this->stripe->getPlans();
             });
-        }
 
         return response(new PlanCollection($plans), 200);
     }
 
     /**
      * Get plan record
-     *
-     * @param $id
-     * @return PlanResource|Application|ResponseFactory|Response
      */
-    public function show($id)
+    public function show(string $id): Response
     {
         // Store or Get plan to cache
-        if (Cache::has('plan-' . $id)) {
-            $plan = Cache::get('plan-' . $id);
-        } else {
-            $plan = Cache::rememberForever('plan-' . $id, function () use ($id) {
+        $plan = cache()
+            ->rememberForever("plan-$id", function () use ($id) {
                 return $this->stripe->getPlan($id);
             });
-        }
 
         return response(new PlanResource($plan), 200);
     }
 
     /**
      * Create new plan
-     *
-     * @param Request $request
-     * @return PlanResource|Application|ResponseFactory|Response
+     * TODO: store request
      */
-    public function store(Request $request)
+    public function store(Request $request): Response | PlanResource
     {
-        // TODO: inline request
         if (is_demo()) {
-            if (Cache::has('plan-starter-pack')) {
-                $plan = Cache::get('plan-starter-pack');
-            } else {
-                $plan = Cache::rememberForever('plan-starter-pack', function () {
+            $plan = cache()
+                ->rememberForever('plan-starter-pack', function () {
                     return $this->stripe->getPlan('starter-pack');
                 });
-            }
 
             return new PlanResource($plan);
         }
@@ -93,12 +70,8 @@ class PlansController extends Controller
 
     /**
      * Update plan attribute
-     *
-     * @param Request $request
-     * @param $id
-     * @return ResponseFactory|Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, string $id): Response
     {
         // Abort in demo mode
         abort_if(is_demo(), 204, 'Done.');
@@ -107,18 +80,15 @@ class PlansController extends Controller
         $this->stripe->updatePlan($request, $id);
 
         // Clear cached plans
-        cache_forget_many(['plans', 'pricing', 'plan-' . $id]);
+        cache_forget_many(['plans', 'pricing', "plan-$id"]);
 
         return response('Saved!', 201);
     }
 
     /**
      * Delete plan
-     *
-     * @param $id
-     * @return ResponseFactory|Response
      */
-    public function delete($id)
+    public function delete($id): Response
     {
         // Abort in demo mode
         abort_if(is_demo(), 204, 'Done.');
@@ -131,21 +101,4 @@ class PlansController extends Controller
 
         return response('Done!', 204);
     }
-
-    /**
-     * Get subscriptions
-     *
-     * @param $id
-     * @return mixed
-     */
-    public function subscribers($id)
-    {
-        $subscribers = Subscription::whereStripePlan($id)
-            ->pluck('user_id');
-
-        return new UsersCollection(
-            User::sortable()
-                ->findMany($subscribers)
-        );
-    }
 }

src/Support/Services/HelperService.php

@@ -1,7 +1,6 @@
 <?php
 namespace Support\Services;
 
-use DB;
 use Illuminate\Support\Arr;
 use Aws\S3\MultipartUploader;
 use Domain\Files\Models\File;

src/Support/helpers.php

@@ -1,4 +1,4 @@
-<?php
+`<?php
 
 use Carbon\Carbon;
 use ByteUnits\Metric;

tests/Domain/Admin/AdminTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace Tests\Domain\Admin;
 
-use DB;
 use Storage;
 use Notification;
 use Tests\TestCase;
@@ -12,7 +11,6 @@ use Domain\Zipping\Models\Zip;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use Illuminate\Http\UploadedFile;
-use Domain\Settings\Models\Setting;
 use App\Users\Notifications\ResetPassword;
 use Domain\SetupWizard\Services\SetupService;
 
@@ -61,7 +59,7 @@ class AdminTest extends TestCase
         // TODO: pridat exactjson po refaktorovani userresource
         $this
             ->actingAs($admin)
-            ->getJson("/api/admin/users/$user->id/detail")
+            ->getJson("/api/admin/users/$user->id")
             ->assertStatus(200)
             ->assertJsonFragment([
                 'id' => $user->id,
@@ -225,7 +223,7 @@ class AdminTest extends TestCase
 
         $this
             ->actingAs($admin)
-            ->postJson('/api/admin/users/create', [
+            ->postJson('/api/admin/users', [
                 'name'                  => 'John Doe',
                 'role'                  => 'user',
                 'email'                 => 'john@doe.com',

tests/Domain/Admin/DashboardTest.php

@@ -1,15 +1,12 @@
 <?php
-
-
 namespace Tests\Domain\Admin;
 
-
-use App\Users\Models\User;
 use DB;
+use Tests\TestCase;
+use App\Users\Models\User;
+use Laravel\Sanctum\Sanctum;
 use Domain\Files\Models\File;
 use Domain\Settings\Models\Setting;
-use Laravel\Sanctum\Sanctum;
-use Tests\TestCase;
 
 class DashboardTest extends TestCase
 {
@@ -73,4 +70,4 @@ class DashboardTest extends TestCase
                 ]);
         });
     }
-}
+}