From 531ebab3beddae76586b8a84ded6fb8e6e5514d7 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 28 Nov 2024 14:43:01 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=20?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=9E=E0=B8=B1=E0=B8=92?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B2=20#811?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DevelopmentEmployeeHistoryController.ts   | 38 +++++--------------
 .../DevelopmentHistoryController.ts           | 30 ++-------------
 2 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts
index 42e34a1..82d2f9a 100644
--- a/src/controllers/DevelopmentEmployeeHistoryController.ts
+++ b/src/controllers/DevelopmentEmployeeHistoryController.ts
@@ -270,36 +270,12 @@ export class DevelopmentEmployeeHistoryController extends Controller {
         new Brackets((qb) => {
           qb.where(
             body.keyword != null && body.keyword != ""
-              ? "developmentHistory.prefix LIKE :keyword"
+              ? "CONCAT(developmentHistory.prefix, developmentHistory.firstName, ' ', developmentHistory.lastName) LIKE :keyword"
               : "1=1",
             {
               keyword: `%${body.keyword}%`,
             },
           )
-            .orWhere(
-              body.keyword != null && body.keyword != ""
-                ? "developmentHistory.firstName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${body.keyword}%`,
-              },
-            )
-            .orWhere(
-              body.keyword != null && body.keyword != ""
-                ? "developmentHistory.lastName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${body.keyword}%`,
-              },
-            )
-            .orWhere(
-              body.keyword != null && body.keyword != ""
-                ? "developmentHistory.position LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${body.keyword}%`,
-              },
-            )
             .orWhere(
               body.keyword != null && body.keyword != ""
                 ? "developmentHistory.position LIKE :keyword"
@@ -350,11 +326,15 @@ export class DevelopmentEmployeeHistoryController extends Controller {
     const formattedData = development.map((item) => ({
       id: item.id,
       citizenId: item.citizenId,
-      fullName: item.prefix + item.firstName + " " + item.lastName,
+      fullName: item.prefix != null && item.firstName != null && item.lastName != null
+        ? `${item?.prefix}${item?.firstName} ${item?.lastName}`
+        : "",
       position: item.position,
       year: item.development.year,
       posType: item.employeePosType ? item.employeePosType.posTypeName : null,
-      posLevel: item.employeePosLevel ? item.employeePosLevel.posLevelName : null,
+      posLevel: item.employeePosType && item.employeePosLevel
+        ? `${item.employeePosType.posTypeShortName}${item.employeePosLevel.posLevelName}` 
+        : null,
       projectName: item.development.projectName,
     }));
 
@@ -391,8 +371,8 @@ export class DevelopmentEmployeeHistoryController extends Controller {
       position: getDevelopment.position,
       posLevelId: getDevelopment.employeePosLevelId,
       posLevelName:
-        getDevelopment.employeePosLevel != null
-          ? getDevelopment.employeePosLevel.posLevelName
+        getDevelopment.employeePosType != null && getDevelopment.employeePosLevel != null
+          ? `${getDevelopment.employeePosType.posTypeShortName} ${getDevelopment.employeePosLevel.posLevelName}`
           : null,
       posTypeId: getDevelopment.employeePosTypeId,
       posTypeName:
diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts
index 8f436a5..33f512a 100644
--- a/src/controllers/DevelopmentHistoryController.ts
+++ b/src/controllers/DevelopmentHistoryController.ts
@@ -265,36 +265,12 @@ export class DevelopmentOfficerHistoryController extends Controller {
         new Brackets((qb) => {
           qb.where(
             body.keyword != null && body.keyword != ""
-              ? "developmentHistory.prefix LIKE :keyword"
+              ? "CONCAT(developmentHistory.prefix, developmentHistory.firstName, ' ', developmentHistory.lastName) LIKE :keyword"
               : "1=1",
             {
               keyword: `%${body.keyword}%`,
             },
           )
-            .orWhere(
-              body.keyword != null && body.keyword != ""
-                ? "developmentHistory.firstName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${body.keyword}%`,
-              },
-            )
-            .orWhere(
-              body.keyword != null && body.keyword != ""
-                ? "developmentHistory.lastName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${body.keyword}%`,
-              },
-            )
-            .orWhere(
-              body.keyword != null && body.keyword != ""
-                ? "developmentHistory.position LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${body.keyword}%`,
-              },
-            )
             .orWhere(
               body.keyword != null && body.keyword != ""
                 ? "developmentHistory.position LIKE :keyword"
@@ -344,7 +320,9 @@ export class DevelopmentOfficerHistoryController extends Controller {
     const formattedData = development.map((item) => ({
       id: item.id,
       citizenId: item.citizenId,
-      fullName: item.prefix + item.firstName + " " + item.lastName,
+      fullName: item.prefix == null && item.firstName == null && item.lastName == null
+        ? ""
+        : `${item?.prefix}${item?.firstName} ${item?.lastName}`,
       position: item.position,
       year: item.development.year,
       root: item.development.root, //test