no message

src/controllers/ProfileEmployeeController.ts

@@ -66,6 +66,7 @@ import { ProfileInsignia } from "../entities/ProfileInsignia";
 import { ProfileLeave } from "../entities/ProfileLeave";
 import permission from "../interfaces/permission";
 import axios from "axios";
+import { Position } from "../entities/Position";
 @Route("api/v1/org/profile-employee")
 @Tags("ProfileEmployee")
 @Security("bearerAuth")
@@ -107,6 +108,8 @@ export class ProfileEmployeeController extends Controller {
   private profileEducationRepository = AppDataSource.getRepository(ProfileEducation);
   private profileInsigniaRepo = AppDataSource.getRepository(ProfileInsignia);
   private profileLeaveRepository = AppDataSource.getRepository(ProfileLeave);
+  private positionRepository = AppDataSource.getRepository(Position);
+
   /**
    * report ประวัติแบบย่อ ลูกจ้าง
    *
@@ -272,9 +275,7 @@ export class ProfileEmployeeController extends Controller {
           : "-",
       ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
       educations: Education,
-      url: ImgUrl
+      url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
-        ? ImgUrl
-        : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
     };
 
     return new HttpSuccess({
@@ -730,23 +731,35 @@ export class ProfileEmployeeController extends Controller {
           : "",
       telephone:
         profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "",
-          url: ImgUrl
+      url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
-            ? ImgUrl
-            : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
       url1: _ImgUrl[0] ? _ImgUrl[0] : null,
-          yearUpload1: profiles.profileAvatars[0] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))  : null,
+      yearUpload1: profiles.profileAvatars[0]
+        ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))
+        : null,
       url2: _ImgUrl[1] ? _ImgUrl[1] : null,
-          yearUpload2: profiles.profileAvatars[1] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[1].createdAt))  : null,
+      yearUpload2: profiles.profileAvatars[1]
+        ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[1].createdAt))
+        : null,
       url3: _ImgUrl[2] ? _ImgUrl[2] : null,
-          yearUpload3: profiles.profileAvatars[2] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[2].createdAt))  : null,
+      yearUpload3: profiles.profileAvatars[2]
+        ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[2].createdAt))
+        : null,
       url4: _ImgUrl[3] ? _ImgUrl[3] : null,
-          yearUpload4: profiles.profileAvatars[3] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[3].createdAt))  : null,
+      yearUpload4: profiles.profileAvatars[3]
+        ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[3].createdAt))
+        : null,
       url5: _ImgUrl[4] ? _ImgUrl[4] : null,
-          yearUpload5: profiles.profileAvatars[4] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[4].createdAt))  : null,
+      yearUpload5: profiles.profileAvatars[4]
+        ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[4].createdAt))
+        : null,
       url6: _ImgUrl[5] ? _ImgUrl[5] : null,
-          yearUpload6: profiles.profileAvatars[5] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[5].createdAt))  : null,
+      yearUpload6: profiles.profileAvatars[5]
+        ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[5].createdAt))
+        : null,
       url7: _ImgUrl[6] ? _ImgUrl[6] : null,
-          yearUpload7: profiles.profileAvatars[6] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[6].createdAt))  : null,
+      yearUpload7: profiles.profileAvatars[6]
+        ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[6].createdAt))
+        : null,
       insignias,
       leaves,
       certs,
@@ -1861,98 +1874,106 @@ export class ProfileEmployeeController extends Controller {
       orgRevisionPublish = await this.orgRevisionRepo
         .createQueryBuilder("orgRevision")
         .where("orgRevision.id = :revisionId", { revisionId })
-        // .andWhere("orgRevision.orgRevisionIsDraft = false")
-        // .andWhere("orgRevision.orgRevisionIsCurrent = true")
         .getOne();
       if (!orgRevisionPublish) {
         throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบแบบร่างโครงสร้าง");
       }
     }
 
+    const posMaster =
+      profile.current_holders == null ||
+      profile.current_holders.length == 0 ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) == null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id);
+
+    const root =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot;
+    const child1 =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
+        null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1;
+    const child2 =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
+        null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2;
+    const child3 =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
+        null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3;
+    const child4 =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
+        null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4;
+
+    const position = await this.positionRepository.findOne({
+      relations: ["posExecutive"],
+      where: {
+        posMasterId: posMaster?.id,
+      },
+    });
+
     const _profile = {
       profileId: profile.id,
-      rank: profile.rank,
       prefix: profile.prefix,
+      rank: profile.rank,
+      avatar: profile.avatar,
+      isProbation: profile.isProbation,
+      avatarName: profile.avatarName,
       firstName: profile.firstName,
       lastName: profile.lastName,
       citizenId: profile.citizenId,
+      birthDate: profile.birthDate,
       position: profile.position,
+      leaveDate: profile.dateLeave,
+      dateStart: profile.dateStart,
+      dateRetireLaw: profile.dateRetireLaw,
+      posMaster: posMaster == null ? null : posMaster.posMasterNo,
+      posMasterNo: posMaster == null ? null : posMaster.posMasterNo,
       posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName,
       posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,
       posLevelId: profile.posLevel == null ? null : profile.posLevel.id,
       posTypeName: profile.posType == null ? null : profile.posType.posTypeName,
       posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank,
       posTypeId: profile.posType == null ? null : profile.posType.id,
-      rootId:
+      posExecutiveName:
-        profile.current_holders == null ||
+        position == null || position.posExecutive == null
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot ==
-          null
           ? null
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+          : position.posExecutive.posExecutiveName,
-              ?.orgRootId,
+      posExecutivePriority:
-      root:
+        position == null || position.posExecutive == null
-        profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot ==
-          null
           ? null
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot
+          : position.posExecutive.posExecutivePriority,
-              .orgRootName,
+      posExecutiveId:
-      child1Id:
+        position == null || position.posExecutive == null ? null : position.posExecutive.id,
-        profile.current_holders == null ||
+      rootId: root == null ? null : root.id,
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
+      root: root == null ? null : root.orgRootName,
-          null
+      rootShortName: root == null ? null : root.orgRootShortName,
-          ? null
+      child1Id: child1 == null ? null : child1.id,
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+      child1: child1 == null ? null : child1.orgChild1Name,
-              ?.orgChild1Id,
+      child1ShortName: child1 == null ? null : child1.orgChild1ShortName,
-      child1:
+      child2Id: child2 == null ? null : child2.id,
-        profile.current_holders == null ||
+      child2: child2 == null ? null : child2.orgChild2Name,
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
+      child2ShortName: child2 == null ? null : child2.orgChild2ShortName,
-          null
+      child3Id: child3 == null ? null : child3.id,
-          ? null
+      child3: child3 == null ? null : child3.orgChild3Name,
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1
+      child3ShortName: child3 == null ? null : child3.orgChild3ShortName,
-              .orgChild1Name,
+      child4Id: child4 == null ? null : child4.id,
-      child2Id:
+      child4: child4 == null ? null : child4.orgChild4Name,
-        profile.current_holders == null ||
+      child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
+      node: null,
-          null
+      nodeId: null,
-          ? null
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-              ?.orgChild2Id,
-      child2:
-        profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
-          null
-          ? null
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2
-              .orgChild2Name,
-      child3Id:
-        profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
-          null
-          ? null
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-              ?.orgChild3Id,
-      child3:
-        profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
-          null
-          ? null
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3
-              .orgChild3Name,
-      child4Id:
-        profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
-          null
-          ? null
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-              ?.orgChild4Id,
-      child4:
-        profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
-          null
-          ? null
-          : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4
-              .orgChild4Name,
       salary:
         profile && profile.profileSalarys.length > 0 ? profile.profileSalarys[0].amount : null,
     };