Refactor Inertia responses to use resources

2026-04-15 18:09:08 +02:00
parent 5a7972df7c
commit 017cff5437
38 changed files with 1125 additions and 382 deletions
@@ -6,12 +6,24 @@ 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\Http\Resources\ProjectResource;
+use App\Http\Resources\TicketFieldDefinitionResource;
+use App\Http\Resources\TicketLinkResource;
+use App\Http\Resources\TicketLinkTypeResource;
+use App\Http\Resources\TicketPriorityResource;
+use App\Http\Resources\TicketReferenceResource;
+use App\Http\Resources\TicketRepositoryBranchResource;
+use App\Http\Resources\TicketRepositoryPullRequestResource;
+use App\Http\Resources\TicketResource;
+use App\Http\Resources\TicketStatusResource;
+use App\Http\Resources\TicketTreeNodeResource;
+use App\Http\Resources\TicketTypeResource;
+use App\Http\Resources\UserResource;
 use App\Models\Project;
 use App\Models\Ticket;
 use App\Models\TicketLink;
@@ -25,7 +37,6 @@ 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,
@@ -54,17 +65,21 @@ class ProjectTicketController extends Controller

        return Inertia::render('projects/TicketCreate', [
            'defaultTicketStatusId' => $defaultTicketStatus?->id,
-            'project' => $project,
+            'project' => ProjectResource::make($project)->resolve(),
            '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(),
+            'ticketPriorities' => TicketPriorityResource::collection($project->ticketPriorities()->get())->resolve(),
+            'ticketStatusOptions' => TicketStatusResource::collection(
+                $project->ticketStatuses()
+                    ->with('boardColumn')
+                    ->get(),
+            )->resolve(),
+            'ticketTypes' => TicketTypeResource::collection($project->ticketTypes()->get())->resolve(),
+            'users' => UserResource::collection(
+                User::query()
+                    ->orderBy('name')
+                    ->get(),
+            )->resolve(),
        ]);
    }

@@ -118,50 +133,65 @@ class ProjectTicketController extends Controller
        return Inertia::render('projects/Ticket', [
            'canEditTicket' => $canEditTicket,
            'canManageProject' => $canManageProject,
-            'childTicketTree' => $this->buildChildTicketTree($ticket),
-            'linkedTickets' => $this->linkedTickets($ticket),
-            'parentTicketOptions' => Ticket::query()
-                ->where('project_id', $project->id)
-                ->whereKeyNot($ticket->id)
-                ->whereHas('ticketType', fn ($query) => $query->where('is_parent', true))
-                ->orderByDesc('sequence_number')
-                ->get()
-                ->map(fn (Ticket $parentTicket): array => [
-                    'id' => $parentTicket->id,
-                    'ticket_key' => $parentTicket->ticket_key,
-                    'title' => $parentTicket->title,
-                ]),
-            'project' => $project,
-            'repositoryBranches' => $this->resolveTicketBranchMatches->handle(
-                $user,
-                $project,
-                $ticket,
-            ),
-            'repositoryPullRequests' => $this->resolveTicketPullRequestMatches->handle(
-                $user,
-                $project,
-                $ticket,
-            ),
+            'childTicketTree' => TicketTreeNodeResource::collection(
+                $ticket->childTickets()
+                    ->with('ticketType')
+                    ->get(),
+            )->resolve(),
+            'linkedTickets' => TicketLinkResource::collection(
+                TicketLink::query()
+                    ->with(['sourceTicket', 'targetTicket', 'ticketLinkType'])
+                    ->where(function ($query) use ($ticket): void {
+                        $query
+                            ->where('source_ticket_id', $ticket->id)
+                            ->orWhere('target_ticket_id', $ticket->id);
+                    })
+                    ->orderBy('id')
+                    ->get()
+                    ->each(fn (TicketLink $ticketLink) => $ticketLink->setAttribute('current_ticket_id', $ticket->id)),
+            )->resolve(),
+            'parentTicketOptions' => TicketReferenceResource::collection(
+                Ticket::query()
+                    ->where('project_id', $project->id)
+                    ->whereKeyNot($ticket->id)
+                    ->whereHas('ticketType', fn ($query) => $query->where('is_parent', true))
+                    ->orderByDesc('sequence_number')
+                    ->get(),
+            )->resolve(),
+            'project' => ProjectResource::make($project)->resolve(),
+            'repositoryBranches' => TicketRepositoryBranchResource::collection(
+                $this->resolveTicketBranchMatches->handle(
+                    $user,
+                    $project,
+                    $ticket,
+                ),
+            )->resolve(),
+            'repositoryPullRequests' => TicketRepositoryPullRequestResource::collection(
+                $this->resolveTicketPullRequestMatches->handle(
+                    $user,
+                    $project,
+                    $ticket,
+                ),
+            )->resolve(),
            'status' => session('status'),
            'suggestedBranchName' => $this->buildSuggestedTicketBranchName->handle($ticket),
-            'ticket' => $displayTicket,
-            'ticketFieldDefinitions' => $project->ticketFieldDefinitions()->get(),
-            'ticketLinkOptions' => Ticket::query()
-                ->where('project_id', $project->id)
-                ->whereKeyNot($ticket->id)
-                ->orderByDesc('sequence_number')
-                ->get()
-                ->map(fn (Ticket $linkedTicket): array => [
-                    'id' => $linkedTicket->id,
-                    'ticket_key' => $linkedTicket->ticket_key,
-                    'title' => $linkedTicket->title,
-                ]),
-            'ticketLinkTypes' => $project->ticketLinkTypes()->get(),
-            'ticketPriorities' => $project->ticketPriorities()->get(),
-            'ticketTypes' => $project->ticketTypes()->get(),
-            'users' => User::query()
-                ->orderBy('name')
-                ->get(),
+            'ticket' => TicketResource::make($displayTicket)->resolve(),
+            'ticketFieldDefinitions' => TicketFieldDefinitionResource::collection($project->ticketFieldDefinitions()->get())->resolve(),
+            'ticketLinkOptions' => TicketReferenceResource::collection(
+                Ticket::query()
+                    ->where('project_id', $project->id)
+                    ->whereKeyNot($ticket->id)
+                    ->orderByDesc('sequence_number')
+                    ->get(),
+            )->resolve(),
+            'ticketLinkTypes' => TicketLinkTypeResource::collection($project->ticketLinkTypes()->get())->resolve(),
+            'ticketPriorities' => TicketPriorityResource::collection($project->ticketPriorities()->get())->resolve(),
+            'ticketTypes' => TicketTypeResource::collection($project->ticketTypes()->get())->resolve(),
+            'users' => UserResource::collection(
+                User::query()
+                    ->orderBy('name')
+                    ->get(),
+            )->resolve(),
        ]);
    }

@@ -178,14 +208,11 @@ class ProjectTicketController extends Controller
        );

        $validated = $request->validated();
-        $fieldValues = Arr::get($validated, 'field_values', []);
-        $ticketAttributes = $this->buildProjectTicketUpdateAttributes->handle($ticket, $validated);

        $wasUpdated = $this->updateProjectTicket->handle(
            $ticket,
            $user,
-            $ticketAttributes,
-            $fieldValues,
+            $validated,
        );

        $statusMessage = $wasUpdated
@@ -195,74 +222,4 @@ class ProjectTicketController extends Controller
        return to_route('projects.tickets.show', [$project, $ticket])
            ->with('status', $statusMessage);
    }
-
-    /**
-     * @return array<int, array{
-     *     children: array<int, mixed>,
-     *     id: int,
-     *     ticket_key: string,
-     *     ticket_type_name: string|null,
-     *     title: string
-     * }>
-     */
-    private function buildChildTicketTree(Ticket $ticket): array
-    {
-        return $ticket->childTickets()
-            ->with('ticketType')
-            ->get()
-            ->map(fn (Ticket $childTicket): array => [
-                'children' => $this->buildChildTicketTree($childTicket),
-                'id' => $childTicket->id,
-                'ticket_key' => $childTicket->ticket_key,
-                'ticket_type_name' => $childTicket->ticketType?->name,
-                'title' => $childTicket->title,
-            ])
-            ->all();
-    }
-
-    /**
-     * @return array<int, array{
-     *     created_at: string|null,
-     *     id: int,
-     *     linked_ticket: array{id: int, ticket_key: string, title: string},
-     *     source_ticket_id: int,
-     *     target_ticket_id: int,
-     *     ticket_link_type: mixed,
-     *     ticket_link_type_id: int,
-     *     updated_at: string|null
-     * }>
-     */
-    private function linkedTickets(Ticket $ticket): array
-    {
-        return TicketLink::query()
-            ->with(['sourceTicket', 'targetTicket', 'ticketLinkType'])
-            ->where(function ($query) use ($ticket): void {
-                $query
-                    ->where('source_ticket_id', $ticket->id)
-                    ->orWhere('target_ticket_id', $ticket->id);
-            })
-            ->orderBy('id')
-            ->get()
-            ->map(function (TicketLink $ticketLink) use ($ticket): array {
-                $linkedTicket = $ticketLink->source_ticket_id === $ticket->id
-                    ? $ticketLink->targetTicket
-                    : $ticketLink->sourceTicket;
-
-                return [
-                    'created_at' => $ticketLink->created_at?->toISOString(),
-                    'id' => $ticketLink->id,
-                    'linked_ticket' => [
-                        'id' => $linkedTicket->id,
-                        'ticket_key' => $linkedTicket->ticket_key,
-                        'title' => $linkedTicket->title,
-                    ],
-                    'source_ticket_id' => $ticketLink->source_ticket_id,
-                    'target_ticket_id' => $ticketLink->target_ticket_id,
-                    'ticket_link_type' => $ticketLink->ticketLinkType,
-                    'ticket_link_type_id' => $ticketLink->ticket_link_type_id,
-                    'updated_at' => $ticketLink->updated_at?->toISOString(),
-                ];
-            })
-            ->all();
-    }
 }