Consolidate ticket ID/displayId lookup into shared where helper

Extracted idOrDisplayWhere() to eliminate the duplicated OR pattern
in getTicket, updateTicket, and commentService.addComment. The
exported findByIdOrDisplay() now uses it too.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-04-21 20:33:33 -04:00
parent b32e1dfa57
commit d3ec27e223
2 changed files with 9 additions and 8 deletions
+2 -3
View File
@@ -2,11 +2,10 @@ import prisma from '../lib/prisma';
import { HttpError } from '../lib/httpError'; import { HttpError } from '../lib/httpError';
import * as notificationService from './notificationService'; import * as notificationService from './notificationService';
import { logger } from '../lib/logger'; import { logger } from '../lib/logger';
import { findByIdOrDisplay } from './ticketService';
export async function addComment(ticketIdOrDisplay: string, body: string, actorId: string) { export async function addComment(ticketIdOrDisplay: string, body: string, actorId: string) {
const ticket = await prisma.ticket.findFirst({ const ticket = await findByIdOrDisplay(ticketIdOrDisplay);
where: { OR: [{ id: ticketIdOrDisplay }, { displayId: ticketIdOrDisplay }] },
});
if (!ticket) throw new HttpError(404, 'Ticket not found'); if (!ticket) throw new HttpError(404, 'Ticket not found');
const [comment] = await prisma.$transaction([ const [comment] = await prisma.$transaction([
+7 -5
View File
@@ -75,10 +75,12 @@ async function generateDisplayId(): Promise<string> {
} }
} }
const idOrDisplayWhere = (idOrDisplay: string): Prisma.TicketWhereInput => ({
OR: [{ id: idOrDisplay }, { displayId: idOrDisplay }],
});
export function findByIdOrDisplay(idOrDisplay: string) { export function findByIdOrDisplay(idOrDisplay: string) {
return prisma.ticket.findFirst({ return prisma.ticket.findFirst({ where: idOrDisplayWhere(idOrDisplay) });
where: { OR: [{ id: idOrDisplay }, { displayId: idOrDisplay }] },
});
} }
export function buildTicketWhere(filters: TicketFilters): Prisma.TicketWhereInput { export function buildTicketWhere(filters: TicketFilters): Prisma.TicketWhereInput {
@@ -143,7 +145,7 @@ export async function listTicketsPaged(filters: TicketFilters, pagination: Pagin
export async function getTicket(idOrDisplay: string) { export async function getTicket(idOrDisplay: string) {
const ticket = await prisma.ticket.findFirst({ const ticket = await prisma.ticket.findFirst({
where: { OR: [{ id: idOrDisplay }, { displayId: idOrDisplay }] }, where: idOrDisplayWhere(idOrDisplay),
include: ticketInclude, include: ticketInclude,
}); });
if (!ticket) throw new HttpError(404, 'Ticket not found'); if (!ticket) throw new HttpError(404, 'Ticket not found');
@@ -196,7 +198,7 @@ export async function updateTicket(
} }
const existing = await prisma.ticket.findFirst({ const existing = await prisma.ticket.findFirst({
where: { OR: [{ id: idOrDisplay }, { displayId: idOrDisplay }] }, where: idOrDisplayWhere(idOrDisplay),
include: { include: {
category: true, category: true,
type: true, type: true,