feat: implement thread comments with possibility to reply

app/Http/Controllers/ColumnController.php

@@ -2,37 +2,33 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Requests\ColumnStoreRequest;
+use App\Http\Requests\ColumnUpdateRequest;
 use App\Models\Column;
 use App\Services\ColumnService;
 use Illuminate\Http\Request;
 use Illuminate\Http\RedirectResponse;
 
 class ColumnController extends Controller
 {
-    public function __construct(private ColumnService $columnService) {}
-
-    public function store(Request $request): RedirectResponse
+    public function __construct(private ColumnService $columnService)
     {
-        $validated = $request->validate([
-            'name' => ['required', 'string', 'max:255'],
-        ]);
+    }
 
-        $this->columnService->createColumn($validated, $request->user());
+    public function store(ColumnStoreRequest $request): RedirectResponse
+    {
+        $this->columnService->createColumn($request->validated(), $request->user());
 
         return back();
     }
 
-    public function update(Request $request, Column $column): RedirectResponse
+    public function update(ColumnUpdateRequest $request, Column $column): RedirectResponse
     {
         if ($column->team_id !== $request->user()->team_id) {
             abort(403);
         }
 
-        $validated = $request->validate([
-            'name' => ['required', 'string', 'max:255'],
-        ]);
-
-        $this->columnService->updateColumn($column, $validated);
+        $this->columnService->updateColumn($column, $request->validated());
 
         return back();
     }

app/Http/Controllers/Settings/PasswordController.php

@@ -3,9 +3,8 @@
 namespace App\Http\Controllers\Settings;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Settings\PasswordUpdateRequest;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Validation\Rules\Password;
 use Inertia\Inertia;
 use Inertia\Response;
 
@@ -22,12 +21,9 @@ public function edit(): Response
     /**
      * Update the user's password.
      */
-    public function update(Request $request): RedirectResponse
+    public function update(PasswordUpdateRequest $request): RedirectResponse
     {
-        $validated = $request->validate([
-            'current_password' => ['required', 'current_password'],
-            'password' => ['required', Password::defaults(), 'confirmed'],
-        ]);
+        $validated = $request->validated();
 
         $request->user()->update([
             'password' => $validated['password'],

app/Http/Controllers/Settings/ProfileController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Settings;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Settings\ProfileDestroyRequest;
 use App\Http\Requests\Settings\ProfileUpdateRequest;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Http\RedirectResponse;
@@ -43,11 +44,9 @@ public function update(ProfileUpdateRequest $request): RedirectResponse
     /**
      * Delete the user's profile.
      */
-    public function destroy(Request $request): RedirectResponse
+    public function destroy(ProfileDestroyRequest $request): RedirectResponse
     {
-        $request->validate([
-            'password' => ['required', 'current_password'],
-        ]);
+        $request->validated();
 
         $user = $request->user();
 

app/Http/Controllers/TaskController.php

@@ -12,6 +12,7 @@
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\TaskCreateRequest;
+use App\Http\Requests\TaskCommentStoreRequest;
 use Illuminate\Http\RedirectResponse;
 use App\Http\Requests\TaskUpdateRequest;
 
@@ -29,7 +30,19 @@ public function index(Request $request): Response
             ->get();
 
         $columns->each(function ($column) {
-            $column->setRelation('tasks', $column->tasks()->with('creator:id,name', 'assignee:id,name', 'comments.user:id,name')->orderBy('order')->paginate(10));
+            $column->setRelation(
+                'tasks',
+                $column->tasks()
+                    ->with([
+                        'creator:id,name',
+                        'assignee:id,name',
+                        'comments' => fn($query) => $query
+                            ->whereNull('parent_id')
+                            ->with(['user:id,name', 'replies']),
+                    ])
+                    ->orderBy('order')
+                    ->paginate(10)
+            );
         });
 
         $teamMembers = User::query()
@@ -72,18 +85,17 @@ public function destroy(Request $request, Task $task): RedirectResponse
         return back();
     }
 
-    public function storeComment(Request $request, Task $task): RedirectResponse
+    public function storeComment(TaskCommentStoreRequest $request, Task $task): RedirectResponse
     {
         if ($task->team_id !== $request->user()->team_id) {
             abort(403, 'You are not authorized to comment on this task.');
         }
 
-        $validated = $request->validate([
-            'body' => ['required', 'string', 'max:2000'],
-        ]);
+        $validated = $request->validated();
 
         $task->comments()->create([
             'user_id' => $request->user()->id,
+            'parent_id' => $validated['parent_id'] ?? null,
             'body' => $validated['body'],
         ]);
 

app/Http/Controllers/TaskSequenceController.php

@@ -2,25 +2,24 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Requests\TaskSequenceUpdateRequest;
 use App\Models\Task;
 use App\Services\TaskService;
-use Illuminate\Http\Request;
 use Illuminate\Http\RedirectResponse;
 
 class TaskSequenceController extends Controller
 {
-    public function __construct(private TaskService $taskService) {}
+    public function __construct(private TaskService $taskService)
+    {
+    }
 
-    public function update(Request $request, Task $task): RedirectResponse
+    public function update(TaskSequenceUpdateRequest $request, Task $task): RedirectResponse
     {
         if ($task->team_id !== $request->user()->team_id) {
             abort(403);
         }
 
-        $validated = $request->validate([
-            'column_id' => ['required', 'exists:columns,id'],
-            'order' => ['required', 'integer', 'min:0'],
-        ]);
+        $validated = $request->validated();
 
         $this->taskService->updateSequence($task, $validated['column_id'], $validated['order']);
 

app/Http/Requests/ColumnStoreRequest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ColumnStoreRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => ['required', 'string', 'max:255'],
+        ];
+    }
+}

app/Http/Requests/ColumnUpdateRequest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ColumnUpdateRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => ['required', 'string', 'max:255'],
+        ];
+    }
+}

app/Http/Requests/Settings/PasswordUpdateRequest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Settings;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rules\Password;
+
+class PasswordUpdateRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'current_password' => ['required', 'current_password'],
+            'password' => ['required', Password::defaults(), 'confirmed'],
+        ];
+    }
+}

app/Http/Requests/Settings/ProfileDestroyRequest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Settings;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ProfileDestroyRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'password' => ['required', 'current_password'],
+        ];
+    }
+}

app/Http/Requests/TaskCommentStoreRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Task;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class TaskCommentStoreRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        $task = $this->route('task');
+        $taskId = $task instanceof Task ? $task->id : $task;
+
+        return [
+            'body' => ['required', 'string', 'max:2000'],
+            'parent_id' => [
+                'nullable',
+                'integer',
+                Rule::exists('task_comments', 'id')->where('task_id', $taskId),
+            ],
+        ];
+    }
+}

app/Http/Requests/TaskSequenceUpdateRequest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class TaskSequenceUpdateRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'column_id' => ['required', 'exists:columns,id'],
+            'order' => ['required', 'integer', 'min:0'],
+        ];
+    }
+}

app/Http/Resources/TaskResource.php

@@ -7,6 +7,28 @@
 
 class TaskResource extends JsonResource
 {
+    /**
+     * Serialize a comment and its nested replies.
+     *
+     * @return array<string, mixed>
+     */
+    private function serializeComment($comment): array
+    {
+        return [
+            'id' => $comment->id,
+            'body' => $comment->body,
+            'parent_id' => $comment->parent_id,
+            'created_at' => $comment->created_at?->toIso8601String(),
+            'user' => [
+                'id' => $comment->user->id,
+                'name' => $comment->user->name,
+            ],
+            'replies' => $comment->relationLoaded('replies')
+                ? $comment->replies->map(fn($reply) => $this->serializeComment($reply))->values()
+                : [],
+        ];
+    }
+
     /**
      * Transform the resource into an array.
      *
@@ -41,17 +63,12 @@ public function toArray(Request $request): array
                 'id' => $this->assignee->id,
                 'name' => $this->assignee->name,
             ]),
-            'comments' => $this->whenLoaded('comments', fn() => $this->comments->map(
-                fn($comment) => [
-                    'id' => $comment->id,
-                    'body' => $comment->body,
-                    'created_at' => $comment->created_at?->toIso8601String(),
-                    'user' => [
-                        'id' => $comment->user->id,
-                        'name' => $comment->user->name,
-                    ],
-                ]
-            )->values()),
+            'comments' => $this->whenLoaded(
+                'comments',
+                fn() => $this->comments
+                    ->map(fn($comment) => $this->serializeComment($comment))
+                    ->values()
+            ),
         ];
     }
 }