controller refactoring part 16

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)
-        );
-    }
 }