M3 Integration fixes

2026-09-21 10:14:57 +01:00
parent 4af997c465
commit 6d60cbff84
5853 changed files with 79032 additions and 1825 deletions
@@ -25,51 +25,52 @@ final class TicketCommentDeleteController extends Controller
        abort_unless((int) $comment->ticket_id === (int) $ticket->id, 404);

        DB::transaction(function () use ($comment, $ticket, $user): void {
-            $updates = [];
-
-            if (Schema::hasColumn('helpdesk_comments', 'tombstoned_at')) {
-                $updates['tombstoned_at'] = now();
-            }
-
-            if (Schema::hasColumn('helpdesk_comments', 'deleted_by')) {
-                $updates['deleted_by'] = (int) $user->id;
-            }
-
-            if (Schema::hasColumn('helpdesk_comments', 'delete_reason')) {
-                $updates['delete_reason'] = 'Deleted by MPBA platform administrator.';
-            }
-
-            if (Schema::hasColumn('helpdesk_comments', 'sync_sequence')) {
-                $updates['sync_sequence'] = ((int) ($comment->sync_sequence ?? 0)) + 1;
-            }
-
-            if (Schema::hasColumn('helpdesk_comments', 'sync_hash')) {
-                $updates['sync_hash'] = hash('sha256', implode('|', [
-                    (string) ($comment->guid ?? $comment->id),
-                    'deleted',
-                    now()->toISOString(),
-                ]));
-            }
-
-            if (Schema::hasColumn('helpdesk_comments', 'updated_at')) {
-                $updates['updated_at'] = now();
-            }
-
-            if ($updates !== []) {
-                DB::table('helpdesk_comments')
-                    ->where('id', $comment->id)
-                    ->update($updates);
-            } else {
-                $comment->delete();
-            }
-
-            if (Schema::hasColumn('helpdesk_tickets', 'last_activity_at')) {
-                $ticket->forceFill(['last_activity_at' => now()])->save();
-            }
+            $this->deleteComment($comment, (int) $user->id);
+            $this->touchTicket($ticket);
        });

        return redirect()
            ->route('helpdesk.tickets.show', $ticket)
            ->with('ticket-comment-deleted', 'Response deleted.');
    }
+
+    private function deleteComment(Comment $comment, int $userId): void
+    {
+        $updates = $this->tombstoneUpdates($comment, $userId);
+
+        if ($updates === []) {
+            $comment->delete();
+
+            return;
+        }
+
+        DB::table('helpdesk_comments')->where('id', $comment->id)->update($updates);
+    }
+
+    /** @return array<string, mixed> */
+    private function tombstoneUpdates(Comment $comment, int $userId): array
+    {
+        $now = now();
+        $candidates = [
+            'tombstoned_at' => $now,
+            'deleted_by' => $userId,
+            'delete_reason' => 'Deleted by MPBA platform administrator.',
+            'sync_sequence' => ((int) ($comment->sync_sequence ?? 0)) + 1,
+            'sync_hash' => hash('sha256', implode('|', [(string) ($comment->guid ?? $comment->id), 'deleted', $now->toISOString()])),
+            'updated_at' => $now,
+        ];
+
+        return array_filter(
+            $candidates,
+            static fn (mixed $value, string $column): bool => Schema::hasColumn('helpdesk_comments', $column),
+            ARRAY_FILTER_USE_BOTH,
+        );
+    }
+
+    private function touchTicket(Ticket $ticket): void
+    {
+        if (Schema::hasColumn('helpdesk_tickets', 'last_activity_at')) {
+            $ticket->forceFill(['last_activity_at' => now()])->save();
+        }
+    }
 }