From 364d1fc1a70197eb1f3d4564ba8a5e369f96ec2b Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Sun, 9 Jun 2024 22:17:14 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/PositionController.ts | 56 ++++++++++++++++-----------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 4579fb65..0061aecb 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -309,9 +309,11 @@ export class PositionController extends Controller {
         posDictField: requestBody.posDictField,
         posTypeId: requestBody.posTypeId,
         posLevelId: requestBody.posLevelId,
-        posExecutiveId: requestBody.posExecutiveId?requestBody.posExecutiveId:"",
-        posDictExecutiveField: requestBody.posDictExecutiveField?requestBody.posDictExecutiveField:"",
-        posDictArea: requestBody.posDictArea?requestBody.posDictArea:"",
+        posExecutiveId: requestBody.posExecutiveId ? requestBody.posExecutiveId : "",
+        posDictExecutiveField: requestBody.posDictExecutiveField
+          ? requestBody.posDictExecutiveField
+          : "",
+        posDictArea: requestBody.posDictArea ? requestBody.posDictArea : "",
         isSpecial: requestBody.isSpecial,
       },
     });
@@ -321,16 +323,18 @@ export class PositionController extends Controller {
     Object.assign(posDict, requestBody);
     posDict.lastUpdateUserId = request.user.sub;
     posDict.lastUpdateFullName = request.user.name;
-    posDict.posDictName = requestBody.posDictName,
-    posDict.posDictField = requestBody.posDictField,
-    posDict.posTypeId = requestBody.posTypeId,
-    posDict.posLevelId = requestBody.posLevelId,
-    posDict.posExecutiveId =  requestBody.posExecutiveId?requestBody.posExecutiveId:null,
-    posDict.posDictExecutiveField = requestBody.posDictExecutiveField?requestBody.posDictExecutiveField:"",
-    posDict.posDictArea = requestBody.posDictArea?requestBody.posDictArea:"",
-    posDict.isSpecial = requestBody.isSpecial,
-    // this.posDictRepository.merge(posDict, requestBody);
-    await this.posDictRepository.save(posDict);
+    (posDict.posDictName = requestBody.posDictName),
+      (posDict.posDictField = requestBody.posDictField),
+      (posDict.posTypeId = requestBody.posTypeId),
+      (posDict.posLevelId = requestBody.posLevelId),
+      (posDict.posExecutiveId = requestBody.posExecutiveId ? requestBody.posExecutiveId : null),
+      (posDict.posDictExecutiveField = requestBody.posDictExecutiveField
+        ? requestBody.posDictExecutiveField
+        : ""),
+      (posDict.posDictArea = requestBody.posDictArea ? requestBody.posDictArea : ""),
+      (posDict.isSpecial = requestBody.isSpecial),
+      // this.posDictRepository.merge(posDict, requestBody);
+      await this.posDictRepository.save(posDict);
     return new HttpSuccess();
   }
 
@@ -2553,15 +2557,13 @@ export class PositionController extends Controller {
       where: { id: String(body.posLevel) },
     });
 
-       if (body.typeCommand == "APPOINTED" || body.typeCommand == "MOVE") {
-         conditionA =
-           "positions.posTypeId LIKE :posType AND positions.posLevelId LIKE :posLevel";
-       } else if (body.typeCommand == "APPOINT") {
-         conditionA = "posType.posTypeRank > :posTypeRank";
-       } else if (body.typeCommand == "SLIP") {
-         conditionA =
-           "positions.posTypeId LIKE :posType AND posLevel.posLevelRank > :posLevelRank";
-       }
+    if (body.typeCommand == "APPOINTED" || body.typeCommand == "MOVE") {
+      conditionA = "positions.posTypeId LIKE :posType AND positions.posLevelId LIKE :posLevel";
+    } else if (body.typeCommand == "APPOINT") {
+      conditionA = "posType.posTypeRank > :posTypeRank";
+    } else if (body.typeCommand == "SLIP") {
+      conditionA = "positions.posTypeId LIKE :posType AND posLevel.posLevelRank > :posLevelRank";
+    }
 
     if (body.isAll == false) {
       if (body.node === 0) {
@@ -3132,6 +3134,12 @@ export class PositionController extends Controller {
           posMaster.current_holder.firstName +
           " " +
           posMaster.current_holder.lastName;
+        // Construct org path
+        const _root = posMaster.orgRoot ? `${posMaster.orgRoot.orgRootName}` : "";
+        const _child1 = posMaster.orgChild1 ? `${posMaster.orgChild1.orgChild1Name}/` : "";
+        const _child2 = posMaster.orgChild2 ? `${posMaster.orgChild2.orgChild2Name}/` : "";
+        const _child3 = posMaster.orgChild3 ? `${posMaster.orgChild3.orgChild3Name}/` : "";
+        const _child4 = posMaster.orgChild4 ? `${posMaster.orgChild4.orgChild4Name}/` : "";
         return {
           id: posMaster.id,
           node: node,
@@ -3147,9 +3155,13 @@ export class PositionController extends Controller {
           orgShortname: shortName,
           isSit: posMaster.isSit,
           name: fullname,
+          prefix: posMaster.current_holder.prefix,
+          firstName: posMaster.current_holder.firstName,
+          lastName: posMaster.current_holder.lastName,
           profileId: posMaster.current_holder.id,
           citizenId: posMaster.current_holder.citizenId,
           position: posMaster.current_holder.position,
+          organizationName: `${_child4}${_child3}${_child2}${_child1}${_root}`,
         };
       }),
     );