codex ticket rework

app/Http/Controllers/ProjectBacklogController.php

@@ -8,6 +8,7 @@ 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;
@@ -43,6 +44,9 @@ class ProjectBacklogController extends Controller
                 ->whereNull('board_column_id')
                 ->orderByDesc('sequence_number')
                 ->get(),
+            'users' => User::query()
+                ->orderBy('name')
+                ->get(),
         ]);
     }
 

app/Http/Controllers/ProjectTicketController.php

@@ -38,10 +38,28 @@ class ProjectTicketController extends Controller
             403,
         );
 
+        $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',
+            'fieldValues.ticketFieldDefinition',
+            'fieldValues.userValue',
+            'parentTicket',
+            'ticketPriority',
+            'ticketType',
+            'worklogEntries.actor',
+        ]);
+
+        if (! $project->show_author && ! $canManageProject) {
+            $displayTicket->setRelation('author', null);
+            $displayTicket->author_user_id = null;
+        }
 
         return Inertia::render('projects/Ticket', [
-            'canEditTicket' => $this->permissionService->allows($user, Permission::ProjectWrite, $project),
+            'canEditTicket' => $canEditTicket,
+            'canManageProject' => $canManageProject,
             'childTicketTree' => $this->buildChildTicketTree($ticket),
             'linkedTickets' => $this->linkedTickets($ticket),
             'parentTicketOptions' => Ticket::query()
@@ -68,14 +86,7 @@ class ProjectTicketController extends Controller
             ),
             'status' => session('status'),
             'suggestedBranchName' => $this->buildSuggestedTicketBranchName->handle($ticket),
-            'ticket' => $ticket->load([
-                'fieldValues.ticketFieldDefinition',
-                'fieldValues.userValue',
-                'parentTicket',
-                'ticketPriority',
-                'ticketType',
-                'worklogEntries.actor',
-            ]),
+            'ticket' => $displayTicket,
             'ticketFieldDefinitions' => $project->ticketFieldDefinitions()->get(),
             'ticketLinkOptions' => Ticket::query()
                 ->where('project_id', $project->id)
@@ -109,17 +120,25 @@ class ProjectTicketController extends Controller
         );
 
         $validated = $request->validated();
-        $fieldValues = Arr::get($validated, 'field_values');
+        $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'),
-            'story_points' => Arr::get($validated, 'story_points'),
         ];
 
         $wasUpdated = $this->updateProjectTicket->handle(

app/Http/Controllers/ProjectTicketMetadataSettingsController.php

@@ -3,14 +3,18 @@
 namespace App\Http\Controllers;
 
 use App\Actions\Permissions\PermissionService;
+use App\Actions\Tickets\CreateTicketWorklogEntry;
 use App\Enums\Permission;
+use App\Http\Requests\DestroyProjectTicketTypeRequest;
 use App\Http\Requests\StoreProjectNamedSettingRequest;
 use App\Http\Requests\StoreProjectTicketTypeRequest;
 use App\Http\Requests\StoreTicketFieldDefinitionRequest;
 use App\Http\Requests\UpdateProjectNamedSettingRequest;
 use App\Http\Requests\UpdateProjectTicketMetadataSettings;
+use App\Http\Requests\UpdateProjectTicketTypeRequest;
 use App\Http\Requests\UpdateTicketFieldDefinitionRequest;
 use App\Models\Project;
+use App\Models\Ticket;
 use App\Models\TicketFieldDefinition;
 use App\Models\TicketLinkType;
 use App\Models\TicketPriority;
@@ -27,6 +31,7 @@ use Inertia\Response;
 class ProjectTicketMetadataSettingsController extends Controller
 {
     public function __construct(
+        private readonly CreateTicketWorklogEntry $createTicketWorklogEntry,
         private readonly PermissionService $permissionService,
     ) {}
 
@@ -47,15 +52,20 @@ class ProjectTicketMetadataSettingsController extends Controller
             'ticketFieldDefinitions' => $project->ticketFieldDefinitions()->get(),
             'ticketLinkTypes' => $project->ticketLinkTypes()->get(),
             'ticketPriorities' => $project->ticketPriorities()->get(),
-            'ticketTypes' => $project->ticketTypes()->get(),
+            'ticketTypes' => $project->ticketTypes()->withCount('tickets')->get(),
         ]);
     }
 
     public function update(UpdateProjectTicketMetadataSettings $request, Project $project): RedirectResponse
     {
+        $this->abortUnlessCanManage($request, $project);
+
         $validated = $request->validated();
 
-        $project->update(['show_story_points' => Arr::get($validated, 'show_story_points', false)]);
+        $project->update([
+            'show_author' => Arr::get($validated, 'show_author', false),
+            'show_story_points' => Arr::get($validated, 'show_story_points', false),
+        ]);
 
         return to_route('projects.settings.metadata', $project)
             ->with('status', 'Settings have been updated.');
@@ -88,7 +98,7 @@ class ProjectTicketMetadataSettingsController extends Controller
     }
 
     public function updateType(
-        UpdateProjectNamedSettingRequest $request,
+        UpdateProjectTicketTypeRequest $request,
         Project $project,
         TicketType $ticketType,
     ): RedirectResponse {
@@ -99,7 +109,6 @@ class ProjectTicketMetadataSettingsController extends Controller
         DB::transaction(function () use ($project, $validated, $ticketType): void {
             $ticketType->update([
                 'name' => Arr::get($validated, 'name'),
-                'is_parent' => Arr::get($validated, 'is_parent', false),
             ]);
 
             $this->reorderModels(
@@ -113,8 +122,11 @@ class ProjectTicketMetadataSettingsController extends Controller
             ->with('status', "{$ticketType->fresh()->name} type was updated.");
     }
 
-    public function destroyType(Request $request, Project $project, TicketType $ticketType): RedirectResponse
-    {
+    public function destroyType(
+        DestroyProjectTicketTypeRequest $request,
+        Project $project,
+        TicketType $ticketType,
+    ): RedirectResponse {
         $this->abortUnlessCanManage($request, $project);
 
         if ($project->ticketTypes()->count() === 1) {
@@ -124,8 +136,40 @@ class ProjectTicketMetadataSettingsController extends Controller
         }
 
         $deletedName = $ticketType->name;
+        $validated = $request->validated();
+
+        DB::transaction(function () use ($deletedName, $project, $request, $ticketType, $validated): void {
+            $replacementTicketTypeId = Arr::get($validated, 'replacement_ticket_type_id');
+
+            if ($replacementTicketTypeId !== null) {
+                $replacementTicketType = $project->ticketTypes()
+                    ->findOrFail($replacementTicketTypeId);
+
+                Ticket::query()
+                    ->where('project_id', $project->id)
+                    ->where('ticket_type_id', $ticketType->id)
+                    ->with(['ticketType'])
+                    ->get()
+                    ->each(function (Ticket $ticket) use ($deletedName, $replacementTicketType, $request): void {
+                        $ticket->update([
+                            'ticket_type_id' => $replacementTicketType->id,
+                        ]);
+
+                        $this->createTicketWorklogEntry->handle(
+                            $ticket->fresh(),
+                            $request->user(),
+                            'updated',
+                            "Updated type because {$deletedName} type was deleted.",
+                            [
+                                'ticket_type' => [
+                                    'from' => $deletedName,
+                                    'to' => $replacementTicketType->name,
+                                ],
+                            ],
+                        );
+                    });
+            }
 
-        DB::transaction(function () use ($project, $ticketType): void {
             $ticketType->delete();
 
             $this->persistOrderedModels($project->ticketTypes()->get()->values());