closed#2190 post to exprofile if production only

src/controllers/CommandController.ts

@@ -99,7 +99,7 @@ import {
   CreatePosMasterHistoryOfficer,
 } from "../services/PositionService";
 import { PostRetireToExprofile } from "./ExRetirementController";
-import { LeaveType } from "../entities/LeaveType"
+import { LeaveType } from "../entities/LeaveType";
 @Route("api/v1/org/command")
 @Tags("Command")
 @Security("bearerAuth")
@@ -219,8 +219,8 @@ export class CommandController extends Controller {
           _data.child1 != undefined && _data.child1 != null
             ? _data.child1[0] != null
               ? `current_holders.orgChild1Id IN (:...child1)`
-              // : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
-              : `current_holders.orgChild1Id is null`
+              : // : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
+                `current_holders.orgChild1Id is null`
             : "1=1",
           {
             child1: _data.child1,
@@ -298,7 +298,7 @@ export class CommandController extends Controller {
             status == null || status == undefined || status == ""
               ? null
               : status.trim().toLocaleUpperCase() == "NEW" ||
-                status.trim().toLocaleUpperCase() == "DRAFT"
+                  status.trim().toLocaleUpperCase() == "DRAFT"
                 ? ["NEW", "DRAFT"]
                 : [status.trim().toLocaleUpperCase()],
         },
@@ -428,7 +428,7 @@ export class CommandController extends Controller {
       });
       if (profile) {
         const currentHolder = profile!.current_holders?.find(
-          x =>
+          (x) =>
             x.orgRevision?.orgRevisionIsDraft === false &&
             x.orgRevision?.orgRevisionIsCurrent === true,
         );
@@ -457,29 +457,26 @@ export class CommandController extends Controller {
           order: { createdAt: "DESC" },
           relations: { posExecutive: true },
         });
-        const operator = Object.assign(
-          new CommandOperator(),
-          {
-            profileId: profile?.id,
-            prefix: profile?.prefix,
-            firstName: profile?.firstName,
-            lastName: profile?.lastName,
-            posNo: posNo,
-            posType: profile?.posType?.posTypeName ?? null,
-            posLevel: profile?.posLevel?.posLevelName ?? null,
-            position: position?.positionName ?? null,
-            positionExecutive: position?.posExecutive?.posExecutiveName ?? null,
-            roleName: "เจ้าหน้าที่ดำเนินการ",
-            orderNo: 1,
-            commandId: command.id,
-            createdUserId: request.user.sub,
-            createdFullName: request.user.name,
-            createdAt: now,
-            lastUpdateUserId: request.user.sub,
-            lastUpdateFullName: request.user.name,
-            lastUpdatedAt: now,
-          }
-        );
+        const operator = Object.assign(new CommandOperator(), {
+          profileId: profile?.id,
+          prefix: profile?.prefix,
+          firstName: profile?.firstName,
+          lastName: profile?.lastName,
+          posNo: posNo,
+          posType: profile?.posType?.posTypeName ?? null,
+          posLevel: profile?.posLevel?.posLevelName ?? null,
+          position: position?.positionName ?? null,
+          positionExecutive: position?.posExecutive?.posExecutiveName ?? null,
+          roleName: "เจ้าหน้าที่ดำเนินการ",
+          orderNo: 1,
+          commandId: command.id,
+          createdUserId: request.user.sub,
+          createdFullName: request.user.name,
+          createdAt: now,
+          lastUpdateUserId: request.user.sub,
+          lastUpdateFullName: request.user.name,
+          lastUpdatedAt: now,
+        });
         await this.commandOperatorRepository.save(operator);
       }
     }
@@ -521,7 +518,7 @@ export class CommandController extends Controller {
       commandTypeName: command.commandType?.name || null,
       commandCode: command.commandType?.code || null,
       commandSysId: command.commandType?.commandSysId || null,
-      createdUserId: command.createdUserId
+      createdUserId: command.createdUserId,
     };
     return new HttpSuccess(_command);
   }
@@ -733,7 +730,7 @@ export class CommandController extends Controller {
   /**
    * API แก้ไขเงินเดือนทั้งกลุ่ม
    *
-   * @summary API แก้ไขเงินเดือนทั้งกลุ่ม 
+   * @summary API แก้ไขเงินเดือนทั้งกลุ่ม
    *
    * @param {string} id  Id คำสั่ง
    */
@@ -802,8 +799,8 @@ export class CommandController extends Controller {
       .PostData(request, path + "/delete", {
         refIds: [commandRecive.refId],
       })
-      .then(async (res) => { })
-      .catch(() => { });
+      .then(async (res) => {})
+      .catch(() => {});
 
     const commandId = commandRecive.commandId;
     await this.commandReciveRepository.delete(commandRecive.id);
@@ -846,8 +843,8 @@ export class CommandController extends Controller {
       .PostData(request, path + "/delete", {
         refIds: [commandRecive.refId],
       })
-      .then(async (res) => { })
-      .catch(() => { });
+      .then(async (res) => {})
+      .catch(() => {});
 
     const commandId = commandRecive.commandId;
     await this.commandReciveRepository.delete(commandRecive.id);
@@ -890,8 +887,8 @@ export class CommandController extends Controller {
       .PostData(request, path + "/delete", {
         refIds: [commandRecive.refId],
       })
-      .then(async (res) => { })
-      .catch(() => { });
+      .then(async (res) => {})
+      .catch(() => {});
 
     const commandId = commandRecive.commandId;
     await this.commandReciveRepository.delete(commandRecive.id);
@@ -1175,8 +1172,8 @@ export class CommandController extends Controller {
       .PostData(request, path + "/delete", {
         refIds: command.commandRecives.map((x) => x.refId),
       })
-      .then(async (res) => { })
-      .catch(() => { });
+      .then(async (res) => {})
+      .catch(() => {});
 
     await this.commandReciveRepository.delete({ commandId: command.id });
     command.status = "CANCEL";
@@ -1241,8 +1238,8 @@ export class CommandController extends Controller {
       .PostData(request, path + "/delete", {
         refIds: command.commandRecives.map((x) => x.refId),
       })
-      .then(async (res) => { })
-      .catch(() => { });
+      .then(async (res) => {})
+      .catch(() => {});
 
     await this.commandSendCCRepository.delete({ commandSendId: In(commandSend.map((x) => x.id)) });
     await this.commandReciveRepository.delete({ commandId: command.id });
@@ -1394,11 +1391,11 @@ export class CommandController extends Controller {
     let profiles =
       command && command.commandRecives.length > 0
         ? command.commandRecives
-          .filter((x) => x.profileId != null)
-          .map((x) => ({
-            receiverUserId: x.profileId,
-            notiLink: "",
-          }))
+            .filter((x) => x.profileId != null)
+            .map((x) => ({
+              receiverUserId: x.profileId,
+              notiLink: "",
+            }))
         : [];
 
     const msgNoti = {
@@ -1430,8 +1427,8 @@ export class CommandController extends Controller {
           refIds: command.commandRecives.filter((x) => x.refId != null).map((x) => x.refId),
           status: "WAITING",
         })
-        .then(async (res) => { })
-        .catch(() => { });
+        .then(async (res) => {})
+        .catch(() => {});
       await this.commandRepository.save(command);
     } else {
       const path = commandTypePath(command.commandType.code);
@@ -1568,7 +1565,7 @@ export class CommandController extends Controller {
         );
         await this.profileRepository.save(profiles);
       }
-    } catch { }
+    } catch {}
 
     type = "EMPLOYEE";
     try {
@@ -1600,7 +1597,7 @@ export class CommandController extends Controller {
         );
         await this.profileEmployeeRepository.save(profiles);
       }
-    } catch { }
+    } catch {}
 
     return new HttpSuccess();
   }
@@ -1664,7 +1661,7 @@ export class CommandController extends Controller {
           }),
         );
       }
-    } catch { }
+    } catch {}
 
     type = "EMPLOYEE";
     try {
@@ -1719,7 +1716,7 @@ export class CommandController extends Controller {
           }),
         );
       }
-    } catch { }
+    } catch {}
 
     return new HttpSuccess();
   }
@@ -1932,7 +1929,7 @@ export class CommandController extends Controller {
         .then((x) => {
           res = x;
         })
-        .catch((x) => { });
+        .catch((x) => {});
     }
 
     let _command;
@@ -2010,76 +2007,76 @@ export class CommandController extends Controller {
             profile?.current_holders.length == 0
               ? null
               : profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) !=
-                null &&
-                profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild4 != null
+                    null &&
+                  profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
+                    ?.orgChild4 != null
                 ? `${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4.orgChild4ShortName} ${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.posMasterNo}`
                 : profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) !=
-                  null &&
-                  profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                    ?.orgChild3 != null
+                      null &&
+                    profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
+                      ?.orgChild3 != null
                   ? `${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3.orgChild3ShortName} ${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.posMasterNo}`
                   : profile?.current_holders.find(
-                    (x) => x.orgRevisionId == orgRevisionActive?.id,
-                  ) != null &&
-                    profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                      ?.orgChild2 != null
-                    ? `${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2.orgChild2ShortName} ${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.posMasterNo}`
-                    : profile?.current_holders.find(
-                      (x) => x.orgRevisionId == orgRevisionActive?.id,
-                    ) != null &&
-                      profile?.current_holders.find(
-                        (x) => x.orgRevisionId == orgRevisionActive?.id,
-                      )?.orgChild1 != null
-                      ? `${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1.orgChild1ShortName} ${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.posMasterNo}`
-                      : profile?.current_holders.find(
                         (x) => x.orgRevisionId == orgRevisionActive?.id,
                       ) != null &&
+                      profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
+                        ?.orgChild2 != null
+                    ? `${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2.orgChild2ShortName} ${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.posMasterNo}`
+                    : profile?.current_holders.find(
+                          (x) => x.orgRevisionId == orgRevisionActive?.id,
+                        ) != null &&
                         profile?.current_holders.find(
                           (x) => x.orgRevisionId == orgRevisionActive?.id,
-                        )?.orgRoot != null
+                        )?.orgChild1 != null
+                      ? `${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1.orgChild1ShortName} ${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.posMasterNo}`
+                      : profile?.current_holders.find(
+                            (x) => x.orgRevisionId == orgRevisionActive?.id,
+                          ) != null &&
+                          profile?.current_holders.find(
+                            (x) => x.orgRevisionId == orgRevisionActive?.id,
+                          )?.orgRoot != null
                         ? `${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot.orgRootShortName} ${profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.posMasterNo}`
                         : null;
 
           const root =
             profile?.current_holders == null ||
-              profile?.current_holders.length == 0 ||
-              profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
+            profile?.current_holders.length == 0 ||
+            profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
               ? null
               : profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                ?.orgRoot;
+                  ?.orgRoot;
 
           const child1 =
             profile?.current_holders == null ||
-              profile?.current_holders.length == 0 ||
-              profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
+            profile?.current_holders.length == 0 ||
+            profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
               ? null
               : profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                ?.orgChild1;
+                  ?.orgChild1;
 
           const child2 =
             profile?.current_holders == null ||
-              profile?.current_holders.length == 0 ||
-              profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
+            profile?.current_holders.length == 0 ||
+            profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
               ? null
               : profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                ?.orgChild2;
+                  ?.orgChild2;
 
           const child3 =
             profile?.current_holders == null ||
-              profile?.current_holders.length == 0 ||
-              profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
+            profile?.current_holders.length == 0 ||
+            profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
               ? null
               : profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                ?.orgChild3;
+                  ?.orgChild3;
 
           const child4 =
             profile?.current_holders == null ||
-              profile?.current_holders.length == 0 ||
-              profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
+            profile?.current_holders.length == 0 ||
+            profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
               ? null
               : profile?.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                ?.orgChild4;
+                  ?.orgChild4;
 
           let _root = root?.orgRootName;
           let _child1 = child1?.orgChild1Name;
@@ -2140,10 +2137,10 @@ export class CommandController extends Controller {
               commandCode != "C-PM-21"
                 ? profile?.isLeave == false
                   ? (_child4 == null ? "" : _child4 + "\n") +
-                  (_child3 == null ? "" : _child3 + "\n") +
-                  (_child2 == null ? "" : _child2 + "\n") +
-                  (_child1 == null ? "" : _child1 + "\n") +
-                  (_root == null ? "" : _root)
+                    (_child3 == null ? "" : _child3 + "\n") +
+                    (_child2 == null ? "" : _child2 + "\n") +
+                    (_child1 == null ? "" : _child1 + "\n") +
+                    (_root == null ? "" : _root)
                   : orgLeave
                 : profileTemp.org,
             fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
@@ -2158,8 +2155,8 @@ export class CommandController extends Controller {
               commandCode != "C-PM-21"
                 ? profile?.posType && profile?.posLevel
                   ? Extension.ToThaiNumber(
-                    `${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`,
-                  )
+                      `${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`,
+                    )
                   : "-"
                 : Extension.ToThaiNumber(profileTemp.posLevel),
             posNo:
@@ -2173,19 +2170,19 @@ export class CommandController extends Controller {
               ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile?.dateRetire))
               : profile?.birthDate && commandCode == "C-PM-21"
                 ? Extension.ToThaiNumber(
-                  Extension.ToThaiShortDate_monthYear(
-                    new Date(
-                      profile.birthDate.getFullYear() + 60,
-                      profile.birthDate.getMonth(),
-                      profile.birthDate.getDate(),
+                    Extension.ToThaiShortDate_monthYear(
+                      new Date(
+                        profile.birthDate.getFullYear() + 60,
+                        profile.birthDate.getMonth(),
+                        profile.birthDate.getDate(),
+                      ),
                     ),
-                  ),
-                )
+                  )
                 : "-",
             dateExecute: command.commandExcecuteDate
               ? Extension.ToThaiNumber(
-                Extension.ToThaiShortDate_monthYear(command.commandExcecuteDate),
-              )
+                  Extension.ToThaiShortDate_monthYear(command.commandExcecuteDate),
+                )
               : "-",
             remark: x.remarkVertical ? x.remarkVertical : "-",
           };
@@ -2286,7 +2283,7 @@ export class CommandController extends Controller {
       .then(async (res) => {
         _command = res;
       })
-      .catch(() => { });
+      .catch(() => {});
 
     let issue =
       command.isBangkok == "OFFICE"
@@ -2320,7 +2317,7 @@ export class CommandController extends Controller {
         firstName: true,
         lastName: true,
         roleName: true,
-        orderNo: true
+        orderNo: true,
       },
       where: { commandId: command.id },
       order: { orderNo: "ASC" },
@@ -2341,15 +2338,18 @@ export class CommandController extends Controller {
           command.commandExcecuteDate == null
             ? ""
             : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandExcecuteDate)),
-        operators: operators.length > 0
-          ? operators.map(x => ({
-            fullName: `${x.prefix ?? ""}${x.firstName ?? ""} ${x.lastName ?? ""}`,
-            roleName: x.roleName
-          }))
-          : [{
-            fullName: "",
-            roleName: "เจ้าหน้าที่ดำเนินการ"
-          }]
+        operators:
+          operators.length > 0
+            ? operators.map((x) => ({
+                fullName: `${x.prefix ?? ""}${x.firstName ?? ""} ${x.lastName ?? ""}`,
+                roleName: x.roleName,
+              }))
+            : [
+                {
+                  fullName: "",
+                  roleName: "เจ้าหน้าที่ดำเนินการ",
+                },
+              ],
       },
     });
   }
@@ -2594,7 +2594,7 @@ export class CommandController extends Controller {
       });
       if (profile) {
         const currentHolder = profile!.current_holders?.find(
-          x =>
+          (x) =>
             x.orgRevision?.orgRevisionIsDraft === false &&
             x.orgRevision?.orgRevisionIsCurrent === true,
         );
@@ -2623,29 +2623,26 @@ export class CommandController extends Controller {
           order: { createdAt: "DESC" },
           relations: { posExecutive: true },
         });
-        const operator = Object.assign(
-          new CommandOperator(),
-          {
-            profileId: profile?.id,
-            prefix: profile?.prefix,
-            firstName: profile?.firstName,
-            lastName: profile?.lastName,
-            posNo: posNo,
-            posType: profile?.posType?.posTypeName ?? null,
-            posLevel: profile?.posLevel?.posLevelName ?? null,
-            position: position?.positionName ?? null,
-            positionExecutive: position?.posExecutive?.posExecutiveName ?? null,
-            roleName: "เจ้าหน้าที่ดำเนินการ",
-            orderNo: 1,
-            commandId: command.id,
-            createdUserId: request.user.sub,
-            createdFullName: request.user.name,
-            createdAt: now,
-            lastUpdateUserId: request.user.sub,
-            lastUpdateFullName: request.user.name,
-            lastUpdatedAt: now,
-          }
-        );
+        const operator = Object.assign(new CommandOperator(), {
+          profileId: profile?.id,
+          prefix: profile?.prefix,
+          firstName: profile?.firstName,
+          lastName: profile?.lastName,
+          posNo: posNo,
+          posType: profile?.posType?.posTypeName ?? null,
+          posLevel: profile?.posLevel?.posLevelName ?? null,
+          position: position?.positionName ?? null,
+          positionExecutive: position?.posExecutive?.posExecutiveName ?? null,
+          roleName: "เจ้าหน้าที่ดำเนินการ",
+          orderNo: 1,
+          commandId: command.id,
+          createdUserId: request.user.sub,
+          createdFullName: request.user.name,
+          createdAt: now,
+          lastUpdateUserId: request.user.sub,
+          lastUpdateFullName: request.user.name,
+          lastUpdatedAt: now,
+        });
         await this.commandOperatorRepository.save(operator);
       }
     }
@@ -2657,8 +2654,8 @@ export class CommandController extends Controller {
         refIds: requestBody.persons.filter((x) => x.refId != null).map((x) => x.refId),
         status: "REPORT",
       })
-      .then(async (res) => { })
-      .catch(() => { });
+      .then(async (res) => {})
+      .catch(() => {});
     let order =
       command.commandRecives == null || command.commandRecives.length <= 0
         ? 0
@@ -3431,27 +3428,27 @@ export class CommandController extends Controller {
                 ? x.orgChild1.orgChild1Name + "\n" + x.orgRoot.orgRootName
                 : x.orgChild3 == null
                   ? x.orgChild2.orgChild2Name +
-                  "\n" +
-                  x.orgChild1.orgChild1Name +
-                  "\n" +
-                  x.orgRoot.orgRootName
-                  : x.orgChild4 == null
-                    ? x.orgChild3.orgChild3Name +
-                    "\n" +
-                    x.orgChild2.orgChild2Name +
                     "\n" +
                     x.orgChild1.orgChild1Name +
                     "\n" +
                     x.orgRoot.orgRootName
+                  : x.orgChild4 == null
+                    ? x.orgChild3.orgChild3Name +
+                      "\n" +
+                      x.orgChild2.orgChild2Name +
+                      "\n" +
+                      x.orgChild1.orgChild1Name +
+                      "\n" +
+                      x.orgRoot.orgRootName
                     : x.orgChild4.orgChild4Name +
-                    "\n" +
-                    x.orgChild3.orgChild3Name +
-                    "\n" +
-                    x.orgChild2.orgChild2Name +
-                    "\n" +
-                    x.orgChild1.orgChild1Name +
-                    "\n" +
-                    x.orgRoot.orgRootName,
+                      "\n" +
+                      x.orgChild3.orgChild3Name +
+                      "\n" +
+                      x.orgChild2.orgChild2Name +
+                      "\n" +
+                      x.orgChild1.orgChild1Name +
+                      "\n" +
+                      x.orgRoot.orgRootName,
           positionName: x?.current_holder.position ?? _null,
           profileId: x?.current_holder.id ?? _null,
         });
@@ -3980,8 +3977,8 @@ export class CommandController extends Controller {
           relations: {
             roleKeycloaks: true,
             posType: true,
-            posLevel: true
-          }
+            posLevel: true,
+          },
         });
         if (!profile) {
           throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทะเบียนประวัตินี้");
@@ -4066,7 +4063,7 @@ export class CommandController extends Controller {
               orgChild2: true,
               orgChild3: true,
               orgChild4: true,
-            }
+            },
           });
           orgRootRef = curPosMaster?.orgRoot ?? null;
           orgChild1Ref = curPosMaster?.orgChild1 ?? null;
@@ -4258,28 +4255,17 @@ export class CommandController extends Controller {
             organizeName = names.join(" ");
           }
           await PostRetireToExprofile(
-            // profile.citizenId ?? "",
-            // profile.prefix ?? "",
-            // profile.firstName ?? "",
-            // profile.lastName ?? "",
-            // item.commandDateAffect?.getFullYear().toString() ??  "",
-            // profile.position,
-            // profile.posType?.posTypeName ?? "",
-            // profile.posLevel?.posLevelName ?? "",
-            // item.commandDateAffect ?? new Date(),
-            // organizeName,
-            // clearProfile.retireTypeName ?? "",
-            "310190004095X",
-            "จ.ส.อ.",
-            "dev",
-            "hrms",
-            "2026",
-            "เจ้าหน้าที่จัดเก็บรายได้",
-            "อื่นๆ",
-            "C 3",
-            new Date(2026, 0, 1),
-            "สำนักงานเขตบางกอกใหญ่",
-            "เกษียณ"
+            profile.citizenId ?? "",
+            profile.prefix ?? "",
+            profile.firstName ?? "",
+            profile.lastName ?? "",
+            item.commandDateAffect?.getFullYear().toString() ?? "",
+            profile.position,
+            profile.posType?.posTypeName ?? "",
+            profile.posLevel?.posLevelName ?? "",
+            item.commandDateAffect ?? new Date(),
+            organizeName,
+            clearProfile.retireTypeName ?? "",
           );
         }
       }),
@@ -4379,8 +4365,8 @@ export class CommandController extends Controller {
           relations: {
             roleKeycloaks: true,
             posType: true,
-            posLevel: true
-          }
+            posLevel: true,
+          },
         });
         if (!profile) {
           throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
@@ -4466,7 +4452,7 @@ export class CommandController extends Controller {
               orgChild2: true,
               orgChild3: true,
               orgChild4: true,
-            }
+            },
           });
           orgRootRef = curPosMaster?.orgRoot ?? null;
           orgChild1Ref = curPosMaster?.orgChild1 ?? null;
@@ -4509,28 +4495,17 @@ export class CommandController extends Controller {
             organizeName = names.join(" ");
           }
           await PostRetireToExprofile(
-            // profile.citizenId ?? "",
-            // profile.prefix ?? "",
-            // profile.firstName ?? "",
-            // profile.lastName ?? "",
-            // item.commandDateAffect?.getFullYear().toString() ??  "",
-            // profile.position,
-            // profile.posType?.posTypeName ?? "",
-            // `${profile.posType?.posTypeShortName} ${profile.posLevel?.posLevelName}`,
-            // item.commandDateAffect ?? new Date(),
-            // organizeName,
-            // clearProfile.retireTypeName ?? "",
-            "310190004095X",
-            "จ.ส.อ.",
-            "dev",
-            "hrms",
-            "2026",
-            "เจ้าหน้าที่จัดเก็บรายได้",
-            "อื่นๆ",
-            "C 3",
-            new Date(2026, 0, 1),
-            "สำนักงานเขตบางกอกใหญ่",
-            "เกษียณ"
+            profile.citizenId ?? "",
+            profile.prefix ?? "",
+            profile.firstName ?? "",
+            profile.lastName ?? "",
+            item.commandDateAffect?.getFullYear().toString() ?? "",
+            profile.position,
+            profile.posType?.posTypeName ?? "",
+            `${profile.posType?.posTypeShortName} ${profile.posLevel?.posLevelName}`,
+            item.commandDateAffect ?? new Date(),
+            organizeName,
+            clearProfile.retireTypeName ?? "",
           );
         }
       }),
@@ -4633,8 +4608,8 @@ export class CommandController extends Controller {
           relations: {
             roleKeycloaks: true,
             posType: true,
-            posLevel: true
-          }
+            posLevel: true,
+          },
         });
         if (!profile) {
           throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทะเบียนประวัตินี้");
@@ -4783,28 +4758,17 @@ export class CommandController extends Controller {
               organizeName = names.join(" ");
             }
             await PostRetireToExprofile(
-              // profile.citizenId ?? "",
-              // profile.prefix ?? "",
-              // profile.firstName ?? "",
-              // profile.lastName ?? "",
-              // item.commandDateAffect?.getFullYear().toString() ??  "",
-              // profile.position,
-              // profile.posType?.posTypeName ?? "",
-              // profile.posLevel?.posLevelName ?? "",
-              // item.commandDateAffect ?? new Date(),
-              // organizeName,
-              // clearProfile.retireTypeName ?? "",
-              "310190004095X",
-              "จ.ส.อ.",
-              "dev",
-              "hrms",
-              "2026",
-              "เจ้าหน้าที่จัดเก็บรายได้",
-              "อื่นๆ",
-              "C 3",
-              new Date(2026, 0, 1),
-              "สำนักงานเขตบางกอกใหญ่",
-              "เกษียณ"
+              profile.citizenId ?? "",
+              profile.prefix ?? "",
+              profile.firstName ?? "",
+              profile.lastName ?? "",
+              item.commandDateAffect?.getFullYear().toString() ?? "",
+              profile.position,
+              profile.posType?.posTypeName ?? "",
+              profile.posLevel?.posLevelName ?? "",
+              item.commandDateAffect ?? new Date(),
+              organizeName,
+              clearProfile.retireTypeName ?? "",
             );
           }
         }
@@ -5411,29 +5375,19 @@ export class CommandController extends Controller {
           let _posLevelName: string = !isEmployee
             ? `${profile.posLevel?.posLevelName}`
             : `${profile.posType?.posTypeName} ${profile.posLevel?.posLevelName}`;
+
           await PostRetireToExprofile(
-            // profile.citizenId ?? "",
-            // profile.prefix ?? "",
-            // profile.firstName ?? "",
-            // profile.lastName ?? "",
-            // item.commandDateAffect?.getFullYear().toString() ??  "",
-            // profile.position,
-            // profile.posType?.posTypeName ?? "",
-            // _posLevelName,
-            // item.commandDateAffect ?? new Date(),
-            // organizeName,
-            // retireTypeName,
-            "310190004095X",
-            "จ.ส.อ.",
-            "dev",
-            "hrms",
-            "2026",
-            "เจ้าหน้าที่จัดเก็บรายได้",
-            "อื่นๆ",
-            "C 3",
-            new Date(2026, 0, 1),
-            "สำนักงานเขตบางกอกใหญ่",
-            "เกษียณ"
+            profile.citizenId ?? "",
+            profile.prefix ?? "",
+            profile.firstName ?? "",
+            profile.lastName ?? "",
+            item.commandDateAffect?.getFullYear().toString() ?? "",
+            profile.position,
+            profile.posType?.posTypeName ?? "",
+            _posLevelName,
+            item.commandDateAffect ?? new Date(),
+            organizeName,
+            retireTypeName,
           );
         }
       }),
@@ -5768,14 +5722,14 @@ export class CommandController extends Controller {
   ) {
     let _posNumCodeSit: string = "";
     let _posNumCodeSitAbb: string = "";
-    let commandType: any = ""
+    let commandType: any = "";
     const _command = await this.commandRepository.findOne({
       where: { id: body.data.find((x) => x.commandId)?.commandId ?? "" },
     });
     if (_command) {
       commandType = await this.commandTypeRepository.findOne({
         select: { code: true },
-        where: { id: _command.commandTypeId }
+        where: { id: _command.commandTypeId },
       });
       if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") {
         const orgRootDeputy = await this.orgRootRepository.findOne({
@@ -5909,10 +5863,7 @@ export class CommandController extends Controller {
 
     if (commandType && String(commandType.code) == "C-PM-11") {
       const profileIds = body.data.map((x) => x.profileId);
-      await this.profileRepository.update(
-        { id: In(profileIds) },
-        { isProbation: false }
-      );
+      await this.profileRepository.update({ id: In(profileIds) }, { isProbation: false });
       // // Task #2304 อัปเดตจำนวนสิทธิ์การลา เมื่อผ่านทดลองงานฯ
       // if (leaveType != null) {
       //   await Promise.all(
@@ -6071,26 +6022,26 @@ export class CommandController extends Controller {
           !profile.current_holders || profile.current_holders.length == 0
             ? null
             : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) != null &&
-              profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
-                ?.orgChild4 != null
+                profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
+                  ?.orgChild4 != null
               ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild4.orgChild4ShortName}`
               : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) != null &&
-                profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
-                  ?.orgChild3 != null
+                  profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
+                    ?.orgChild3 != null
                 ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild3.orgChild3ShortName}`
                 : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) != null &&
-                  profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
-                    ?.orgChild2 != null
+                    profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
+                      ?.orgChild2 != null
                   ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild2.orgChild2ShortName}`
                   : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) !=
-                    null &&
-                    profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
-                      ?.orgChild1 != null
+                        null &&
+                      profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
+                        ?.orgChild1 != null
                     ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild1.orgChild1ShortName}`
                     : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) !=
-                      null &&
-                      profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
-                        ?.orgRoot != null
+                          null &&
+                        profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
+                          ?.orgRoot != null
                       ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgRoot.orgRootShortName}`
                       : null;
         const posNo = `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.posMasterNo}`;
@@ -6187,28 +6138,17 @@ export class CommandController extends Controller {
           organizeName = names.join(" ");
         }
         await PostRetireToExprofile(
-          // profile.citizenId ?? "",
-          // profile.prefix ?? "",
-          // profile.firstName ?? "",
-          // profile.lastName ?? "",
-          // item.commandDateAffect?.getFullYear().toString() ??  "",
-          // profile.position,
-          // profile.posType?.posTypeName ?? "",
-          // profile.posLevel?.posLevelName ?? "",
-          // item.commandDateAffect ?? new Date(),
-          // organizeName,
-          // clearProfile.retireTypeName ?? "",
-          "310190004095X",
-          "จ.ส.อ.",
-          "dev",
-          "hrms",
-          "2026",
-          "เจ้าหน้าที่จัดเก็บรายได้",
-          "อื่นๆ",
-          "C 3",
-          new Date(2026, 0, 1),
-          "สำนักงานเขตบางกอกใหญ่",
-          "เกษียณ"
+          profile.citizenId ?? "",
+          profile.prefix ?? "",
+          profile.firstName ?? "",
+          profile.lastName ?? "",
+          item.commandDateAffect?.getFullYear().toString() ?? "",
+          profile.position,
+          profile.posType?.posTypeName ?? "",
+          profile.posLevel?.posLevelName ?? "",
+          item.commandDateAffect ?? new Date(),
+          organizeName,
+          clearProfile.retireTypeName ?? "",
         );
       }),
     );
@@ -6932,8 +6872,8 @@ export class CommandController extends Controller {
                 prefix: avatar,
                 fileName: fileName,
               })
-              .then(() => { })
-              .catch(() => { });
+              .then(() => {})
+              .catch(() => {});
           }
         }
       }),
@@ -7516,7 +7456,7 @@ export class CommandController extends Controller {
             where: {
               profileId: item.posMasterChild.current_holderId,
               status: true,
-              isDeleted: false
+              isDeleted: false,
             },
           });
 
@@ -8044,7 +7984,7 @@ export class CommandController extends Controller {
       .then(async (res) => {
         _command = res;
       })
-      .catch(() => { });
+      .catch(() => {});
 
     let issue =
       command.isBangkok == "OFFICE"