From c9ee4c1a98cf977461bb67e5eca7b2dd1fc4f7b5 Mon Sep 17 00:00:00 2001 From: Methapon Metanipat Date: Thu, 14 Nov 2024 17:48:20 +0700 Subject: [PATCH] refactor: use helper --- .../00-employment-office-controller.ts | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/controllers/00-employment-office-controller.ts b/src/controllers/00-employment-office-controller.ts index 4aef059..519bd2d 100644 --- a/src/controllers/00-employment-office-controller.ts +++ b/src/controllers/00-employment-office-controller.ts @@ -11,23 +11,19 @@ export class EmploymentOfficeController extends Controller { return await prisma.employmentOffice.findMany({ where: { OR: - !!districtId || !!query + districtId || query ? [ - ...(districtId - ? [ - { - province: { - district: { some: { id: districtId } }, - }, - district: { none: {} }, - }, - { - district: { - some: { districtId }, - }, - }, - ] - : []), + ...(queryOrNot(!!districtId, [ + { + province: { district: { some: { id: districtId } } }, + district: { none: {} }, + }, + { + district: { + some: { districtId }, + }, + }, + ]) ?? []), ...(queryOrNot(query, [ { name: { contains: query } }, { nameEN: { contains: query } },