From e2b65aaabf0496bdca182aa4cfb94867386e2981 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 20 Mar 2024 12:16:43 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ProfileController.ts | 53 ++++++++++++++++------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 6a54d831..da348115 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -245,35 +245,42 @@ export class ProfileController extends Controller {
         "posLevelId",
         "posTypeId",
       ],
+      where: {
+        citizenId: Like(`%${keyword}%`),
+        position: Like(`%${keyword}%`),
+        prefix: Like(`%${keyword}%`),
+        firstName: Like(`%${keyword}%`),
+        lastName: Like(`%${keyword}%`),
+        // posLevel: { posLevelName: keyword },
+        // posType: { posTypeName: Like(`%${keyword}%`) },
+        // salaryEmployeeMins: { group: keyword },
+        // salaryEmployee: { group: keyword },
+      },
       order: { createdAt: "ASC" },
       skip: (page - 1) * pageSize,
       take: pageSize,
     });
-    if (keyword != undefined && keyword !== "") {
-      const formattedKeyword = keyword.toLowerCase().replace(/\s+/g, "");
-      const filteredProfile = profile.filter(
-        (x) =>
-          (x.prefix + x.firstName + x.lastName).replace(/\s+/g, "").includes(formattedKeyword) ||
-          x.citizenId?.toString().includes(keyword) ||
-          x.position?.toString().includes(keyword),
-      );
+    // if (keyword != undefined && keyword !== "") {
+    //   const formattedKeyword = keyword.toLowerCase().replace(/\s+/g, "");
+    //   const filteredProfile = profile.filter(
+    //     (x) =>
+    //       (x.prefix + x.firstName + x.lastName).replace(/\s+/g, "").includes(formattedKeyword) ||
+    //       x.citizenId?.toString().includes(keyword) ||
+    //       x.position?.toString().includes(keyword),
+    //   );
 
-      const formattedData = filteredProfile.map((item) => ({
-        id: item.id,
-        prefix: item.prefix,
-        firstName: item.firstName,
-        lastName: item.lastName,
-        citizenId: item.citizenId,
-        position: item.position,
-        posLevelId: item.posLevelId,
-        posTypeId: item.posTypeId,
-      }));
+    //   const formattedData = filteredProfile.map((item) => ({
+    //     id: item.id,
+    //     prefix: item.prefix,
+    //     firstName: item.firstName,
+    //     lastName: item.lastName,
+    //     citizenId: item.citizenId,
+    //     position: item.position,
+    //     posLevelId: item.posLevelId,
+    //     posTypeId: item.posTypeId,
+    //   }));
 
-      return new HttpSuccess({ data: formattedData, total: formattedData.length });
-    }
-
-    // if (!profile) {
-    //   return new HttpSuccess([]);
+    //   return new HttpSuccess({ data: formattedData, total: formattedData.length });
     // }
 
     const formattedData = profile.map((item) => ({