Refactor acceptance criteria into model

2026-05-19 22:20:15 +00:00
parent 3ddfcc89f9
commit 7805bd057e
10 changed files with 217 additions and 72 deletions
@@ -52,9 +52,12 @@ class UpdateProjectTicket
        array $validated,
    ): bool {
        $fieldValueAttributes = Arr::get($validated, 'field_values', []);
+        $nextAcceptanceCriteria = TicketAcceptanceCriteriaData::normalize(
+            Arr::get($validated, 'acceptance_criteria'),
+        );
        $ticketAttributes = $this->buildTicketAttributes($ticket, $validated);

-        return DB::transaction(function () use ($actor, $fieldValueAttributes, $ticket, $ticketAttributes): bool {
+        return DB::transaction(function () use ($actor, $fieldValueAttributes, $nextAcceptanceCriteria, $ticket, $ticketAttributes): bool {
            if (! $ticketAttributes['is_blocked']) {
                $ticketAttributes['blocked_comment'] = null;
            }
@@ -62,6 +65,7 @@ class UpdateProjectTicket
            $ticket->loadMissing([
                'assignee',
                'author',
+                'acceptanceCriteria',
                'fieldValues.ticketFieldDefinition',
                'fieldValues.userValue',
                'parentTicket',
@@ -85,14 +89,10 @@ class UpdateProjectTicket
            /** @var Collection<int, TicketFieldValue> $existingFieldValues */
            $existingFieldValues = $ticket->fieldValues
                ->keyBy('ticket_field_definition_id');
-            $currentAcceptanceCriteria = TicketAcceptanceCriteriaData::fromStored(
-                $ticket->acceptance_criteria_data,
+            $currentAcceptanceCriteria = TicketAcceptanceCriteriaData::fromModels(
+                $ticket->acceptanceCriteria,
                $ticket->acceptance_criteria,
            );
-            $nextAcceptanceCriteria = TicketAcceptanceCriteriaData::fromStored(
-                $ticketAttributes['acceptance_criteria_data'],
-                $ticketAttributes['acceptance_criteria'],
-            );

            $changes = [];
            $summaryLabels = [];
@@ -198,6 +198,10 @@ class UpdateProjectTicket
                $ticket->save();
            }

+            if ($currentAcceptanceCriteria !== $nextAcceptanceCriteria) {
+                TicketAcceptanceCriteriaData::syncTicket($ticket, $nextAcceptanceCriteria);
+            }
+
            $fieldValueChangeSet = $this->syncProjectTicketFieldValues->handle(
                $ticket,
                $fieldDefinitions,
@@ -252,14 +256,6 @@ class UpdateProjectTicket
     * }  $validated
     * @return array{
     *     acceptance_criteria: string|null,
-     *     acceptance_criteria_data: array{
-     *         summary: string|null,
-     *         items: array<int, array{
-     *             checked: bool,
-     *             indent: int,
-     *             text: string
-     *         }>
-     *     }|null,
     *     assignee_user_id: int|null,
     *     author_user_id: int|null,
     *     blocked_comment: string|null,
@@ -280,7 +276,6 @@ class UpdateProjectTicket

        return [
            'acceptance_criteria' => TicketAcceptanceCriteriaData::toLegacyText($acceptanceCriteria),
-            'acceptance_criteria_data' => TicketAcceptanceCriteriaData::forStorage($acceptanceCriteria),
            'assignee_user_id' => Arr::exists($validated, 'assignee_user_id')
                ? Arr::get($validated, 'assignee_user_id')
                : $ticket->assignee_user_id,