Merge pull request #1 from mateocarciu/refacto/tasks/services

mateocarciu · web-flow · commit 0f86ecd1ea92 · 2026-03-22T18:57:38.000+01:00
feat: refactor task and column management by using services and resou…
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,6 +3,7 @@ name: Deploy to Debian
 on:
   push:
     branches: [ main ]
+  workflow_dispatch:
 
 jobs:
   deploy:
@@ -21,6 +22,9 @@ jobs:
             
             # Reconstruction des containers avec le nouveau Dockerfile (PHP 8.4 + Node)
             docker compose up -d --build
+
+            # Eviter l'erreur dubious ownership de Git dans le conteneur
+            docker exec laravel-app git config --global --add safe.directory /var/www
             
             # 2. Installer les dépendances PHP
             docker exec laravel-app composer install --ignore-platform-reqs
@@ -34,5 +38,5 @@ jobs:
             docker exec laravel-app php artisan migrate --force
             
             # 5. Nettoyage des droits et des images
-            docker exec laravel-app chown -R www-data:www-data storage bootstrap/cache database
+            docker exec laravel-app sh -lc "mkdir -p storage bootstrap/cache database && touch database/database.sqlite && chown -R 1000:33 storage bootstrap/cache && chown 1000:33 database/database.sqlite"
             docker image prune -f
diff --git a/app/Http/Controllers/ColumnController.php b/app/Http/Controllers/ColumnController.php
@@ -3,24 +3,21 @@
 namespace App\Http\Controllers;
 
 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
     {
         $validated = $request->validate([
             'name' => ['required', 'string', 'max:255'],
         ]);
 
-        $order = Column::where('team_id', $request->user()->team_id)->max('order') + 1 ?? 0;
-
-        Column::create([
-            'name' => $validated['name'],
-            'team_id' => $request->user()->team_id,
-            'order' => $order,
-        ]);
+        $this->columnService->createColumn($validated, $request->user());
 
         return back();
     }
@@ -35,7 +32,7 @@ public function update(Request $request, Column $column): RedirectResponse
             'name' => ['required', 'string', 'max:255'],
         ]);
 
-        $column->update($validated);
+        $this->columnService->updateColumn($column, $validated);
 
         return back();
     }
@@ -46,7 +43,7 @@ public function destroy(Request $request, Column $column): RedirectResponse
             abort(403);
         }
 
-        $column->delete();
+        $this->columnService->deleteColumn($column);
 
         return back();
     }
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
@@ -4,50 +4,40 @@
 
 use App\Models\Task;
 use App\Models\Column;
+use App\Services\TaskService;
+use App\Http\Resources\ColumnResource;
 use Inertia\Inertia;
 use Inertia\Response;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\TaskCreateRequest;
 use Illuminate\Http\RedirectResponse;
 use App\Http\Requests\TaskUpdateRequest;
-use App\Jobs\IncrementTeamCompletedTasks;
 
 class TaskController extends Controller
 {
+    public function __construct(private TaskService $taskService) {}
+
     public function index(Request $request): Response
     {
+        $columns = Column::query()
+            ->with([
+                'tasks' => function ($query) {
+                    $query->with('creator:id,name')->orderBy('order');
+                }
+            ])
+            ->where('team_id', $request->user()->team_id)
+            ->orderBy('order')
+            ->get();
+
         return Inertia::render('Tasks', [
-            'columns' => Column::query()
-                ->with([
-                    'tasks' => function ($query) {
-                        $query->with('creator:id,name')->orderBy('order');
-                    }
-                ])
-                ->where('team_id', $request->user()->team_id)
-                ->orderBy('order')
-                ->get(),
+            'columns' => ColumnResource::collection($columns),
         ]);
     }
 
     public function store(TaskCreateRequest $request): RedirectResponse
     {
-        $columnId = $request->validated('column_id') ?? null;
-
-        if (!$columnId) {
-            $columnId = Column::where('team_id', $request->user()->team_id)->orderBy('order')->value('id');
-        }
-
-        $order = Task::where('column_id', $columnId)->max('order');
-        $order = $order !== null ? $order + 1 : 0;
-
-        Task::query()->create([
-            ...$request->safe()->except('column_id'),
-            'team_id' => $request->user()->team_id,
-            'created_by' => $request->user()->id,
-            'column_id' => $columnId,
-            'order' => $order,
-        ]);
+        $this->taskService->createTask($request->safe()->all(), $request->user());
 
         return to_route('tasks.index');
     }
@@ -58,11 +48,7 @@ public function update(TaskUpdateRequest $request, Task $task): RedirectResponse
             abort(403, 'You are not authorized to update this task.');
         }
 
-        $task->update($request->validated());
-
-        if ($task->completed) {
-            IncrementTeamCompletedTasks::dispatch($task->team_id);
-        }
+        $this->taskService->updateTask($task, $request->validated());
 
         return back();
     }
@@ -73,7 +59,7 @@ public function destroy(Request $request, Task $task): RedirectResponse
             abort(403, 'You are not authorized to delete this task.');
         }
 
-        $task->delete();
+        $this->taskService->deleteTask($task);
 
         return back();
     }
diff --git a/app/Http/Controllers/TaskSequenceController.php b/app/Http/Controllers/TaskSequenceController.php
@@ -3,12 +3,14 @@
 namespace App\Http\Controllers;
 
 use App\Models\Task;
+use App\Services\TaskService;
 use Illuminate\Http\Request;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Support\Facades\DB;
 
 class TaskSequenceController extends Controller
 {
+    public function __construct(private TaskService $taskService) {}
+
     public function update(Request $request, Task $task): RedirectResponse
     {
         if ($task->team_id !== $request->user()->team_id) {
@@ -20,42 +22,7 @@ public function update(Request $request, Task $task): RedirectResponse
             'order' => ['required', 'integer', 'min:0'],
         ]);
 
-        $newColumnId = $validated['column_id'];
-        $newOrder = $validated['order'];
-        
-        $oldColumnId = $task->column_id;
-        $oldOrder = $task->order;
-
-        DB::transaction(function () use ($task, $newColumnId, $newOrder, $oldColumnId, $oldOrder) {
-            if ($oldColumnId == $newColumnId) {
-                // Moving within the same column
-                if ($oldOrder < $newOrder) {
-                    Task::where('column_id', $newColumnId)
-                        ->whereBetween('order', [$oldOrder + 1, $newOrder])
-                        ->decrement('order');
-                } elseif ($oldOrder > $newOrder) {
-                    Task::where('column_id', $newColumnId)
-                        ->whereBetween('order', [$newOrder, $oldOrder - 1])
-                        ->increment('order');
-                }
-            } else {
-                // Moving to a different column
-                // Shift tasks in old column down
-                Task::where('column_id', $oldColumnId)
-                    ->where('order', '>', $oldOrder)
-                    ->decrement('order');
-
-                // Shift tasks in new column up to make room
-                Task::where('column_id', $newColumnId)
-                    ->where('order', '>=', $newOrder)
-                    ->increment('order');
-            }
-
-            $task->update([
-                'column_id' => $newColumnId,
-                'order' => $newOrder,
-            ]);
-        });
+        $this->taskService->updateSequence($task, $validated['column_id'], $validated['order']);
 
         return back();
     }
diff --git a/app/Http/Resources/ColumnResource.php b/app/Http/Resources/ColumnResource.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ColumnResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'team_id' => $this->team_id,
+            'name' => $this->name,
+            'order' => $this->order,
+            'tasks' => TaskResource::collection($this->whenLoaded('tasks')),
+        ];
+    }
+}
diff --git a/app/Http/Resources/TaskResource.php b/app/Http/Resources/TaskResource.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class TaskResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'team_id' => $this->team_id,
+            'column_id' => $this->column_id,
+            'order' => $this->order,
+            'title' => $this->title,
+            'completed' => (bool)$this->completed,
+            'due_date' => $this->due_date,
+            'created_by' => $this->created_by,
+            'creator' => $this->whenLoaded('creator', fn () => [
+                'id' => $this->creator->id,
+                'name' => $this->creator->name,
+            ]),
+        ];
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Http\Resources\Json\JsonResource;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -19,6 +20,6 @@ public function register(): void
      */
     public function boot(): void
     {
-        //
+        JsonResource::withoutWrapping();
     }
 }
diff --git a/app/Services/ColumnService.php b/app/Services/ColumnService.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\Column;
+use App\Models\User;
+
+class ColumnService
+{
+    /**
+     * Create a new column.
+     */
+    public function createColumn(array $data, User $user): Column
+    {
+        $order = Column::where('team_id', $user->team_id)->max('order');
+        $order = $order !== null ? $order + 1 : 0;
+
+        return Column::create([
+            'name' => $data['name'],
+            'team_id' => $user->team_id,
+            'order' => $order,
+        ]);
+    }
+
+    /**
+     * Update an existing column.
+     */
+    public function updateColumn(Column $column, array $data): bool
+    {
+        return $column->update($data);
+    }
+
+    /**
+     * Delete a column.
+     */
+    public function deleteColumn(Column $column): ?bool
+    {
+        return $column->delete();
+    }
+}
diff --git a/app/Services/TaskService.php b/app/Services/TaskService.php

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace App\Providers;`
`4`	`4`
`5`	`5`	`use Illuminate\Support\ServiceProvider;`
	`6`	`+use Illuminate\Http\Resources\Json\JsonResource;`
`6`	`7`
`7`	`8`	`class AppServiceProvider extends ServiceProvider`
`8`	`9`	`{`
`@@ -19,6 +20,6 @@ public function register(): void`
`19`	`20`	`*/`
`20`	`21`	`public function boot(): void`
`21`	`22`	`{`
`22`		`- //`
	`23`	`+ JsonResource::withoutWrapping();`
`23`	`24`	`}`
`24`	`25`	`}`