fixed missing features

2026-04-15 09:56:53 +02:00
parent de461ad73a
commit cec0e397b6
44 changed files with 1102 additions and 561 deletions
@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Actions\Permissions\PermissionService;
-use App\Actions\Tickets\CreateProjectTicket;
-use App\Enums\Permission;
-use App\Http\Requests\StoreProjectTicketRequest;
-use App\Models\Project;
-use App\Models\Ticket;
-use App\Models\User;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Inertia\Inertia;
-use Inertia\Response;
-
-class ProjectBacklogController extends Controller
-{
-    public function __construct(
-        private readonly CreateProjectTicket $createProjectTicket,
-        private readonly PermissionService $permissionService,
-    ) {}
-
-    public function index(Request $request, Project $project): Response
-    {
-        $user = $request->user();
-
-        abort_unless(
-            $this->permissionService->allows($user, Permission::ProjectRead, $project),
-            403,
-        );
-
-        return Inertia::render('projects/Backlog', [
-            'backlogTicketStatuses' => $project->ticketStatuses()
-                ->whereNull('board_column_id')
-                ->get(),
-            'canEditTickets' => $this->permissionService->allows($user, Permission::ProjectWrite, $project),
-            'canCreateTickets' => $this->permissionService->allows($user, Permission::ProjectWrite, $project),
-            'project' => $project,
-            'status' => session('status'),
-            'ticketStatusOptions' => $project->ticketStatuses()
-                ->with('boardColumn')
-                ->get(),
-            'ticketPriorities' => $project->ticketPriorities()->get(),
-            'ticketTypes' => $project->ticketTypes()->get(),
-            'tickets' => Ticket::query()
-                ->with([
-                    'ticketPriority',
-                    'ticketStatus.allowedTargetStatuses.boardColumn',
-                    'ticketStatus.boardColumn',
-                    'ticketType',
-                ])
-                ->where('project_id', $project->id)
-                ->whereHas('ticketStatus', fn ($query) => $query->whereNull('board_column_id'))
-                ->orderByDesc('sequence_number')
-                ->get(),
-            'users' => User::query()
-                ->orderBy('name')
-                ->get(),
-        ]);
-    }
-
-    public function store(StoreProjectTicketRequest $request, Project $project): RedirectResponse
-    {
-        $user = $request->user();
-        $validated = $request->validated();
-
-        abort_unless(
-            $this->permissionService->allows($user, Permission::ProjectWrite, $project),
-            403,
-        );
-
-        $ticket = $this->createProjectTicket->handle($project, $validated, $user);
-
-        return to_route('projects.backlog.index', $project)
-            ->with('status', "{$ticket->ticket_key} was added to the backlog.");
-    }
-}
@@ -3,8 +3,10 @@
 namespace App\Http\Controllers;

 use App\Actions\Permissions\PermissionService;
+use App\Actions\Projects\BuildProjectBoardPageProps;
 use App\Actions\Tickets\CreateTicketWorklogEntry;
 use App\Enums\Permission;
+use App\Enums\TicketWorklogEntryType;
 use App\Http\Requests\MoveProjectTicketRequest;
 use App\Models\Project;
 use App\Models\Ticket;
@@ -18,6 +20,7 @@ use Inertia\Response;
 class ProjectBoardController extends Controller
 {
    public function __construct(
+        private readonly BuildProjectBoardPageProps $buildProjectBoardPageProps,
        private readonly CreateTicketWorklogEntry $createTicketWorklogEntry,
        private readonly PermissionService $permissionService,
    ) {}
@@ -31,23 +34,12 @@ class ProjectBoardController extends Controller
            403,
        );

-        return Inertia::render('projects/Board', [
-            'boardColumns' => $project->boardColumns()
-                ->with([
-                    'ticketStatuses',
-                    'tickets' => fn ($query) => $query
-                        ->with([
-                            'ticketPriority',
-                            'ticketStatus.allowedTargetStatuses.boardColumn',
-                            'ticketStatus.boardColumn',
-                            'ticketType',
-                        ]),
-                ])
-                ->get(),
-            'canEditTickets' => $this->permissionService->allows($user, Permission::ProjectWrite, $project),
-            'project' => $project,
-            'status' => session('status'),
-        ]);
+        return Inertia::render('projects/Board', $this->buildProjectBoardPageProps->handle(
+            $project,
+            $this->permissionService->allows($user, Permission::ProjectWrite, $project),
+            $this->permissionService->allows($user, Permission::ProjectWrite, $project),
+            session('status'),
+        ));
    }

    public function move(
@@ -90,7 +82,7 @@ class ProjectBoardController extends Controller
        $this->createTicketWorklogEntry->handle(
            $ticket->fresh(),
            $user,
-            'status_changed',
+            TicketWorklogEntryType::StatusChanged,
            "Moved from {$originLabel} to {$destinationLabel}.",
            [
                'from' => [
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;

 use App\Actions\Permissions\PermissionService;
+use App\Actions\Projects\BuildProjectBacklogPageProps;
 use App\Actions\ProjectTicketMetadata\InitializeProjectTicketMetadata;
 use App\Enums\Permission;
 use App\Http\Requests\DeleteProjectRequest;
@@ -20,6 +21,7 @@ use Inertia\Response;
 class ProjectController extends Controller
 {
    public function __construct(
+        private readonly BuildProjectBacklogPageProps $buildProjectBacklogPageProps,
        private readonly InitializeProjectTicketMetadata $initializeProjectTicketMetadata,
        private readonly PermissionService $permissionService,
    ) {}
@@ -85,6 +87,23 @@ class ProjectController extends Controller
        ]);
    }

+    public function backlog(Request $request, Project $project): Response
+    {
+        $user = $request->user();
+
+        abort_unless(
+            $this->permissionService->allows($user, Permission::ProjectRead, $project),
+            403,
+        );
+
+        return Inertia::render('projects/Backlog', $this->buildProjectBacklogPageProps->handle(
+            $project,
+            $this->permissionService->allows($user, Permission::ProjectWrite, $project),
+            $this->permissionService->allows($user, Permission::ProjectWrite, $project),
+            session('status'),
+        ));
+    }
+
    public function general(Request $request, Project $project): Response
    {
        return Inertia::render('projects/settings/General', [
@@ -189,7 +189,7 @@ class ProjectRepositorySettingsController extends Controller
                    $error = null;
                } catch (Throwable) {
                    $repositories = [];
-                    $error = 'KanbanGit could not load repositories from this Git connection right now.';
+                    $error = ((string) config('app.name')).' could not load repositories from this Git connection right now.';
                }

                return [
@@ -73,10 +73,8 @@ class ProjectTicketBranchController extends Controller
                $this->gitProviderManager
                    ->client($userGitConnection->provider)
                    ->listBranches(
-                        $userGitConnection->base_url,
                        $userGitConnection->api_token,
-                        $repositoryConnection->owner_name,
-                        $repositoryConnection->repository_name,
+                        $repositoryConnection->toGitRepository(),
                    ),
            )
                ->contains(
@@ -85,7 +83,7 @@ class ProjectTicketBranchController extends Controller
        } catch (Throwable) {
            return response()->json([
                'is_valid' => false,
-                'message' => 'KanbanGit could not validate this branch name right now.',
+                'message' => ((string) config('app.name')).' could not validate this branch name right now.',
            ]);
        }

@@ -147,10 +145,8 @@ class ProjectTicketBranchController extends Controller
        try {
            $branchAlreadyExists = collect(
                $gitProvider->listBranches(
-                    $userGitConnection->base_url,
                    $userGitConnection->api_token,
-                    $repositoryConnection->owner_name,
-                    $repositoryConnection->repository_name,
+                    $repositoryConnection->toGitRepository(),
                ),
            )
                ->contains(
@@ -158,7 +154,7 @@ class ProjectTicketBranchController extends Controller
                );
        } catch (Throwable) {
            throw ValidationException::withMessages([
-                'branch_name' => 'KanbanGit could not validate this branch name right now.',
+                'branch_name' => ((string) config('app.name')).' could not validate this branch name right now.',
            ]);
        }

@@ -186,7 +182,7 @@ class ProjectTicketBranchController extends Controller
            );
        } catch (Throwable) {
            throw ValidationException::withMessages([
-                'branch_name' => 'KanbanGit could not create this branch right now.',
+                'branch_name' => ((string) config('app.name')).' could not create this branch right now.',
            ]);
        }

@@ -6,8 +6,11 @@ use App\Actions\Git\BuildSuggestedTicketBranchName;
 use App\Actions\Git\ResolveTicketBranchMatches;
 use App\Actions\Git\ResolveTicketPullRequestMatches;
 use App\Actions\Permissions\PermissionService;
+use App\Actions\Tickets\BuildProjectTicketUpdateAttributes;
+use App\Actions\Tickets\CreateProjectTicket;
 use App\Actions\Tickets\UpdateProjectTicket;
 use App\Enums\Permission;
+use App\Http\Requests\StoreProjectTicketRequest;
 use App\Http\Requests\UpdateProjectTicketRequest;
 use App\Models\Project;
 use App\Models\Ticket;
@@ -22,13 +25,68 @@ use Inertia\Response;
 class ProjectTicketController extends Controller
 {
    public function __construct(
+        private readonly BuildProjectTicketUpdateAttributes $buildProjectTicketUpdateAttributes,
        private readonly BuildSuggestedTicketBranchName $buildSuggestedTicketBranchName,
+        private readonly CreateProjectTicket $createProjectTicket,
        private readonly PermissionService $permissionService,
        private readonly ResolveTicketBranchMatches $resolveTicketBranchMatches,
        private readonly ResolveTicketPullRequestMatches $resolveTicketPullRequestMatches,
        private readonly UpdateProjectTicket $updateProjectTicket,
    ) {}

+    public function create(Request $request, Project $project): Response
+    {
+        $user = $request->user();
+
+        abort_unless(
+            $this->permissionService->allows($user, Permission::ProjectWrite, $project),
+            403,
+        );
+
+        $source = Arr::get($request->query(), 'source') === 'board'
+            ? 'board'
+            : 'backlog';
+        $defaultTicketStatus = $source === 'board'
+            ? $project->ticketStatuses()->whereNotNull('board_column_id')->first()
+            : $project->ticketStatuses()->whereNull('board_column_id')->first();
+
+        $defaultTicketStatus ??= $project->ticketStatuses()->first();
+
+        return Inertia::render('projects/TicketCreate', [
+            'defaultTicketStatusId' => $defaultTicketStatus?->id,
+            'project' => $project,
+            'source' => $source,
+            'status' => session('status'),
+            'ticketPriorities' => $project->ticketPriorities()->get(),
+            'ticketStatusOptions' => $project->ticketStatuses()
+                ->with('boardColumn')
+                ->get(),
+            'ticketTypes' => $project->ticketTypes()->get(),
+            'users' => User::query()
+                ->orderBy('name')
+                ->get(),
+        ]);
+    }
+
+    public function store(StoreProjectTicketRequest $request, Project $project): RedirectResponse
+    {
+        $user = $request->user();
+
+        abort_unless(
+            $this->permissionService->allows($user, Permission::ProjectWrite, $project),
+            403,
+        );
+
+        $ticket = $this->createProjectTicket->handle(
+            $project,
+            $request->validated(),
+            $user,
+        );
+
+        return to_route('projects.tickets.show', [$project, $ticket])
+            ->with('status', "{$ticket->ticket_key} was created.");
+    }
+
    public function show(Request $request, Project $project, Ticket $ticket): Response
    {
        $user = $request->user();
@@ -40,7 +98,6 @@ class ProjectTicketController extends Controller

        $canEditTicket = $this->permissionService->allows($user, Permission::ProjectWrite, $project);
        $canManageProject = $this->permissionService->allows($user, Permission::ProjectAdmin, $project);
-        $excludedParentIds = [$ticket->id, ...$this->descendantIds($ticket)];
        $displayTicket = $ticket->load([
            'assignee',
            'author',
@@ -65,7 +122,7 @@ class ProjectTicketController extends Controller
            'linkedTickets' => $this->linkedTickets($ticket),
            'parentTicketOptions' => Ticket::query()
                ->where('project_id', $project->id)
-                ->whereNotIn('id', $excludedParentIds)
+                ->whereKeyNot($ticket->id)
                ->whereHas('ticketType', fn ($query) => $query->where('is_parent', true))
                ->orderByDesc('sequence_number')
                ->get()
@@ -122,25 +179,7 @@ class ProjectTicketController extends Controller

        $validated = $request->validated();
        $fieldValues = Arr::get($validated, 'field_values', []);
-        $ticketAttributes = [
-            'acceptance_criteria' => Arr::get($validated, 'acceptance_criteria'),
-            'assignee_user_id' => Arr::exists($validated, 'assignee_user_id')
-                ? Arr::get($validated, 'assignee_user_id')
-                : $ticket->assignee_user_id,
-            'author_user_id' => Arr::exists($validated, 'author_user_id')
-                ? Arr::get($validated, 'author_user_id')
-                : $ticket->author_user_id,
-            'blocked_comment' => Arr::get($validated, 'blocked_comment'),
-            'description' => Arr::get($validated, 'description'),
-            'is_blocked' => Arr::get($validated, 'is_blocked', false),
-            'parent_ticket_id' => Arr::get($validated, 'parent_ticket_id'),
-            'story_points' => Arr::exists($validated, 'story_points')
-                ? Arr::get($validated, 'story_points')
-                : $ticket->story_points,
-            'ticket_priority_id' => Arr::get($validated, 'ticket_priority_id'),
-            'ticket_type_id' => Arr::get($validated, 'ticket_type_id'),
-            'title' => Arr::get($validated, 'title'),
-        ];
+        $ticketAttributes = $this->buildProjectTicketUpdateAttributes->handle($ticket, $validated);

        $wasUpdated = $this->updateProjectTicket->handle(
            $ticket,
@@ -181,20 +220,6 @@ class ProjectTicketController extends Controller
            ->all();
    }

-    /**
-     * @return array<int, int>
-     */
-    private function descendantIds(Ticket $ticket): array
-    {
-        return $ticket->childTickets()
-            ->get()
-            ->flatMap(function (Ticket $childTicket): array {
-                return [$childTicket->id, ...$this->descendantIds($childTicket)];
-            })
-            ->values()
-            ->all();
-    }
-
    /**
     * @return array<int, array{
     *     created_at: string|null,
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Actions\Permissions\PermissionService;
 use App\Actions\Tickets\CreateTicketWorklogEntry;
 use App\Enums\Permission;
+use App\Enums\TicketWorklogEntryType;
 use App\Http\Requests\StoreTicketLinkRequest;
 use App\Models\Project;
 use App\Models\Ticket;
@@ -59,7 +60,7 @@ class ProjectTicketLinkController extends Controller
            $this->createTicketWorklogEntry->handle(
                $ticket,
                $user,
-                'link_updated',
+                TicketWorklogEntryType::LinkUpdated,
                "Linked {$linkedTicket->ticket_key} as {$ticketLink->ticketLinkType->label}.",
                [
                    'linked_ticket_key' => $linkedTicket->ticket_key,
@@ -70,7 +71,7 @@ class ProjectTicketLinkController extends Controller
            $this->createTicketWorklogEntry->handle(
                $linkedTicket,
                $user,
-                'link_updated',
+                TicketWorklogEntryType::LinkUpdated,
                "Linked {$ticket->ticket_key} as {$ticketLink->ticketLinkType->label}.",
                [
                    'linked_ticket_key' => $ticket->ticket_key,
@@ -117,7 +118,7 @@ class ProjectTicketLinkController extends Controller
            $this->createTicketWorklogEntry->handle(
                $ticket,
                $user,
-                'link_removed',
+                TicketWorklogEntryType::LinkRemoved,
                "Removed {$label} link to {$linkedTicket->ticket_key}.",
                [
                    'linked_ticket_key' => $linkedTicket->ticket_key,
@@ -128,7 +129,7 @@ class ProjectTicketLinkController extends Controller
            $this->createTicketWorklogEntry->handle(
                $linkedTicket,
                $user,
-                'link_removed',
+                TicketWorklogEntryType::LinkRemoved,
                "Removed {$label} link to {$ticket->ticket_key}.",
                [
                    'linked_ticket_key' => $ticket->ticket_key,
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Actions\Permissions\PermissionService;
 use App\Actions\Tickets\CreateTicketWorklogEntry;
 use App\Enums\Permission;
+use App\Enums\TicketWorklogEntryType;
 use App\Http\Requests\DestroyProjectTicketTypeRequest;
 use App\Http\Requests\StoreProjectNamedSettingRequest;
 use App\Http\Requests\StoreProjectTicketTypeRequest;
@@ -158,7 +159,7 @@ class ProjectTicketMetadataSettingsController extends Controller
                        $this->createTicketWorklogEntry->handle(
                            $ticket->fresh(),
                            $request->user(),
-                            'updated',
+                            TicketWorklogEntryType::Updated,
                            "Updated type because {$deletedName} type was deleted.",
                            [
                                'ticket_type' => [
@@ -61,7 +61,7 @@ class GitConnectionController extends Controller
        } catch (Throwable) {
            return back()
                ->withErrors([
-                    'api_token' => 'KanbanGit could not authenticate against Gitea with this base URL and token.',
+                    'api_token' => ((string) config('app.name')).' could not authenticate against Gitea with this base URL and token.',
                ]);
        }

@@ -99,7 +99,7 @@ class GitConnectionController extends Controller
        } catch (Throwable) {
            return back()
                ->withErrors([
-                    'api_token' => 'KanbanGit could not authenticate against Gitea with this base URL and token.',
+                    'api_token' => ((string) config('app.name')).' could not authenticate against Gitea with this base URL and token.',
                ]);
        }