#591 - profile, users and projects

app/Http/Controllers/ProfileController.php

@@ -6,13 +6,11 @@
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Password;
 use Inertia\Inertia;
 use Inertia\Response;
-use Spatie\RouteAttributes\Attributes\Delete;
 use Spatie\RouteAttributes\Attributes\Get;
 use Spatie\RouteAttributes\Attributes\Middleware;
 use Spatie\RouteAttributes\Attributes\Patch;
@@ -37,7 +35,6 @@ public function update(Request $request): RedirectResponse
     {
         $this->validate($request, [
             'name' => ['required', 'string', 'max:255'],
-
             'email' => [
                 'required',
                 'string',
@@ -66,25 +63,6 @@ public function password(Request $request): RedirectResponse
             'password' => Hash::make($validated['password']),
         ]);
 
-        return back();
-    }
-
-    #[Delete('/', name: 'profile.destroy')]
-    public function destroy(Request $request): RedirectResponse
-    {
-        $request->validate([
-            'password' => ['required', 'current_password'],
-        ]);
-
-        $user = $request->user();
-
-        Auth::logout();
-
-        $user->delete();
-
-        $request->session()->invalidate();
-        $request->session()->regenerateToken();
-
-        return redirect('/');
+        return to_route('profile');
     }
 }

app/Http/Controllers/ProjectController.php

@@ -5,6 +5,7 @@
 use App\Actions\Projects\AddUser;
 use App\Actions\Projects\CreateProject;
 use App\Actions\Projects\DeleteProject;
+use App\Actions\Projects\UpdateProject;
 use App\Http\Resources\ProjectResource;
 use App\Models\Project;
 use App\Models\User;
@@ -16,6 +17,7 @@
 use Spatie\RouteAttributes\Attributes\Delete;
 use Spatie\RouteAttributes\Attributes\Get;
 use Spatie\RouteAttributes\Attributes\Middleware;
+use Spatie\RouteAttributes\Attributes\Patch;
 use Spatie\RouteAttributes\Attributes\Post;
 use Spatie\RouteAttributes\Attributes\Prefix;
 
@@ -30,7 +32,7 @@ public function index(): Response
 
         return Inertia::render('projects/index', [
             'projects' => ProjectResource::collection(
-                Project::query()->simplePaginate(config('web.pagination_size'))
+                Project::query()->with('users')->simplePaginate(config('web.pagination_size'))
             ),
         ]);
     }
@@ -50,7 +52,18 @@ public function store(Request $request): RedirectResponse
             ->with('success', 'Project created successfully.');
     }
 
-    #[Post('switch/{project}', name: 'projects.switch')]
+    #[Patch('/{project}', name: 'projects.update')]
+    public function update(Request $request, Project $project): RedirectResponse
+    {
+        $this->authorize('update', $project);
+
+        app(UpdateProject::class)->update($project, $request->all());
+
+        return redirect()->route('projects')
+            ->with('success', 'Project updated successfully.');
+    }
+
+    #[Patch('switch/{project}', name: 'projects.switch')]
     public function switch(Project $project): RedirectResponse
     {
         $this->authorize('view', $project);
@@ -70,7 +83,7 @@ public function switch(Project $project): RedirectResponse
         return redirect()->route($previousRoute->getName());
     }
 
-    #[Post('/{project}/users', name: 'projects.users')]
+    #[Post('/{project}/users', name: 'projects.users.store')]
     public function storeUser(Request $request, Project $project): RedirectResponse
     {
         $this->authorize('update', $project);
@@ -81,20 +94,11 @@ public function storeUser(Request $request, Project $project): RedirectResponse
             ->with('success', 'User added to project successfully.');
     }
 
-    #[Delete('{project}/users', name: 'projects.users')]
-    public function destroyUser(Request $request, Project $project): RedirectResponse
+    #[Delete('{project}/users/{user}', name: 'projects.users.destroy')]
+    public function destroyUser(Project $project, User $user): RedirectResponse
     {
         $this->authorize('update', $project);
 
-        $this->validate($request, [
-            'user' => [
-                'required',
-                'exists:users,id',
-            ],
-        ]);
-
-        $user = User::query()->find($request->input('user'));
-
         $project->users()->detach($user);
 
         return redirect()->route('projects')

app/Http/Controllers/UserController.php

@@ -2,12 +2,22 @@
 
 namespace App\Http\Controllers;
 
+use App\Actions\User\CreateUser;
+use App\Actions\User\UpdateUser;
 use App\Http\Resources\UserResource;
+use App\Models\Project;
 use App\Models\User;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Validation\Rule;
+use Inertia\Inertia;
+use Inertia\Response;
+use Spatie\RouteAttributes\Attributes\Delete;
 use Spatie\RouteAttributes\Attributes\Get;
 use Spatie\RouteAttributes\Attributes\Middleware;
+use Spatie\RouteAttributes\Attributes\Patch;
+use Spatie\RouteAttributes\Attributes\Post;
 use Spatie\RouteAttributes\Attributes\Prefix;
 
 #[Prefix('users')]
@@ -15,7 +25,19 @@
 class UserController extends Controller
 {
     #[Get('/', name: 'users')]
-    public function index(Request $request): ResourceCollection
+    public function index(): Response
+    {
+        $this->authorize('viewAny', User::class);
+
+        return Inertia::render('users/index', [
+            'users' => UserResource::collection(
+                User::query()->with('projects')->simplePaginate(config('web.pagination_size'))
+            ),
+        ]);
+    }
+
+    #[Get('/json', name: 'users.json')]
+    public function json(Request $request): ResourceCollection
     {
         $this->authorize('viewAny', User::class);
 
@@ -33,4 +55,64 @@ public function index(Request $request): ResourceCollection
 
         return UserResource::collection($users);
     }
+
+    #[Post('/', name: 'users.store')]
+    public function store(Request $request): RedirectResponse
+    {
+        $this->authorize('create', User::class);
+
+        app(CreateUser::class)->create($request->all());
+
+        return to_route('users')->with('success', 'User created successfully.');
+    }
+
+    #[Patch('/{user}', name: 'users.update')]
+    public function update(Request $request, User $user): RedirectResponse
+    {
+        $this->authorize('update', $user);
+
+        app(UpdateUser::class)->update($user, $request->all());
+
+        return to_route('users')->with('success', 'User updated successfully.');
+    }
+
+    #[Post('/{user}/projects', name: 'users.projects.store')]
+    public function addToProject(Request $request, User $user): RedirectResponse
+    {
+        $this->authorize('update', $user);
+
+        $this->validate($request, [
+            'project' => [
+                'required',
+                Rule::exists('projects', 'id'),
+            ],
+        ]);
+
+        $project = Project::query()->findOrFail($request->input('project'));
+
+        $user->projects()->detach($project);
+        $user->projects()->attach($project);
+
+        return to_route('users')->with('success', 'Project was successfully added to user.');
+    }
+
+    #[Delete('/{user}/projects/{project}', name: 'users.projects.destroy')]
+    public function removeProject(User $user, Project $project): RedirectResponse
+    {
+        $this->authorize('update', $user);
+
+        $user->projects()->detach($project);
+
+        return to_route('users')->with('success', 'Project was successfully removed from user.');
+    }
+
+    #[Delete('/{user}', 'users.destroy')]
+    public function destroy(User $user): RedirectResponse
+    {
+        $this->authorize('delete', $user);
+
+        $user->delete();
+
+        return to_route('users')->with('success', 'User was successfully deleted.');
+    }
 }

app/Http/Resources/ProjectResource.php

@@ -17,11 +17,11 @@ public function toArray(Request $request): array
         return [
             'id' => $this->id,
             'name' => $this->name,
-            'users' => UserResource::collection($this->users),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
-            'created_at_by_timezone' => $this->created_at_by_timezone,
-            'updated_at_by_timezone' => $this->updated_at_by_timezone,
+            'users' => UserResource::collection(
+                $this->whenLoaded('users')
+            ),
         ];
     }
 }

app/Http/Resources/ServerLogResource.php

@@ -24,8 +24,6 @@ public function toArray(Request $request): array
             'is_remote' => $this->is_remote,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
-            'created_at_by_timezone' => $this->created_at_by_timezone,
-            'updated_at_by_timezone' => $this->updated_at_by_timezone,
         ];
     }
 }

app/Http/Resources/ServerProviderResource.php

@@ -22,8 +22,6 @@ public function toArray(Request $request): array
             'provider' => $this->provider,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
-            'created_at_by_timezone' => $this->created_at_by_timezone,
-            'updated_at_by_timezone' => $this->updated_at_by_timezone,
         ];
     }
 }

app/Http/Resources/ServerResource.php

@@ -41,8 +41,6 @@ public function toArray(Request $request): array
             'status_color' => $this->getStatusColor(),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
-            'created_at_by_timezone' => $this->created_at_by_timezone,
-            'updated_at_by_timezone' => $this->updated_at_by_timezone,
         ];
     }
 }

app/Http/Resources/UserResource.php

@@ -18,8 +18,10 @@ public function toArray(Request $request): array
             'id' => $this->id,
             'name' => $this->name,
             'email' => $this->email,
+            'role' => $this->role,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
+            'projects' => ProjectResource::collection($this->whenLoaded('projects')),
         ];
     }
 }