From 29707d5567293139c77b3e512d9f84ad41a15a06 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 21 Mar 2024 11:31:18 +0700 Subject: [PATCH] =?UTF-8?q?Revert=20"=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=20paging"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 248dd12508faa9ffce64b9d217bf88204f27b1a4. --- src/controllers/ProfileEmployeeController.ts | 47 +++++++++----------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 025bfdd9..6b7e2bbb 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -244,39 +244,32 @@ export class ProfileEmployeeController extends Controller { "posLevelId", "posTypeId", ], - where: { - prefix: Like(`%${keyword}%`), - firstName: Like(`%${keyword}%`), - lastName: Like(`%${keyword}%`), - citizenId: Like(`%${keyword}%`), - position: Like(`%${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 }); - // } + return new HttpSuccess({ data: formattedData, total: formattedData.length }); + } const formattedData = profile.map((item) => ({ id: item.id,