Merge branch 'develop' into dev

* develop:
  fix
  #208 and update migration
  migration
  migration
  revert
  #206
  migration
  fix
  #54

src/app.ts

@@ -66,9 +66,7 @@ async function main() {
     }
   });
 
-  // const cronTime_Oct = "0 0 1 10 *";
-  // Test #1912
-  const cronTime_Oct = "0 0 4 11 *";
+  const cronTime_Oct = "0 0 1 10 *";
   cron.schedule(cronTime_Oct, async () => {
     try {
       const commandController = new CommandController();

src/controllers/AuthRoleController.ts

@@ -6,6 +6,7 @@ import {
   Patch,
   Path,
   Post,
+  Query,
   Request,
   Route,
   Security,
@@ -36,8 +37,21 @@ export class AuthRoleController extends Controller {
   private redis = require("redis");
 
   @Get("list")
-  public async listAuthRole() {
-    const getList = await this.authRoleRepo.find();
+  public async listAuthRole(
+    @Request() req: RequestWithUser,
+    @Query("isAdminVisibled") isAdminVisibled : string = "false",
+  ) {
+    let condition: any = {};
+    if(isAdminVisibled.toLowerCase() === "true"){
+      condition = { isAdminVisibled: true };
+    }else{
+      condition = {};
+    }
+    const getList = await this.authRoleRepo.find(
+      {
+        where: condition,
+      }
+    );
     // if (!getList || getList.length === 0) {
     //   throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
     // }
@@ -161,6 +175,7 @@ export class AuthRoleController extends Controller {
     body: {
       roleName: string;
       roleDescription: string;
+      isAdminVisibled?: boolean;
       authRoleAttrs: Array<{
         // id: string;
         authSysId: string;
@@ -187,6 +202,7 @@ export class AuthRoleController extends Controller {
       }));
 
       Object.assign(record, {
+        isAdminVisibled: body.isAdminVisibled?body.isAdminVisibled:false,
         roleName: body.roleName,
         roleDescription: body.roleDescription,
         lastUpdateFullName: req.user.name,

src/controllers/PositionController.ts

@@ -3704,7 +3704,9 @@ export class PositionController extends Controller {
       dataMaster.current_holderId = _null;
     }
     await this.posMasterRepository.save(dataMaster, { data: request });
-    await CreatePosMasterHistoryOfficer(dataMaster.id, request);
+    if (chkRevision?.orgRevisionIsCurrent) {
+      await CreatePosMasterHistoryOfficer(dataMaster.id, request);
+    }
     setLogDataDiff(request, { before, after: dataMaster });
 
     return new HttpSuccess();

src/controllers/ProfileController.ts

@@ -2886,8 +2886,8 @@ export class ProfileController extends Controller {
     } else if ((posMaster?.current_holder?.posLevel?.posLevelAuthority ?? null) == "GOVERNOR") {
       return new HttpSuccess({ data: [], total: 0 });
     }
-    console.log(posMaster);
-    console.log(posMaster.id);
+    // console.log(posMaster);
+    // console.log(posMaster.id);
     let condition: any = {
       orgRootId: posMaster.orgRootId,
       id: Not(posMaster.current_holderId || ""),
@@ -2917,9 +2917,9 @@ export class ProfileController extends Controller {
       condition.isDirector = true;
       conditionNow.isDirector = true;
     }
-    console.log(condition);
-    console.log("------------------");
-    console.log(conditionNow);
+    // console.log(condition);
+    // console.log("------------------");
+    // console.log(conditionNow);
     if (body.isAct == true) {
       const [lists, total] = await AppDataSource.getRepository(viewDirectorActing)
         .createQueryBuilder("viewDirectorActing")
@@ -2928,6 +2928,7 @@ export class ProfileController extends Controller {
             qb.orWhere(condition).orWhere(conditionNow);
           }),
         )
+        .andWhere("viewDirectorActing.isProbation = :isProbation", { isProbation: false })
         .andWhere(
           new Brackets((qb) => {
             qb.orWhere(
@@ -2992,6 +2993,7 @@ export class ProfileController extends Controller {
             qb.orWhere(condition).orWhere(conditionNow);
           }),
         )
+        .andWhere("viewDirector.isProbation = :isProbation", { isProbation: false })
         .andWhere(
           new Brackets((qb) => {
             qb.orWhere(

src/controllers/UserController.ts

@@ -758,11 +758,21 @@ export class KeycloakController extends Controller {
   }
 
   @Get("user/role/{id}")
-  async getRoleUser(@Path("id") id: string) {
+  async getRoleUser(@Request() req: RequestWithUser,@Path("id") id: string) {
+    
     const profile = await this.profileRepo.findOne({
       where: { keycloak: id },
       relations: ["roleKeycloaks"],
     });
+    
+    if (
+      req.user.sub === id &&
+      req.user.role.some(x => x === 'ADMIN') &&
+      !req.user.role.some(x => x === 'SUPER_ADMIN') 
+    ) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่มีสิทธิ์เข้าถึงข้อมูลนี้");
+    }
+
     if (!profile) {
       const profileEmp = await this.profileEmpRepo.findOne({
         where: { keycloak: id, employeeClass: "PERM" },

src/entities/ApiHistory.ts

@@ -6,17 +6,17 @@ import { ApiName } from "./ApiName";
 @Entity("apiHistory")
 export class ApiHistory extends EntityBase {
   @Column({
+    type: 'longtext',
     nullable: true,
     comment: "header",
-    length: 255,
-    default: null,
+    default: null, 
   })
   headerApi: string;
 
   @Column({
+    type: 'longtext',
     nullable: true,
     comment: "token",
-    length: 255,
     default: null,
   })
   tokenApi: string;

src/entities/view/viewDirector.ts

@@ -8,6 +8,8 @@ import { ViewColumn, ViewEntity } from "typeorm";
         profile.lastName AS lastName,
         profile.citizenId AS citizenId,
         profile.position AS position,
+        profile.keycloak AS keycloakId,
+        profile.isProbation AS isProbation,
         CONCAT(
             CASE 
                 WHEN posMaster.orgChild1Id IS NULL THEN orgRoot.orgRootShortName
@@ -31,6 +33,21 @@ import { ViewColumn, ViewEntity } from "typeorm";
         posMaster.orgChild3Id AS orgChild3Id,
         posMaster.orgChild4Id AS orgChild4Id,
         CONCAT(posMaster.id, profile.id) AS \`key\`,
+        (
+          SELECT hrms_organization.acting.actFullNameKeycloakId
+          FROM hrms_organization.view_director_acting acting
+          WHERE ((hrms_organization.acting.Id = hrms_organization.posMaster.current_holderId)
+          AND (hrms_organization.acting.orgRootId = hrms_organization.posMaster.orgRootId)
+          AND ((hrms_organization.acting.orgChild1Id = hrms_organization.posMaster.orgChild1Id)
+          OR (hrms_organization.acting.orgChild1Id IS NULL))
+          AND ((hrms_organization.acting.orgChild2Id = hrms_organization.posMaster.orgChild2Id)
+          OR (hrms_organization.acting.orgChild2Id IS NULL))
+          AND ((hrms_organization.acting.orgChild3Id = hrms_organization.posMaster.orgChild3Id)
+          OR (hrms_organization.acting.orgChild3Id IS NULL))
+          AND ((hrms_organization.acting.orgChild4Id = hrms_organization.posMaster.orgChild4Id)
+          OR (hrms_organization.acting.orgChild4Id IS NULL)))
+          LIMIT 1
+        ) AS actFullNameKeycloakId,
         (
           SELECT actFullNameId 
           FROM view_director_acting AS acting

src/entities/view/viewDirectorActing.ts

@@ -8,6 +8,7 @@ import { ViewColumn, ViewEntity } from "typeorm";
         \`profileChild\`.\`lastName\` AS \`lastName\`,
         \`profileChild\`.\`citizenId\` AS \`citizenId\`,
         \`profileChild\`.\`position\` AS \`position\`,
+        \`profile\`.\`isProbation\` AS \`isProbation\`,
         CONCAT((CASE
                     WHEN (\`posMaster\`.\`orgChild1Id\` IS NULL) THEN \`orgRootChild\`.\`orgRootShortName\`
                     WHEN (\`posMaster\`.\`orgChild2Id\` IS NULL) THEN \`orgChild1Child\`.\`orgChild1ShortName\`
@@ -29,6 +30,10 @@ import { ViewColumn, ViewEntity } from "typeorm";
         \`posMaster\`.\`orgChild2Id\` AS \`orgChild2Id\`,
         \`posMaster\`.\`orgChild3Id\` AS \`orgChild3Id\`,
         \`posMaster\`.\`orgChild4Id\` AS \`orgChild4Id\`,
+        CONCAT(\`hrms_organization\`.\`posMaster\`.\`id\`,
+                \`profileChild\`.\`id\`) AS \`key\`,
+        \`hrms_organization\`.\`profile\`.\`id\` AS \`actFullNameId\`,
+        \`hrms_organization\`.\`profile\`.\`keycloak\` AS \`actFullNameKeycloakId\`,
         CONCAT(\`posMaster\`.\`id\`, \`profileChild\`.\`id\`) AS \`key\`,
         \`profile\`.\`id\` AS \`actFullNameId\`,
         CONCAT(\`profile\`.\`prefix\`,
@@ -71,6 +76,8 @@ export class viewDirectorActing {
   @ViewColumn()
   position: string;
   @ViewColumn()
+  isProbation: string;
+  @ViewColumn()
   posNo: string;
   @ViewColumn()
   posLevel: string;

src/migration/1762243747843-update_size_headerApi_and_tokenApi_field_ApiHistoryTable.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateSizeHeaderApiAndTokenApiFieldApiHistoryTable1762243747843 implements MigrationInterface {
+    name = 'UpdateSizeHeaderApiAndTokenApiFieldApiHistoryTable1762243747843'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` DROP COLUMN \`headerApi\``);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` ADD \`headerApi\` longtext NULL COMMENT 'header'`);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` DROP COLUMN \`tokenApi\``);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` ADD \`tokenApi\` longtext NULL COMMENT 'token'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` DROP COLUMN \`tokenApi\``);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` ADD \`tokenApi\` varchar(255) NULL COMMENT 'token'`);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` DROP COLUMN \`headerApi\``);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` ADD \`headerApi\` varchar(255) NULL COMMENT 'header'`);
+    }
+
+}

src/migration/1762489522691-update_viewDirectior_and_viewDirectiorActing.ts

@@ -0,0 +1,292 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateViewDirectiorAndViewDirectiorActing1762489522691 implements MigrationInterface {
+    name = 'UpdateViewDirectiorAndViewDirectiorActing1762489522691'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DELETE FROM \`hrms_organization\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW", "view_director_acting", "hrms_organization"]);
+        await queryRunner.query(`DROP VIEW IF EXISTS \`view_director_acting\``);
+        // await queryRunner.query(`INSERT INTO \`hrms_organization\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["hrms_organization", "VIEW", "view_director", "SELECT \n        profile.id AS Id,\n        profile.prefix AS prefix,\n        profile.firstName AS firstName,\n        profile.lastName AS lastName,\n        profile.citizenId AS citizenId,\n        profile.position AS position,\n        CONCAT(\n            CASE \n                WHEN posMaster.orgChild1Id IS NULL THEN orgRoot.orgRootShortName\n                WHEN posMaster.orgChild2Id IS NULL THEN orgChild1.orgChild1ShortName\n                WHEN posMaster.orgChild3Id IS NULL THEN orgChild2.orgChild2ShortName\n                WHEN posMaster.orgChild4Id IS NULL THEN orgChild3.orgChild3ShortName\n                ELSE orgChild4.orgChild4ShortName\n            END,\n            posMaster.posMasterNo\n        ) AS posNo,\n        posMaster.isDirector AS isDirector,\n        posLevel.posLevelName AS posLevel,\n        posType.posTypeName AS posType,\n        posExecutive.posExecutiveName AS posExecutiveName,\n        orgRoot.isDeputy AS isDeputy,\n        orgChild1.isOfficer AS isOfficer,\n        posMaster.orgRevisionId AS orgRevisionId,\n        posMaster.orgRootId AS orgRootId,\n        posMaster.orgChild1Id AS orgChild1Id,\n        posMaster.orgChild2Id AS orgChild2Id,\n        posMaster.orgChild3Id AS orgChild3Id,\n        posMaster.orgChild4Id AS orgChild4Id,\n        CONCAT(posMaster.id, profile.id) AS `key`,\n        (\n          SELECT hrms_organization.acting.actFullNameKeycloakId\n          FROM hrms_organization.view_director_acting acting\n          WHERE ((hrms_organization.acting.Id = hrms_organization.posMaster.current_holderId)\n          AND (hrms_organization.acting.orgRootId = hrms_organization.posMaster.orgRootId)\n          AND ((hrms_organization.acting.orgChild1Id = hrms_organization.posMaster.orgChild1Id)\n          OR (hrms_organization.acting.orgChild1Id IS NULL))\n          AND ((hrms_organization.acting.orgChild2Id = hrms_organization.posMaster.orgChild2Id)\n          OR (hrms_organization.acting.orgChild2Id IS NULL))\n          AND ((hrms_organization.acting.orgChild3Id = hrms_organization.posMaster.orgChild3Id)\n          OR (hrms_organization.acting.orgChild3Id IS NULL))\n          AND ((hrms_organization.acting.orgChild4Id = hrms_organization.posMaster.orgChild4Id)\n          OR (hrms_organization.acting.orgChild4Id IS NULL)))\n          LIMIT 1\n        ) AS actFullNameKeycloakId,\n        (\n          SELECT actFullNameId \n          FROM view_director_acting AS acting\n          WHERE acting.Id = posMaster.current_holderId \n          AND acting.orgRootId = posMaster.orgRootId \n          AND (acting.orgChild1Id = posMaster.orgChild1Id OR acting.orgChild1Id IS NULL)\n          AND (acting.orgChild2Id = posMaster.orgChild2Id OR acting.orgChild2Id IS NULL)\n          AND (acting.orgChild3Id = posMaster.orgChild3Id OR acting.orgChild3Id IS NULL)\n          AND (acting.orgChild4Id = posMaster.orgChild4Id OR acting.orgChild4Id IS NULL)\n          LIMIT 1\n        ) AS actFullNameId,\n        (\n          SELECT actFullName \n          FROM view_director_acting AS acting\n          WHERE acting.Id = posMaster.current_holderId \n          AND acting.orgRootId = posMaster.orgRootId \n          AND (acting.orgChild1Id = posMaster.orgChild1Id OR acting.orgChild1Id IS NULL)\n          AND (acting.orgChild2Id = posMaster.orgChild2Id OR acting.orgChild2Id IS NULL)\n          AND (acting.orgChild3Id = posMaster.orgChild3Id OR acting.orgChild3Id IS NULL)\n          AND (acting.orgChild4Id = posMaster.orgChild4Id OR acting.orgChild4Id IS NULL)\n          LIMIT 1\n        ) AS actFullName\n    FROM\n        posMaster\n        JOIN profile ON posMaster.current_holderId = profile.id\n        LEFT JOIN orgRoot ON posMaster.orgRootId = orgRoot.id\n        LEFT JOIN orgChild1 ON posMaster.orgChild1Id = orgChild1.id\n        LEFT JOIN orgChild2 ON posMaster.orgChild2Id = orgChild2.id\n        LEFT JOIN orgChild3 ON posMaster.orgChild3Id = orgChild3.id\n        LEFT JOIN orgChild4 ON posMaster.orgChild4Id = orgChild4.id\n        JOIN posLevel ON profile.posLevelId = posLevel.id\n        JOIN posType ON profile.posTypeId = posType.id\n        LEFT JOIN position ON posMaster.id = position.posMasterId\n        LEFT JOIN posExecutive ON position.posExecutiveId = posExecutive.id\n        INNER JOIN orgRevision ON posMaster.orgRevisionId = orgRevision.id\n    WHERE\n        (position.positionIsSelected = TRUE)\n        AND (orgRevision.orgRevisionIsCurrent = TRUE\n        AND orgRevision.orgRevisionIsDraft = FALSE)"]);
+        await queryRunner.query(`CREATE VIEW \`view_director_acting\` AS SELECT 
+        \`profileChild\`.\`id\` AS \`Id\`,
+        \`profileChild\`.\`prefix\` AS \`prefix\`,
+        \`profileChild\`.\`firstName\` AS \`firstName\`,
+        \`profileChild\`.\`lastName\` AS \`lastName\`,
+        \`profileChild\`.\`citizenId\` AS \`citizenId\`,
+        \`profileChild\`.\`position\` AS \`position\`,
+        \`profile\`.\`isProbation\` AS \`isProbation\`,
+        CONCAT((CASE
+                    WHEN (\`posMaster\`.\`orgChild1Id\` IS NULL) THEN \`orgRootChild\`.\`orgRootShortName\`
+                    WHEN (\`posMaster\`.\`orgChild2Id\` IS NULL) THEN \`orgChild1Child\`.\`orgChild1ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild3Id\` IS NULL) THEN \`orgChild2Child\`.\`orgChild2ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild4Id\` IS NULL) THEN \`orgChild3Child\`.\`orgChild3ShortName\`
+                    ELSE \`orgChild4Child\`.\`orgChild4ShortName\`
+                END),
+                \`posMaster\`.\`posMasterNo\`) AS \`posNo\`,
+        \`posMasterChild\`.\`isDirector\` AS \`isDirectorChild\`,
+        \`posMaster\`.\`isDirector\` AS \`isDirector\`,
+        \`posLevel\`.\`posLevelName\` AS \`posLevel\`,
+        \`posType\`.\`posTypeName\` AS \`posType\`,
+        \`posExecutive\`.\`posExecutiveName\` AS \`posExecutiveName\`,
+        \`orgRoot\`.\`isDeputy\` AS \`isDeputy\`,
+        \`orgChild1\`.\`isOfficer\` AS \`isOfficer\`,
+        \`posMaster\`.\`orgRevisionId\` AS \`orgRevisionId\`,
+        \`posMaster\`.\`orgRootId\` AS \`orgRootId\`,
+        \`posMaster\`.\`orgChild1Id\` AS \`orgChild1Id\`,
+        \`posMaster\`.\`orgChild2Id\` AS \`orgChild2Id\`,
+        \`posMaster\`.\`orgChild3Id\` AS \`orgChild3Id\`,
+        \`posMaster\`.\`orgChild4Id\` AS \`orgChild4Id\`,
+        CONCAT(\`hrms_organization\`.\`profile\`.\`keycloak\`) AS \`actFullNameKeycloakId\`,
+        CONCAT(\`posMaster\`.\`id\`, \`profileChild\`.\`id\`) AS \`key\`,
+        \`profile\`.\`id\` AS \`actFullNameId\`,
+        CONCAT(\`profile\`.\`prefix\`,
+                \`profile\`.\`firstName\`,
+                ' ',
+                \`profile\`.\`lastName\`) AS \`actFullName\`
+    FROM
+        (((((((((((((((\`posMasterAct\`
+        JOIN \`posMaster\` \`posMasterChild\` ON ((\`posMasterAct\`.\`posMasterChildId\` = \`posMasterChild\`.\`id\`)))
+        JOIN \`profile\` \`profileChild\` ON ((\`posMasterChild\`.\`current_holderId\` = \`profileChild\`.\`id\`)))
+        LEFT JOIN \`orgRoot\` \`orgRootChild\` ON ((\`posMasterChild\`.\`orgRootId\` = \`orgRootChild\`.\`id\`)))
+        LEFT JOIN \`orgChild1\` \`orgChild1Child\` ON ((\`posMasterChild\`.\`orgChild1Id\` = \`orgChild1Child\`.\`id\`)))
+        LEFT JOIN \`orgChild2\` \`orgChild2Child\` ON ((\`posMasterChild\`.\`orgChild2Id\` = \`orgChild2Child\`.\`id\`)))
+        LEFT JOIN \`orgChild3\` \`orgChild3Child\` ON ((\`posMasterChild\`.\`orgChild3Id\` = \`orgChild3Child\`.\`id\`)))
+        LEFT JOIN \`orgChild4\` \`orgChild4Child\` ON ((\`posMasterChild\`.\`orgChild4Id\` = \`orgChild4Child\`.\`id\`)))
+        JOIN \`posLevel\` ON ((\`profileChild\`.\`posLevelId\` = \`posLevel\`.\`id\`)))
+        JOIN \`posType\` ON ((\`profileChild\`.\`posTypeId\` = \`posType\`.\`id\`)))
+        JOIN \`posMaster\` ON ((\`posMasterAct\`.\`posMasterId\` = \`posMaster\`.\`id\`)))
+        LEFT JOIN \`orgRoot\` ON ((\`posMaster\`.\`orgRootId\` = \`orgRoot\`.\`id\`)))
+        LEFT JOIN \`orgChild1\` ON ((\`posMaster\`.\`orgChild1Id\` = \`orgChild1\`.\`id\`)))
+        JOIN \`profile\` ON ((\`posMaster\`.\`current_holderId\` = \`profile\`.\`id\`)))
+        LEFT JOIN \`position\` ON ((\`posMasterChild\`.\`id\` = \`position\`.\`posMasterId\`)))
+        LEFT JOIN \`posExecutive\` ON ((\`position\`.\`posExecutiveId\` = \`posExecutive\`.\`id\`)))
+    WHERE
+        (\`position\`.\`positionIsSelected\` = TRUE)`);
+
+        await queryRunner.query(`DELETE FROM \`hrms_organization\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW", "view_director", "hrms_organization"]);
+        await queryRunner.query(`DROP VIEW IF EXISTS \`view_director\``);
+        // await queryRunner.query(`INSERT INTO \`hrms_organization\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["hrms_organization", "VIEW", "view_employee_pos_master", "SELECT \n    employeePosMaster.id,\n    employeePosMaster.posMasterNoPrefix,\n    employeePosMaster.posMasterNo,\n    employeePosMaster.posMasterNoSuffix,\n    employeePosMaster.orgRevisionId,\n    employeePosMaster.orgRootId,\n    employeePosMaster.orgChild1Id,\n    employeePosMaster.orgChild2Id,\n    employeePosMaster.orgChild3Id,\n    employeePosMaster.orgChild4Id,\n    employeePosMaster.current_holderId,\n    profileEmployee.id as profileId,\n    profileEmployee.prefix,\n    profileEmployee.firstName,\n    profileEmployee.lastName,\n    profileEmployee.citizenId,\n    profileEmployee.position,\n    profileEmployee.amount,\n    profileEmployee.dateRetire,\n    profileEmployee.birthDate,\n    profileEmployee.salaryLevel,\n    profileEmployee.group,\n    orgRoot.id as rootId,\n    orgRoot.orgRootShortName,\n    orgRoot.orgRootOrder,\n    orgRoot.orgRootName,\n    orgChild1.id as child1Id,\n    orgChild1.orgChild1ShortName,\n    orgChild1.orgChild1Order,\n    orgChild1.orgChild1Name,\n    orgChild2.id as child2Id,\n    orgChild2.orgChild2ShortName,\n    orgChild2.orgChild2Order,\n    orgChild2.orgChild2Name,\n    orgChild3.id as child3Id,\n    orgChild3.orgChild3ShortName,\n    orgChild3.orgChild3Order,\n    orgChild3.orgChild3Name,\n    orgChild4.id as child4Id,\n    orgChild4.orgChild4ShortName,\n    orgChild4.orgChild4Order,\n    orgChild4.orgChild4Name,\n    position.id as positionId,\n    position.positionIsSelected,\n    position.posExecutiveId as positionPosExecutiveId,\n    position.isSpecial,\n    posExecutive.id as posExecutiveId,\n    posExecutive.posExecutiveName,\n    profileDiscipline.id as profileDisciplineId,\n    profileDiscipline.date as disCriplineDate,\n    profileLeave.id as profileLeaveId,\n    profileAssessment.id as profileAssessmentId,\n    profileAssessment.pointSum,\n    employeePosLevel.id as posLevelId,\n    employeePosLevel.posLevelName,\n\temployeePosType.id as posTypeId,\n    employeePosType.posTypeName,\n    employeePosType.posTypeShortName\n    FROM \n        employeePosMaster\n    LEFT JOIN \n        profileEmployee ON employeePosMaster.current_holderId = profileEmployee.id \n    LEFT JOIN \n        orgRoot ON employeePosMaster.orgRootId = orgRoot.id\n    LEFT JOIN \n        orgChild1 ON employeePosMaster.orgChild1Id = orgChild1.id\n    LEFT JOIN \n        orgChild2 ON employeePosMaster.orgChild2Id = orgChild2.id\n    LEFT JOIN \n        orgChild3 ON employeePosMaster.orgChild3Id = orgChild3.id\n    LEFT JOIN \n        orgChild4 ON employeePosMaster.orgChild4Id = orgChild4.id\n    LEFT JOIN \n        position ON employeePosMaster.id = position.posMasterId\n    LEFT JOIN \n        posExecutive ON position.posExecutiveId = posExecutive.id\n    LEFT JOIN (\n        SELECT *\n        FROM profileDisciplineEmployee pd1\n        WHERE pd1.date = (\n            SELECT MAX(pd2.date)\n            FROM profileDisciplineEmployee pd2\n            WHERE pd2.profileId = pd1.profileId\n        )\n    ) AS profileDiscipline ON profileDiscipline.profileId = profileEmployee.id\n    LEFT JOIN (\n    SELECT pl1.*\n    FROM profileLeave pl1\n    INNER JOIN (\n        SELECT profileId, MAX(createdAt) AS maxDate\n        FROM profileLeave\n        GROUP BY profileId\n    ) pl2 ON pl1.profileId = pl2.profileId\n         AND pl1.createdAt = pl2.maxDate\n    ) AS profileLeave ON profileLeave.profileId = employeePosMaster.current_holderId\n    LEFT JOIN (\n    SELECT pa1.*\n    FROM profileAssessment pa1\n    INNER JOIN (\n        SELECT profileId, MAX(createdAt) AS maxDate\n        FROM profileAssessment\n        GROUP BY profileId\n    ) pa2 ON pa1.profileId = pa2.profileId\n            AND pa1.createdAt = pa2.maxDate\n    ) AS profileAssessment \n     ON profileAssessment.profileId = profileEmployee.id\n    LEFT JOIN \n        employeePosLevel ON profileEmployee.posLevelId = employeePosLevel.id\n    LEFT JOIN \n        employeePosType ON profileEmployee.posTypeId = employeePosType.id\n    WHERE \t\n      employeePosMaster.current_holderId IS NOT NULL\n    ORDER BY \n        profileEmployee.citizenId ASC"]);
+        await queryRunner.query(`CREATE VIEW \`view_director\` AS SELECT 
+        profile.id AS Id,
+        profile.prefix AS prefix,
+        profile.firstName AS firstName,
+        profile.lastName AS lastName,
+        profile.citizenId AS citizenId,
+        profile.position AS position,
+        profile.keycloak AS keycloakId,
+        profile.isProbation AS isProbation,
+        CONCAT(
+            CASE 
+                WHEN posMaster.orgChild1Id IS NULL THEN orgRoot.orgRootShortName
+                WHEN posMaster.orgChild2Id IS NULL THEN orgChild1.orgChild1ShortName
+                WHEN posMaster.orgChild3Id IS NULL THEN orgChild2.orgChild2ShortName
+                WHEN posMaster.orgChild4Id IS NULL THEN orgChild3.orgChild3ShortName
+                ELSE orgChild4.orgChild4ShortName
+            END,
+            posMaster.posMasterNo
+        ) AS posNo,
+        posMaster.isDirector AS isDirector,
+        posLevel.posLevelName AS posLevel,
+        posType.posTypeName AS posType,
+        posExecutive.posExecutiveName AS posExecutiveName,
+        orgRoot.isDeputy AS isDeputy,
+        orgChild1.isOfficer AS isOfficer,
+        posMaster.orgRevisionId AS orgRevisionId,
+        posMaster.orgRootId AS orgRootId,
+        posMaster.orgChild1Id AS orgChild1Id,
+        posMaster.orgChild2Id AS orgChild2Id,
+        posMaster.orgChild3Id AS orgChild3Id,
+        posMaster.orgChild4Id AS orgChild4Id,
+        CONCAT(posMaster.id, profile.id) AS \`key\`,
+        (
+          SELECT hrms_organization.acting.actFullNameKeycloakId
+          FROM hrms_organization.view_director_acting acting
+          WHERE ((hrms_organization.acting.Id = hrms_organization.posMaster.current_holderId)
+          AND (hrms_organization.acting.orgRootId = hrms_organization.posMaster.orgRootId)
+          AND ((hrms_organization.acting.orgChild1Id = hrms_organization.posMaster.orgChild1Id)
+          OR (hrms_organization.acting.orgChild1Id IS NULL))
+          AND ((hrms_organization.acting.orgChild2Id = hrms_organization.posMaster.orgChild2Id)
+          OR (hrms_organization.acting.orgChild2Id IS NULL))
+          AND ((hrms_organization.acting.orgChild3Id = hrms_organization.posMaster.orgChild3Id)
+          OR (hrms_organization.acting.orgChild3Id IS NULL))
+          AND ((hrms_organization.acting.orgChild4Id = hrms_organization.posMaster.orgChild4Id)
+          OR (hrms_organization.acting.orgChild4Id IS NULL)))
+          LIMIT 1
+        ) AS actFullNameKeycloakId,
+        (
+          SELECT actFullNameId 
+          FROM view_director_acting AS acting
+          WHERE acting.Id = posMaster.current_holderId 
+          AND acting.orgRootId = posMaster.orgRootId 
+          AND (acting.orgChild1Id = posMaster.orgChild1Id OR acting.orgChild1Id IS NULL)
+          AND (acting.orgChild2Id = posMaster.orgChild2Id OR acting.orgChild2Id IS NULL)
+          AND (acting.orgChild3Id = posMaster.orgChild3Id OR acting.orgChild3Id IS NULL)
+          AND (acting.orgChild4Id = posMaster.orgChild4Id OR acting.orgChild4Id IS NULL)
+          LIMIT 1
+        ) AS actFullNameId,
+        (
+          SELECT actFullName 
+          FROM view_director_acting AS acting
+          WHERE acting.Id = posMaster.current_holderId 
+          AND acting.orgRootId = posMaster.orgRootId 
+          AND (acting.orgChild1Id = posMaster.orgChild1Id OR acting.orgChild1Id IS NULL)
+          AND (acting.orgChild2Id = posMaster.orgChild2Id OR acting.orgChild2Id IS NULL)
+          AND (acting.orgChild3Id = posMaster.orgChild3Id OR acting.orgChild3Id IS NULL)
+          AND (acting.orgChild4Id = posMaster.orgChild4Id OR acting.orgChild4Id IS NULL)
+          LIMIT 1
+        ) AS actFullName
+    FROM
+        posMaster
+        JOIN profile ON posMaster.current_holderId = profile.id
+        LEFT JOIN orgRoot ON posMaster.orgRootId = orgRoot.id
+        LEFT JOIN orgChild1 ON posMaster.orgChild1Id = orgChild1.id
+        LEFT JOIN orgChild2 ON posMaster.orgChild2Id = orgChild2.id
+        LEFT JOIN orgChild3 ON posMaster.orgChild3Id = orgChild3.id
+        LEFT JOIN orgChild4 ON posMaster.orgChild4Id = orgChild4.id
+        JOIN posLevel ON profile.posLevelId = posLevel.id
+        JOIN posType ON profile.posTypeId = posType.id
+        LEFT JOIN position ON posMaster.id = position.posMasterId
+        LEFT JOIN posExecutive ON position.posExecutiveId = posExecutive.id
+        INNER JOIN orgRevision ON posMaster.orgRevisionId = orgRevision.id
+    WHERE
+        (position.positionIsSelected = TRUE)
+        AND (orgRevision.orgRevisionIsCurrent = TRUE
+        AND orgRevision.orgRevisionIsDraft = FALSE)`);
+
+        await queryRunner.query(`INSERT INTO \`hrms_organization\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["hrms_organization", "VIEW", "view_current_tenure_employee", "WITH resultData AS (\n        SELECT\n            commandDateAffect,\n            positionName,\n            positionCee,\n            TIMESTAMPDIFF(\n                DAY,\n                LAG(MIN(commandDateAffect)) OVER (ORDER BY commandDateAffect), MIN(commandDateAffect)) AS days_diff,\n            TIMESTAMPDIFF(\n                DAY,\n                LAG(MIN(commandDateAffect)) OVER (ORDER BY commandDateAffect), MIN(commandDateAffect)) / 365.2524 AS 'Years',\n            TIMESTAMPDIFF(\n                DAY,\n                LAG(MIN(commandDateAffect)) OVER (ORDER BY commandDateAffect), MIN(commandDateAffect)) / 30.4375 % 12 AS 'Months',\n            TIMESTAMPDIFF(\n                DAY,\n                LAG(MIN(commandDateAffect)) OVER (ORDER BY commandDateAffect), MIN(commandDateAffect)) % 30.4375  AS 'Days',\n            posNo,\n            positionExecutive,\n            positionType,\n            positionLevel,\n            OrgRoot,\n            orgChild1,\n            orgChild2,\n            orgChild3,\n            orgChild4,\n            commandCode,\n            commandName,\n            commandNo,\n            commandYear,\n            remark,\n            profileEmployeeId,\n            ROW_NUMBER() OVER (PARTITION BY profileEmployeeId ORDER BY commandDateAffect ASC) AS orderNumber\n        FROM (\n            SELECT\n                commandDateAffect,\n                commandDateSign,\n                positionName,\n                positionCee,\n                posNo,\n                positionExecutive,\n                positionType,\n                positionLevel,\n                OrgRoot,\n                orgChild1,\n                orgChild2,\n                orgChild3,\n                orgChild4,\n                commandCode,\n                commandName,\n                commandNo,\n                commandYear,\n                remark,\n                profileEmployeeId,\n                LAG(commandDateSign) OVER (ORDER BY commandDateAffect ASC, commandDateSign ASC) AS prevCommandDateSign,\n                ROW_NUMBER() OVER (ORDER BY commandDateAffect ASC, commandDateSign ASC) -\n                ROW_NUMBER() OVER (PARTITION BY positionName ORDER BY commandDateAffect ASC, commandDateSign ASC) as groupedId\n            FROM\n                profileSalary\n            WHERE\n                commandCode IN (1, 2, 3, 4, 8, 10, 11, 12, 15, 16)\n            ORDER BY\n                commandDateAffect ASC, commandDateSign ASC\n            ) AS groupedPosition\n        WHERE\n            prevCommandDateSign IS NULL OR commandDateSign >= prevCommandDateSign\n        GROUP BY\n            profileEmployeeId, groupedId, positionName\n    )\n    SELECT\n        commandDateAffect,\n        positionName,\n        positionCee,\n        days_diff,\n        Years,\n        Months,\n        Days,\n        posNo,\n        positionExecutive,\n        positionType,\n        positionLevel,\n        OrgRoot,\n        orgChild1,\n        orgChild2,\n        orgChild3,\n        orgChild4,\n        commandCode,\n        commandName,\n        commandNo,\n        commandYear,\n        remark,\n        profileEmployeeId,\n        orderNumber\n    FROM resultData\n\n    UNION ALL\n\n    SELECT\n        CURDATE() AS commandDateAffect,\n        NULL AS positionName,\n        NULL AS positionCee,\n        TIMESTAMPDIFF(DAY, MAX(commandDateAffect), CURDATE()) AS days_diff,\n        TIMESTAMPDIFF(DAY, MAX(commandDateAffect), CURDATE()) / 365.2524 AS 'Years',\n        TIMESTAMPDIFF(DAY, MAX(commandDateAffect), CURDATE()) / 30.4375 % 12 AS 'Months',\n        TIMESTAMPDIFF(DAY, MAX(commandDateAffect), CURDATE()) % 30.4375 AS 'Days',\n        NULL AS posNo,\n        NULL AS positionExecutive,\n        NULL AS positionType,\n        NULL AS positionLevel,\n        NULL AS OrgRoot,\n        NULL AS orgChild1,\n        NULL AS orgChild2,\n        NULL AS orgChild3,\n        NULL AS orgChild4,\n        NULL AS commandCode,\n        NULL AS commandName,\n        NULL AS commandNo,\n        NULL AS commandYear,\n        NULL AS remark,\n        profileEmployeeId,\n        NULL AS orderNumber\n    FROM resultData"]);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DELETE FROM \`hrms_organization\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW", "view_director_acting", "hrms_organization"]);
+        await queryRunner.query(`DROP VIEW IF EXISTS \`view_director_acting\``);
+        await queryRunner.query(`CREATE VIEW \`view_director_acting\` AS SELECT 
+        \`profileChild\`.\`id\` AS \`Id\`,
+        \`profileChild\`.\`prefix\` AS \`prefix\`,
+        \`profileChild\`.\`firstName\` AS \`firstName\`,
+        \`profileChild\`.\`lastName\` AS \`lastName\`,
+        \`profileChild\`.\`citizenId\` AS \`citizenId\`,
+        \`profileChild\`.\`position\` AS \`position\`,
+        CONCAT((CASE
+                    WHEN (\`posMaster\`.\`orgChild1Id\` IS NULL) THEN \`orgRootChild\`.\`orgRootShortName\`
+                    WHEN (\`posMaster\`.\`orgChild2Id\` IS NULL) THEN \`orgChild1Child\`.\`orgChild1ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild3Id\` IS NULL) THEN \`orgChild2Child\`.\`orgChild2ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild4Id\` IS NULL) THEN \`orgChild3Child\`.\`orgChild3ShortName\`
+                    ELSE \`orgChild4Child\`.\`orgChild4ShortName\`
+                END),
+                \`posMaster\`.\`posMasterNo\`) AS \`posNo\`,
+        \`posMasterChild\`.\`isDirector\` AS \`isDirectorChild\`,
+        \`posMaster\`.\`isDirector\` AS \`isDirector\`,
+        \`posLevel\`.\`posLevelName\` AS \`posLevel\`,
+        \`posType\`.\`posTypeName\` AS \`posType\`,
+        \`posExecutive\`.\`posExecutiveName\` AS \`posExecutiveName\`,
+        \`orgRoot\`.\`isDeputy\` AS \`isDeputy\`,
+        \`orgChild1\`.\`isOfficer\` AS \`isOfficer\`,
+        \`posMaster\`.\`orgRevisionId\` AS \`orgRevisionId\`,
+        \`posMaster\`.\`orgRootId\` AS \`orgRootId\`,
+        \`posMaster\`.\`orgChild1Id\` AS \`orgChild1Id\`,
+        \`posMaster\`.\`orgChild2Id\` AS \`orgChild2Id\`,
+        \`posMaster\`.\`orgChild3Id\` AS \`orgChild3Id\`,
+        \`posMaster\`.\`orgChild4Id\` AS \`orgChild4Id\`,
+        CONCAT(\`posMaster\`.\`id\`, \`profileChild\`.\`id\`) AS \`key\`,
+        \`profile\`.\`id\` AS \`actFullNameId\`,
+        CONCAT(\`profile\`.\`prefix\`,
+                \`profile\`.\`firstName\`,
+                ' ',
+                \`profile\`.\`lastName\`) AS \`actFullName\`
+    FROM
+        (((((((((((((((\`posMasterAct\`
+        JOIN \`posMaster\` \`posMasterChild\` ON ((\`posMasterAct\`.\`posMasterChildId\` = \`posMasterChild\`.\`id\`)))
+        JOIN \`profile\` \`profileChild\` ON ((\`posMasterChild\`.\`current_holderId\` = \`profileChild\`.\`id\`)))
+        LEFT JOIN \`orgRoot\` \`orgRootChild\` ON ((\`posMasterChild\`.\`orgRootId\` = \`orgRootChild\`.\`id\`)))
+        LEFT JOIN \`orgChild1\` \`orgChild1Child\` ON ((\`posMasterChild\`.\`orgChild1Id\` = \`orgChild1Child\`.\`id\`)))
+        LEFT JOIN \`orgChild2\` \`orgChild2Child\` ON ((\`posMasterChild\`.\`orgChild2Id\` = \`orgChild2Child\`.\`id\`)))
+        LEFT JOIN \`orgChild3\` \`orgChild3Child\` ON ((\`posMasterChild\`.\`orgChild3Id\` = \`orgChild3Child\`.\`id\`)))
+        LEFT JOIN \`orgChild4\` \`orgChild4Child\` ON ((\`posMasterChild\`.\`orgChild4Id\` = \`orgChild4Child\`.\`id\`)))
+        JOIN \`posLevel\` ON ((\`profileChild\`.\`posLevelId\` = \`posLevel\`.\`id\`)))
+        JOIN \`posType\` ON ((\`profileChild\`.\`posTypeId\` = \`posType\`.\`id\`)))
+        JOIN \`posMaster\` ON ((\`posMasterAct\`.\`posMasterId\` = \`posMaster\`.\`id\`)))
+        LEFT JOIN \`orgRoot\` ON ((\`posMaster\`.\`orgRootId\` = \`orgRoot\`.\`id\`)))
+        LEFT JOIN \`orgChild1\` ON ((\`posMaster\`.\`orgChild1Id\` = \`orgChild1\`.\`id\`)))
+        JOIN \`profile\` ON ((\`posMaster\`.\`current_holderId\` = \`profile\`.\`id\`)))
+        LEFT JOIN \`position\` ON ((\`posMasterChild\`.\`id\` = \`position\`.\`posMasterId\`)))
+        LEFT JOIN \`posExecutive\` ON ((\`position\`.\`posExecutiveId\` = \`posExecutive\`.\`id\`)))
+    WHERE
+        (\`position\`.\`positionIsSelected\` = TRUE)`);
+
+        // await queryRunner.query(`INSERT INTO \`hrms_organization\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["hrms_organization", "VIEW", "view_director_acting", "SELECT \n        `profileChild`.`id` AS `Id`,\n        `profileChild`.`prefix` AS `prefix`,\n        `profileChild`.`firstName` AS `firstName`,\n        `profileChild`.`lastName` AS `lastName`,\n        `profileChild`.`citizenId` AS `citizenId`,\n        `profileChild`.`position` AS `position`,\n        CONCAT((CASE\n                    WHEN (`posMaster`.`orgChild1Id` IS NULL) THEN `orgRootChild`.`orgRootShortName`\n                    WHEN (`posMaster`.`orgChild2Id` IS NULL) THEN `orgChild1Child`.`orgChild1ShortName`\n                    WHEN (`posMaster`.`orgChild3Id` IS NULL) THEN `orgChild2Child`.`orgChild2ShortName`\n                    WHEN (`posMaster`.`orgChild4Id` IS NULL) THEN `orgChild3Child`.`orgChild3ShortName`\n                    ELSE `orgChild4Child`.`orgChild4ShortName`\n                END),\n                `posMaster`.`posMasterNo`) AS `posNo`,\n        `posMasterChild`.`isDirector` AS `isDirectorChild`,\n        `posMaster`.`isDirector` AS `isDirector`,\n        `posLevel`.`posLevelName` AS `posLevel`,\n        `posType`.`posTypeName` AS `posType`,\n        `posExecutive`.`posExecutiveName` AS `posExecutiveName`,\n        `orgRoot`.`isDeputy` AS `isDeputy`,\n        `orgChild1`.`isOfficer` AS `isOfficer`,\n        `posMaster`.`orgRevisionId` AS `orgRevisionId`,\n        `posMaster`.`orgRootId` AS `orgRootId`,\n        `posMaster`.`orgChild1Id` AS `orgChild1Id`,\n        `posMaster`.`orgChild2Id` AS `orgChild2Id`,\n        `posMaster`.`orgChild3Id` AS `orgChild3Id`,\n        `posMaster`.`orgChild4Id` AS `orgChild4Id`,\n        CONCAT(`posMaster`.`id`, `profileChild`.`id`) AS `key`,\n        `profile`.`id` AS `actFullNameId`,\n        CONCAT(`profile`.`prefix`,\n                `profile`.`firstName`,\n                ' ',\n                `profile`.`lastName`) AS `actFullName`\n    FROM\n        (((((((((((((((`posMasterAct`\n        JOIN `posMaster` `posMasterChild` ON ((`posMasterAct`.`posMasterChildId` = `posMasterChild`.`id`)))\n        JOIN `profile` `profileChild` ON ((`posMasterChild`.`current_holderId` = `profileChild`.`id`)))\n        LEFT JOIN `orgRoot` `orgRootChild` ON ((`posMasterChild`.`orgRootId` = `orgRootChild`.`id`)))\n        LEFT JOIN `orgChild1` `orgChild1Child` ON ((`posMasterChild`.`orgChild1Id` = `orgChild1Child`.`id`)))\n        LEFT JOIN `orgChild2` `orgChild2Child` ON ((`posMasterChild`.`orgChild2Id` = `orgChild2Child`.`id`)))\n        LEFT JOIN `orgChild3` `orgChild3Child` ON ((`posMasterChild`.`orgChild3Id` = `orgChild3Child`.`id`)))\n        LEFT JOIN `orgChild4` `orgChild4Child` ON ((`posMasterChild`.`orgChild4Id` = `orgChild4Child`.`id`)))\n        JOIN `posLevel` ON ((`profileChild`.`posLevelId` = `posLevel`.`id`)))\n        JOIN `posType` ON ((`profileChild`.`posTypeId` = `posType`.`id`)))\n        JOIN `posMaster` ON ((`posMasterAct`.`posMasterId` = `posMaster`.`id`)))\n        LEFT JOIN `orgRoot` ON ((`posMaster`.`orgRootId` = `orgRoot`.`id`)))\n        LEFT JOIN `orgChild1` ON ((`posMaster`.`orgChild1Id` = `orgChild1`.`id`)))\n        JOIN `profile` ON ((`posMaster`.`current_holderId` = `profile`.`id`)))\n        LEFT JOIN `position` ON ((`posMasterChild`.`id` = `position`.`posMasterId`)))\n        LEFT JOIN `posExecutive` ON ((`position`.`posExecutiveId` = `posExecutive`.`id`)))\n    WHERE\n        (`position`.`positionIsSelected` = TRUE)"]);
+        await queryRunner.query(`DELETE FROM \`hrms_organization\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW", "view_director", "hrms_organization"]);
+        await queryRunner.query(`DROP VIEW IF EXISTS \`view_director\``);
+        await queryRunner.query(`CREATE VIEW \`view_director\` AS SELECT 
+        profile.id AS Id,
+        profile.prefix AS prefix,
+        profile.firstName AS firstName,
+        profile.lastName AS lastName,
+        profile.citizenId AS citizenId,
+        profile.position AS position,
+        CONCAT(
+            CASE 
+                WHEN posMaster.orgChild1Id IS NULL THEN orgRoot.orgRootShortName
+                WHEN posMaster.orgChild2Id IS NULL THEN orgChild1.orgChild1ShortName
+                WHEN posMaster.orgChild3Id IS NULL THEN orgChild2.orgChild2ShortName
+                WHEN posMaster.orgChild4Id IS NULL THEN orgChild3.orgChild3ShortName
+                ELSE orgChild4.orgChild4ShortName
+            END,
+            posMaster.posMasterNo
+        ) AS posNo,
+        posMaster.isDirector AS isDirector,
+        posLevel.posLevelName AS posLevel,
+        posType.posTypeName AS posType,
+        posExecutive.posExecutiveName AS posExecutiveName,
+        orgRoot.isDeputy AS isDeputy,
+        orgChild1.isOfficer AS isOfficer,
+        posMaster.orgRevisionId AS orgRevisionId,
+        posMaster.orgRootId AS orgRootId,
+        posMaster.orgChild1Id AS orgChild1Id,
+        posMaster.orgChild2Id AS orgChild2Id,
+        posMaster.orgChild3Id AS orgChild3Id,
+        posMaster.orgChild4Id AS orgChild4Id,
+        CONCAT(posMaster.id, profile.id) AS \`key\`,
+        (
+          SELECT actFullNameId 
+          FROM view_director_acting AS acting
+          WHERE acting.Id = posMaster.current_holderId 
+          AND acting.orgRootId = posMaster.orgRootId 
+          AND (acting.orgChild1Id = posMaster.orgChild1Id OR acting.orgChild1Id IS NULL)
+          AND (acting.orgChild2Id = posMaster.orgChild2Id OR acting.orgChild2Id IS NULL)
+          AND (acting.orgChild3Id = posMaster.orgChild3Id OR acting.orgChild3Id IS NULL)
+          AND (acting.orgChild4Id = posMaster.orgChild4Id OR acting.orgChild4Id IS NULL)
+          LIMIT 1
+        ) AS actFullNameId,
+        (
+          SELECT actFullName 
+          FROM view_director_acting AS acting
+          WHERE acting.Id = posMaster.current_holderId 
+          AND acting.orgRootId = posMaster.orgRootId 
+          AND (acting.orgChild1Id = posMaster.orgChild1Id OR acting.orgChild1Id IS NULL)
+          AND (acting.orgChild2Id = posMaster.orgChild2Id OR acting.orgChild2Id IS NULL)
+          AND (acting.orgChild3Id = posMaster.orgChild3Id OR acting.orgChild3Id IS NULL)
+          AND (acting.orgChild4Id = posMaster.orgChild4Id OR acting.orgChild4Id IS NULL)
+          LIMIT 1
+        ) AS actFullName
+    FROM
+        posMaster
+        JOIN profile ON posMaster.current_holderId = profile.id
+        LEFT JOIN orgRoot ON posMaster.orgRootId = orgRoot.id
+        LEFT JOIN orgChild1 ON posMaster.orgChild1Id = orgChild1.id
+        LEFT JOIN orgChild2 ON posMaster.orgChild2Id = orgChild2.id
+        LEFT JOIN orgChild3 ON posMaster.orgChild3Id = orgChild3.id
+        LEFT JOIN orgChild4 ON posMaster.orgChild4Id = orgChild4.id
+        JOIN posLevel ON profile.posLevelId = posLevel.id
+        JOIN posType ON profile.posTypeId = posType.id
+        LEFT JOIN position ON posMaster.id = position.posMasterId
+        LEFT JOIN posExecutive ON position.posExecutiveId = posExecutive.id
+        INNER JOIN orgRevision ON posMaster.orgRevisionId = orgRevision.id
+    WHERE
+        (position.positionIsSelected = TRUE)
+        AND (orgRevision.orgRevisionIsCurrent = TRUE
+        AND orgRevision.orgRevisionIsDraft = FALSE)`);
+
+        // await queryRunner.query(`INSERT INTO \`hrms_organization\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["hrms_organization", "VIEW", "view_director", "SELECT \n        profile.id AS Id,\n        profile.prefix AS prefix,\n        profile.firstName AS firstName,\n        profile.lastName AS lastName,\n        profile.citizenId AS citizenId,\n        profile.position AS position,\n        CONCAT(\n            CASE \n                WHEN posMaster.orgChild1Id IS NULL THEN orgRoot.orgRootShortName\n                WHEN posMaster.orgChild2Id IS NULL THEN orgChild1.orgChild1ShortName\n                WHEN posMaster.orgChild3Id IS NULL THEN orgChild2.orgChild2ShortName\n                WHEN posMaster.orgChild4Id IS NULL THEN orgChild3.orgChild3ShortName\n                ELSE orgChild4.orgChild4ShortName\n            END,\n            posMaster.posMasterNo\n        ) AS posNo,\n        posMaster.isDirector AS isDirector,\n        posLevel.posLevelName AS posLevel,\n        posType.posTypeName AS posType,\n        posExecutive.posExecutiveName AS posExecutiveName,\n        orgRoot.isDeputy AS isDeputy,\n        orgChild1.isOfficer AS isOfficer,\n        posMaster.orgRevisionId AS orgRevisionId,\n        posMaster.orgRootId AS orgRootId,\n        posMaster.orgChild1Id AS orgChild1Id,\n        posMaster.orgChild2Id AS orgChild2Id,\n        posMaster.orgChild3Id AS orgChild3Id,\n        posMaster.orgChild4Id AS orgChild4Id,\n        CONCAT(posMaster.id, profile.id) AS `key`,\n        (\n          SELECT actFullNameId \n          FROM view_director_acting AS acting\n          WHERE acting.Id = posMaster.current_holderId \n          AND acting.orgRootId = posMaster.orgRootId \n          AND (acting.orgChild1Id = posMaster.orgChild1Id OR acting.orgChild1Id IS NULL)\n          AND (acting.orgChild2Id = posMaster.orgChild2Id OR acting.orgChild2Id IS NULL)\n          AND (acting.orgChild3Id = posMaster.orgChild3Id OR acting.orgChild3Id IS NULL)\n          AND (acting.orgChild4Id = posMaster.orgChild4Id OR acting.orgChild4Id IS NULL)\n          LIMIT 1\n        ) AS actFullNameId,\n        (\n          SELECT actFullName \n          FROM view_director_acting AS acting\n          WHERE acting.Id = posMaster.current_holderId \n          AND acting.orgRootId = posMaster.orgRootId \n          AND (acting.orgChild1Id = posMaster.orgChild1Id OR acting.orgChild1Id IS NULL)\n          AND (acting.orgChild2Id = posMaster.orgChild2Id OR acting.orgChild2Id IS NULL)\n          AND (acting.orgChild3Id = posMaster.orgChild3Id OR acting.orgChild3Id IS NULL)\n          AND (acting.orgChild4Id = posMaster.orgChild4Id OR acting.orgChild4Id IS NULL)\n          LIMIT 1\n        ) AS actFullName\n    FROM\n        posMaster\n        JOIN profile ON posMaster.current_holderId = profile.id\n        LEFT JOIN orgRoot ON posMaster.orgRootId = orgRoot.id\n        LEFT JOIN orgChild1 ON posMaster.orgChild1Id = orgChild1.id\n        LEFT JOIN orgChild2 ON posMaster.orgChild2Id = orgChild2.id\n        LEFT JOIN orgChild3 ON posMaster.orgChild3Id = orgChild3.id\n        LEFT JOIN orgChild4 ON posMaster.orgChild4Id = orgChild4.id\n        JOIN posLevel ON profile.posLevelId = posLevel.id\n        JOIN posType ON profile.posTypeId = posType.id\n        LEFT JOIN position ON posMaster.id = position.posMasterId\n        LEFT JOIN posExecutive ON position.posExecutiveId = posExecutive.id\n        INNER JOIN orgRevision ON posMaster.orgRevisionId = orgRevision.id\n    WHERE\n        (position.positionIsSelected = TRUE)\n        AND (orgRevision.orgRevisionIsCurrent = TRUE\n        AND orgRevision.orgRevisionIsDraft = FALSE)"]);
+    }
+
+}