Implement ticket statuses

2026-04-14 03:09:12 +02:00
parent 2dc12c5d60
commit 8f4a8276ac
40 changed files with 1602 additions and 100 deletions
@@ -7,6 +7,7 @@ use App\Models\BoardColumn;
 use App\Models\Project;
 use App\Models\Ticket;
 use App\Models\TicketPriority;
+use App\Models\TicketStatus;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Inertia\Testing\AssertableInertia as Assert;
@@ -33,10 +34,14 @@ class ProjectBacklogControllerTest extends TestCase
        ]);

        $priority = $project->ticketPriorities()->firstOrFail();
+        $backlogStatus = $project->ticketStatuses()
+            ->whereNull('board_column_id')
+            ->firstOrFail();

        $ticket = Ticket::factory()->create([
            'project_id' => $project->id,
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $backlogStatus->id,
            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
            'ticket_key' => 'AUTH-1',
            'sequence_number' => 1,
@@ -50,7 +55,7 @@ class ProjectBacklogControllerTest extends TestCase
            ->assertOk()
            ->assertInertia(fn (Assert $page) => $page
                ->component('projects/Backlog')
-                ->where('boardColumns.0.name', 'Todo')
+                ->where('backlogTicketStatuses.0.name', 'Backlog')
                ->where('canEditTickets', false)
                ->where('project.id', $project->id)
                ->where('tickets.0.ticket_key', $ticket->ticket_key)
@@ -69,6 +74,9 @@ class ProjectBacklogControllerTest extends TestCase
        app(InitializeProjectTicketMetadata::class)->handle($project);

        $priority = $project->ticketPriorities()->firstOrFail();
+        $backlogStatus = $project->ticketStatuses()
+            ->whereNull('board_column_id')
+            ->firstOrFail();

        $this->syncProjectPermissions($project, $user, ['view']);

@@ -79,6 +87,7 @@ class ProjectBacklogControllerTest extends TestCase
                'acceptance_criteria' => 'Criteria',
                'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
                'ticket_priority_id' => $priority->id,
+                'ticket_status_id' => $backlogStatus->id,
            ])
            ->assertForbidden();
    }
@@ -100,6 +109,9 @@ class ProjectBacklogControllerTest extends TestCase
            'name' => 'High',
            'position' => 2,
        ]);
+        $backlogStatus = $project->ticketStatuses()
+            ->whereNull('board_column_id')
+            ->firstOrFail();

        $this->syncProjectPermissions($project, $user, ['create', 'view']);

@@ -111,6 +123,7 @@ class ProjectBacklogControllerTest extends TestCase
            'story_points' => 3,
            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $backlogStatus->id,
        ];

        $this->actingAs($user)
@@ -129,8 +142,8 @@ class ProjectBacklogControllerTest extends TestCase
            'title' => 'Same title',
            'assignee_user_id' => $assignee->id,
            'author_user_id' => $user->id,
-            'board_column_id' => null,
            'story_points' => 3,
+            'ticket_status_id' => $backlogStatus->id,
        ]);

        $this->assertDatabaseHas('tickets', [
@@ -139,8 +152,8 @@ class ProjectBacklogControllerTest extends TestCase
            'title' => 'Same title',
            'assignee_user_id' => $assignee->id,
            'author_user_id' => $user->id,
-            'board_column_id' => null,
            'story_points' => 3,
+            'ticket_status_id' => $backlogStatus->id,
        ]);

        $this->assertDatabaseCount('ticket_worklog_entries', 2);
@@ -149,4 +162,44 @@ class ProjectBacklogControllerTest extends TestCase
            'summary' => 'Ticket was created in Backlog.',
        ]);
    }
+
+    /**
+     * Ensure ticket creation only accepts backlog statuses.
+     */
+    public function test_creating_tickets_rejects_board_column_statuses(): void
+    {
+        $user = User::factory()->create();
+        $project = Project::factory()->create();
+
+        app(InitializeProjectTicketMetadata::class)->handle($project);
+
+        $boardColumn = BoardColumn::factory()->for($project)->create([
+            'name' => 'Todo',
+            'position' => 1,
+        ]);
+        $boardStatus = TicketStatus::factory()
+            ->for($project)
+            ->for($boardColumn)
+            ->create([
+                'name' => 'Todo',
+                'position' => 1,
+            ]);
+
+        $this->syncProjectPermissions($project, $user, ['create', 'view']);
+
+        $this->actingAs($user)
+            ->from(route('projects.backlog.index', $project))
+            ->post(route('projects.backlog.store', $project), [
+                'title' => 'New ticket',
+                'description' => 'Description',
+                'acceptance_criteria' => 'Criteria',
+                'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
+                'ticket_priority_id' => $project->ticketPriorities()->firstOrFail()->id,
+                'ticket_status_id' => $boardStatus->id,
+            ])
+            ->assertRedirect(route('projects.backlog.index', $project))
+            ->assertSessionHasErrors('ticket_status_id');
+
+        $this->assertDatabaseCount('tickets', 0);
+    }
 }
@@ -7,6 +7,7 @@ use App\Models\BoardColumn;
 use App\Models\Project;
 use App\Models\Ticket;
 use App\Models\TicketPriority;
+use App\Models\TicketStatus;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Inertia\Testing\AssertableInertia as Assert;
@@ -36,6 +37,9 @@ class ProjectBoardControllerTest extends TestCase
            'name' => 'Doing',
            'position' => 2,
        ]);
+        $this->createColumnStatus($todoColumn);
+        $doingStatus = $this->createColumnStatus($doingColumn);
+        $backlogStatus = $this->backlogStatus($project);

        $priority = TicketPriority::factory()->for($project)->create([
            'name' => 'High',
@@ -43,21 +47,21 @@ class ProjectBoardControllerTest extends TestCase
        ]);

        Ticket::factory()->create([
-            'board_column_id' => null,
            'project_id' => $project->id,
            'sequence_number' => 1,
            'ticket_key' => 'CORE-1',
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $backlogStatus->id,
            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
            'title' => 'Backlog ticket',
        ]);

        $boardTicket = Ticket::factory()->create([
-            'board_column_id' => $doingColumn->id,
            'project_id' => $project->id,
            'sequence_number' => 2,
            'ticket_key' => 'CORE-2',
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $doingStatus->id,
            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
            'title' => 'Board ticket',
        ]);
@@ -96,6 +100,8 @@ class ProjectBoardControllerTest extends TestCase
            'name' => 'Todo',
            'position' => 1,
        ]);
+        $todoStatus = $this->createColumnStatus($todoColumn);
+        $backlogStatus = $this->backlogStatus($project);

        $priority = TicketPriority::factory()->for($project)->create([
            'name' => 'High',
@@ -103,11 +109,11 @@ class ProjectBoardControllerTest extends TestCase
        ]);

        $ticket = Ticket::factory()->create([
-            'board_column_id' => null,
            'project_id' => $project->id,
            'sequence_number' => 1,
            'ticket_key' => 'CORE-1',
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $backlogStatus->id,
            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
            'title' => 'Backlog ticket',
        ]);
@@ -116,15 +122,15 @@ class ProjectBoardControllerTest extends TestCase

        $this->actingAs($user)
            ->patch(route('projects.tickets.status.update', [$project, $ticket]), [
-                'board_column_id' => $todoColumn->id,
                'redirect_to' => 'backlog',
+                'ticket_status_id' => $todoStatus->id,
            ])
            ->assertRedirect(route('projects.backlog.index', $project))
            ->assertSessionHas('status', 'CORE-1 moved to Todo.');

        $this->assertDatabaseHas('tickets', [
            'id' => $ticket->id,
-            'board_column_id' => $todoColumn->id,
+            'ticket_status_id' => $todoStatus->id,
        ]);

        $this->assertDatabaseHas('ticket_worklog_entries', [
@@ -155,6 +161,8 @@ class ProjectBoardControllerTest extends TestCase
            'name' => 'Done',
            'position' => 2,
        ]);
+        $todoStatus = $this->createColumnStatus($todoColumn);
+        $doneStatus = $this->createColumnStatus($doneColumn);

        $priority = TicketPriority::factory()->for($project)->create([
            'name' => 'High',
@@ -162,11 +170,11 @@ class ProjectBoardControllerTest extends TestCase
        ]);

        $ticket = Ticket::factory()->create([
-            'board_column_id' => $todoColumn->id,
            'project_id' => $project->id,
            'sequence_number' => 1,
            'ticket_key' => 'CORE-1',
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $todoStatus->id,
            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
            'title' => 'Board ticket',
        ]);
@@ -175,15 +183,15 @@ class ProjectBoardControllerTest extends TestCase

        $this->actingAs($user)
            ->patch(route('projects.tickets.status.update', [$project, $ticket]), [
-                'board_column_id' => $doneColumn->id,
                'redirect_to' => 'board',
+                'ticket_status_id' => $doneStatus->id,
            ])
            ->assertRedirect(route('projects.board.index', $project))
            ->assertSessionHas('status', 'CORE-1 moved to Done.');

        $this->assertDatabaseHas('tickets', [
            'id' => $ticket->id,
-            'board_column_id' => $doneColumn->id,
+            'ticket_status_id' => $doneStatus->id,
        ]);

        $this->assertDatabaseHas('ticket_worklog_entries', [
@@ -210,6 +218,8 @@ class ProjectBoardControllerTest extends TestCase
            'name' => 'Doing',
            'position' => 1,
        ]);
+        $doingStatus = $this->createColumnStatus($doingColumn);
+        $backlogStatus = $this->backlogStatus($project);

        $priority = TicketPriority::factory()->for($project)->create([
            'name' => 'High',
@@ -217,11 +227,11 @@ class ProjectBoardControllerTest extends TestCase
        ]);

        $ticket = Ticket::factory()->create([
-            'board_column_id' => $doingColumn->id,
            'project_id' => $project->id,
            'sequence_number' => 1,
            'ticket_key' => 'CORE-1',
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $doingStatus->id,
            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
            'title' => 'Board ticket',
        ]);
@@ -230,15 +240,15 @@ class ProjectBoardControllerTest extends TestCase

        $this->actingAs($user)
            ->patch(route('projects.tickets.status.update', [$project, $ticket]), [
-                'board_column_id' => null,
                'redirect_to' => 'board',
+                'ticket_status_id' => $backlogStatus->id,
            ])
            ->assertRedirect(route('projects.board.index', $project))
            ->assertSessionHas('status', 'CORE-1 moved to Backlog.');

        $this->assertDatabaseHas('tickets', [
            'id' => $ticket->id,
-            'board_column_id' => null,
+            'ticket_status_id' => $backlogStatus->id,
        ]);

        $this->actingAs($user)
@@ -266,6 +276,8 @@ class ProjectBoardControllerTest extends TestCase
            'name' => 'Foreign',
            'position' => 1,
        ]);
+        $otherProjectStatus = $this->createColumnStatus($otherProjectColumn);
+        $backlogStatus = $this->backlogStatus($project);

        $priority = TicketPriority::factory()->for($project)->create([
            'name' => 'High',
@@ -273,9 +285,9 @@ class ProjectBoardControllerTest extends TestCase
        ]);

        $ticket = Ticket::factory()->create([
-            'board_column_id' => null,
            'project_id' => $project->id,
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $backlogStatus->id,
            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
        ]);

@@ -284,17 +296,89 @@ class ProjectBoardControllerTest extends TestCase
        $this->actingAs($user)
            ->from(route('projects.backlog.index', $project))
            ->patch(route('projects.tickets.status.update', [$project, $ticket]), [
-                'board_column_id' => $otherProjectColumn->id,
                'redirect_to' => 'backlog',
+                'ticket_status_id' => $otherProjectStatus->id,
            ])
            ->assertRedirect(route('projects.backlog.index', $project))
-            ->assertSessionHasErrors('board_column_id');
+            ->assertSessionHasErrors('ticket_status_id');

        $this->assertDatabaseHas('tickets', [
            'id' => $ticket->id,
-            'board_column_id' => null,
+            'ticket_status_id' => $backlogStatus->id,
        ]);

        $this->assertDatabaseCount('ticket_worklog_entries', 0);
    }
+
+    /**
+     * Ensure the status transition relation controls valid ticket moves.
+     */
+    public function test_status_moves_without_an_allowed_transition_are_rejected(): void
+    {
+        $user = User::factory()->create();
+        $project = Project::factory()->create([
+            'key' => 'CORE',
+        ]);
+
+        app(InitializeProjectTicketMetadata::class)->handle($project);
+
+        $todoColumn = BoardColumn::factory()->for($project)->create([
+            'name' => 'Todo',
+            'position' => 1,
+        ]);
+        $todoStatus = $this->createColumnStatus($todoColumn);
+        $backlogStatus = $this->backlogStatus($project);
+        $backlogStatus->allowedTargetStatuses()->detach($todoStatus->id);
+
+        $priority = TicketPriority::factory()->for($project)->create([
+            'name' => 'High',
+            'position' => 2,
+        ]);
+
+        $ticket = Ticket::factory()->create([
+            'project_id' => $project->id,
+            'sequence_number' => 1,
+            'ticket_key' => 'CORE-1',
+            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $backlogStatus->id,
+            'ticket_type_id' => $project->ticketTypes()->firstOrFail()->id,
+            'title' => 'Backlog ticket',
+        ]);
+
+        $this->syncProjectPermissions($project, $user, ['edit', 'view']);
+
+        $this->actingAs($user)
+            ->from(route('projects.backlog.index', $project))
+            ->patch(route('projects.tickets.status.update', [$project, $ticket]), [
+                'redirect_to' => 'backlog',
+                'ticket_status_id' => $todoStatus->id,
+            ])
+            ->assertRedirect(route('projects.backlog.index', $project))
+            ->assertSessionHasErrors('ticket_status_id');
+
+        $this->assertDatabaseHas('tickets', [
+            'id' => $ticket->id,
+            'ticket_status_id' => $backlogStatus->id,
+        ]);
+
+        $this->assertDatabaseCount('ticket_worklog_entries', 0);
+    }
+
+    private function backlogStatus(Project $project): TicketStatus
+    {
+        return $project->ticketStatuses()
+            ->whereNull('board_column_id')
+            ->firstOrFail();
+    }
+
+    private function createColumnStatus(BoardColumn $boardColumn): TicketStatus
+    {
+        return TicketStatus::factory()
+            ->for($boardColumn->project)
+            ->for($boardColumn)
+            ->create([
+                'name' => $boardColumn->name,
+                'position' => 1,
+            ]);
+    }
 }
@@ -2,8 +2,11 @@

 namespace Tests\Feature\Projects;

+use App\Actions\ProjectTicketMetadata\InitializeProjectTicketMetadata;
 use App\Models\BoardColumn;
 use App\Models\Project;
+use App\Models\Ticket;
+use App\Models\TicketStatus;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Inertia\Testing\AssertableInertia as Assert;
@@ -22,6 +25,7 @@ class ProjectBoardSettingsControllerTest extends TestCase
        $project = Project::factory()->create([
            'key' => 'CORE',
        ]);
+        app(InitializeProjectTicketMetadata::class)->handle($project);
        BoardColumn::factory()->for($project)->create([
            'name' => 'Todo',
            'position' => 1,
@@ -35,6 +39,7 @@ class ProjectBoardSettingsControllerTest extends TestCase
            ->assertInertia(fn (Assert $page) => $page
                ->component('projects/settings/Board')
                ->where('project.id', $project->id)
+                ->where('backlogTicketStatuses.0.name', 'Backlog')
                ->where('boardColumns.0.name', 'Todo'),
            );
    }
@@ -76,6 +81,13 @@ class ProjectBoardSettingsControllerTest extends TestCase
            'name' => 'In Review',
            'position' => 1,
        ]);
+
+        $this->assertDatabaseHas('ticket_statuses', [
+            'project_id' => $project->id,
+            'name' => 'In Review',
+            'slug' => 'in-review',
+            'position' => 1,
+        ]);
    }

    /**
@@ -154,4 +166,103 @@ class ProjectBoardSettingsControllerTest extends TestCase
            'id' => $secondColumn->id,
        ]);
    }
+
+    /**
+     * Ensure authorized users can manage multiple statuses for backlog and columns.
+     */
+    public function test_users_with_edit_permission_can_manage_ticket_statuses(): void
+    {
+        $user = User::factory()->create();
+        $project = Project::factory()->create([
+            'key' => 'CORE',
+        ]);
+        $this->syncProjectPermissions($project, $user, ['edit']);
+
+        $boardColumn = BoardColumn::factory()->for($project)->create([
+            'name' => 'Todo',
+            'position' => 1,
+        ]);
+        $defaultStatus = TicketStatus::factory()
+            ->for($project)
+            ->for($boardColumn)
+            ->create([
+                'name' => 'Todo',
+                'position' => 1,
+            ]);
+
+        $this->actingAs($user)
+            ->post(route('projects.settings.board.statuses.store', $project), [
+                'board_column_id' => $boardColumn->id,
+                'name' => 'Ready for QA',
+            ])
+            ->assertRedirect(route('projects.settings.board', $project))
+            ->assertSessionHas('status', 'Ready for QA was added to Todo.');
+
+        $newStatus = TicketStatus::query()
+            ->where('project_id', $project->id)
+            ->where('name', 'Ready for QA')
+            ->firstOrFail();
+
+        $this->assertSame($boardColumn->id, $newStatus->board_column_id);
+        $this->assertSame('ready-for-qa', $newStatus->slug);
+        $this->assertTrue($defaultStatus->allowedTargetStatuses()->whereKey($newStatus->id)->exists());
+
+        $this->actingAs($user)
+            ->patch(route('projects.settings.board.statuses.update', [$project, $newStatus]), [
+                'name' => 'QA Ready',
+            ])
+            ->assertRedirect(route('projects.settings.board', $project))
+            ->assertSessionHas('status', 'QA Ready was updated.');
+
+        $newStatus->refresh();
+
+        $this->assertSame('QA Ready', $newStatus->name);
+        $this->assertSame('qa-ready', $newStatus->slug);
+
+        $ticket = Ticket::factory()->create([
+            'project_id' => $project->id,
+            'ticket_status_id' => $newStatus->id,
+        ]);
+
+        $this->actingAs($user)
+            ->delete(route('projects.settings.board.statuses.destroy', [$project, $newStatus]))
+            ->assertRedirect(route('projects.settings.board', $project))
+            ->assertSessionHas('status', 'QA Ready was removed from Todo.');
+
+        $this->assertDatabaseMissing('ticket_statuses', [
+            'id' => $newStatus->id,
+        ]);
+        $this->assertDatabaseHas('tickets', [
+            'id' => $ticket->id,
+            'ticket_status_id' => $defaultStatus->id,
+        ]);
+    }
+
+    /**
+     * Ensure the last status in a column or backlog cannot be deleted.
+     */
+    public function test_last_ticket_status_for_a_context_cannot_be_deleted(): void
+    {
+        $user = User::factory()->create();
+        $project = Project::factory()->create();
+
+        $this->syncProjectPermissions($project, $user, ['edit']);
+
+        $backlogStatus = TicketStatus::factory()
+            ->for($project)
+            ->create([
+                'name' => 'Backlog',
+                'position' => 1,
+            ]);
+
+        $this->actingAs($user)
+            ->from(route('projects.settings.board', $project))
+            ->delete(route('projects.settings.board.statuses.destroy', [$project, $backlogStatus]))
+            ->assertRedirect(route('projects.settings.board', $project))
+            ->assertSessionHasErrors('ticket_status_id');
+
+        $this->assertDatabaseHas('ticket_statuses', [
+            'id' => $backlogStatus->id,
+        ]);
+    }
 }
@@ -7,6 +7,7 @@ use App\Models\BoardColumn;
 use App\Models\Project;
 use App\Models\Team;
 use App\Models\Ticket;
+use App\Models\TicketStatus;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Inertia\Testing\AssertableInertia as Assert;
@@ -346,12 +347,19 @@ class ProjectControllerTest extends TestCase
            'name' => 'In Progress',
            'position' => 1,
        ]);
+        $ticketStatus = TicketStatus::factory()
+            ->for($project)
+            ->for($boardColumn)
+            ->create([
+                'name' => 'In Progress',
+                'position' => 1,
+            ]);
        $ticket = Ticket::factory()->create([
-            'board_column_id' => $boardColumn->id,
            'project_id' => $project->id,
            'sequence_number' => 1,
            'ticket_key' => 'CORE-1',
            'ticket_priority_id' => $priority->id,
+            'ticket_status_id' => $ticketStatus->id,
            'ticket_type_id' => $project->ticketTypes()
                ->where('is_parent', false)
                ->orderBy('position')