From 13ff6caadc62e1053b73cd36259f53a765722ba8 Mon Sep 17 00:00:00 2001
From: Methapon Metanipat <methapon@frappet.com>
Date: Thu, 14 Nov 2024 17:56:55 +0700
Subject: [PATCH] refactor: adjust code

---
 .../00-employment-office-controller.ts        | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/controllers/00-employment-office-controller.ts b/src/controllers/00-employment-office-controller.ts
index 519bd2d..ed7a0c8 100644
--- a/src/controllers/00-employment-office-controller.ts
+++ b/src/controllers/00-employment-office-controller.ts
@@ -13,21 +13,26 @@ export class EmploymentOfficeController extends Controller {
         OR:
           districtId || query
             ? [
-                ...(queryOrNot(!!districtId, [
-                  {
-                    province: { district: { some: { id: districtId } } },
-                    district: { none: {} },
-                  },
-                  {
-                    district: {
-                      some: { districtId },
+                ...queryOrNot(
+                  !!districtId,
+                  [
+                    {
+                      province: { district: { some: { id: districtId } } },
+                      district: { none: {} },
                     },
-                  },
-                ]) ?? []),
-                ...(queryOrNot(query, [
-                  { name: { contains: query } },
-                  { nameEN: { contains: query } },
-                ]) ?? []),
+                    {
+                      district: {
+                        some: { districtId },
+                      },
+                    },
+                  ],
+                  [],
+                ),
+                ...queryOrNot(
+                  query,
+                  [{ name: { contains: query } }, { nameEN: { contains: query } }],
+                  [],
+                ),
               ]
             : undefined,
       },