From ff752da7dd13640a5d8fae1b60d2013811f9c60f Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 19 Mar 2026 11:13:27 +0700 Subject: [PATCH] fix remove await and addLogSequence of exprofile system --- src/controllers/CommandController.ts | 279 +++++++++--------- src/controllers/ExRetirementController.ts | 27 +- src/controllers/ProfileController.ts | 5 +- src/controllers/ProfileEmployeeController.ts | 23 +- .../ProfileEmployeeTempController.ts | 23 +- 5 files changed, 186 insertions(+), 171 deletions(-) diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 6116b453..f21473c4 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -235,7 +235,7 @@ export class CommandController extends Controller { ? _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 null` : "1=1", { child1: _data.child1, @@ -313,7 +313,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()], }, @@ -814,8 +814,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); @@ -858,8 +858,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); @@ -902,8 +902,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); @@ -1187,8 +1187,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"; @@ -1253,8 +1253,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 }); @@ -1407,11 +1407,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 = { @@ -1443,8 +1443,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); @@ -1581,7 +1581,7 @@ export class CommandController extends Controller { ); await this.profileRepository.save(profiles); } - } catch { } + } catch {} type = "EMPLOYEE"; try { @@ -1613,7 +1613,7 @@ export class CommandController extends Controller { ); await this.profileEmployeeRepository.save(profiles); } - } catch { } + } catch {} return new HttpSuccess(); } @@ -1677,7 +1677,7 @@ export class CommandController extends Controller { }), ); } - } catch { } + } catch {} type = "EMPLOYEE"; try { @@ -1732,7 +1732,7 @@ export class CommandController extends Controller { }), ); } - } catch { } + } catch {} return new HttpSuccess(); } @@ -1945,7 +1945,7 @@ export class CommandController extends Controller { .then((x) => { res = x; }) - .catch((x) => { }); + .catch((x) => {}); } let _command; @@ -2023,76 +2023,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; @@ -2153,10 +2153,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}`, @@ -2171,8 +2171,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: @@ -2186,19 +2186,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 : "-", }; @@ -2299,7 +2299,7 @@ export class CommandController extends Controller { .then(async (res) => { _command = res; }) - .catch(() => { }); + .catch(() => {}); let issue = command.isBangkok == "OFFICE" @@ -2357,15 +2357,15 @@ export class CommandController extends Controller { operators: operators.length > 0 ? operators.map((x) => ({ - fullName: `${x.prefix ?? ""}${x.firstName ?? ""} ${x.lastName ?? ""}`, - roleName: x.roleName, - })) + fullName: `${x.prefix ?? ""}${x.firstName ?? ""} ${x.lastName ?? ""}`, + roleName: x.roleName, + })) : [ - { - fullName: "", - roleName: "เจ้าหน้าที่ดำเนินการ", - }, - ], + { + fullName: "", + roleName: "เจ้าหน้าที่ดำเนินการ", + }, + ], }, }); } @@ -2497,12 +2497,12 @@ export class CommandController extends Controller { @Put("change-creator/{id}") async ChangeCreator( @Path() id: string, - @Body() req: { assignId: string; }, + @Body() req: { assignId: string }, @Request() request: RequestWithUser, ) { await new permission().PermissionUpdate(request, "COMMAND"); const command = await this.commandRepository.findOne({ - where: { id: id } + where: { id: id }, }); if (!command) { @@ -2513,7 +2513,7 @@ export class CommandController extends Controller { command.lastUpdateUserId = request.user.sub; command.lastUpdateFullName = request.user.name; command.lastUpdatedAt = new Date(); - + await this.commandRepository.save(command); return new HttpSuccess(); } @@ -2704,8 +2704,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 @@ -3478,27 +3478,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, }); @@ -4019,7 +4019,7 @@ export class CommandController extends Controller { .orgRootShortName ?? ""; } } - const today = new Date().setHours(0,0,0,0); + const today = new Date().setHours(0, 0, 0, 0); await Promise.all( body.data.map(async (item) => { const profile = await this.profileRepository.findOne({ @@ -4045,11 +4045,14 @@ export class CommandController extends Controller { where: { refId: item.resignId }, relations: { command: true }, }); - const executeDate = commandResign - ? new Date(commandResign.command.commandExcecuteDate).setHours(0,0,0,0) + const executeDate = commandResign + ? new Date(commandResign.command.commandExcecuteDate).setHours(0, 0, 0, 0) : today; - if (commandResign && _command.status !== "REPORTED" && - (_command.status !== "WAITING" || today < executeDate)) { + if ( + commandResign && + _command.status !== "REPORTED" && + (_command.status !== "WAITING" || today < executeDate) + ) { await reOrderCommandRecivesAndDelete(commandResign!.id); } } @@ -4320,8 +4323,9 @@ export class CommandController extends Controller { ].filter(Boolean); organizeName = names.join(" "); } - + PostRetireToExprofile( + req, profile.citizenId ?? "", profile.prefix ?? "", profile.firstName ?? "", @@ -4425,7 +4429,7 @@ export class CommandController extends Controller { .orgRootShortName ?? ""; } } - const today = new Date().setHours(0,0,0,0); + const today = new Date().setHours(0, 0, 0, 0); await Promise.all( body.data.map(async (item) => { const profile = await this.profileEmployeeRepository.findOne({ @@ -4447,11 +4451,14 @@ export class CommandController extends Controller { where: { refId: item.resignId }, relations: { command: true }, }); - const executeDate = commandResign - ? new Date(commandResign.command.commandExcecuteDate).setHours(0,0,0,0) + const executeDate = commandResign + ? new Date(commandResign.command.commandExcecuteDate).setHours(0, 0, 0, 0) : today; - if (commandResign && _command.status !== "REPORTED" && - (_command.status !== "WAITING" || today < executeDate)) { + if ( + commandResign && + _command.status !== "REPORTED" && + (_command.status !== "WAITING" || today < executeDate) + ) { await reOrderCommandRecivesAndDelete(commandResign!.id); } } @@ -4572,7 +4579,8 @@ export class CommandController extends Controller { ].filter(Boolean); organizeName = names.join(" "); } - await PostRetireToExprofile( + PostRetireToExprofile( + req, profile.citizenId ?? "", profile.prefix ?? "", profile.firstName ?? "", @@ -4842,7 +4850,8 @@ export class CommandController extends Controller { ].filter(Boolean); organizeName = names.join(" "); } - await PostRetireToExprofile( + PostRetireToExprofile( + req, profile.citizenId ?? "", profile.prefix ?? "", profile.firstName ?? "", @@ -5473,7 +5482,8 @@ export class CommandController extends Controller { ? `${profile.posLevel?.posLevelName}` : `${profile.posType?.posTypeName} ${profile.posLevel?.posLevelName}`; - await PostRetireToExprofile( + PostRetireToExprofile( + req, profile.citizenId ?? "", profile.prefix ?? "", profile.firstName ?? "", @@ -6126,26 +6136,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}`; @@ -6249,7 +6259,8 @@ export class CommandController extends Controller { ].filter(Boolean); organizeName = names.join(" "); } - await PostRetireToExprofile( + PostRetireToExprofile( + req, profile.citizenId ?? "", profile.prefix ?? "", profile.firstName ?? "", @@ -6976,8 +6987,8 @@ export class CommandController extends Controller { prefix: avatar, fileName: fileName, }) - .then(() => { }) - .catch(() => { }); + .then(() => {}) + .catch(() => {}); } } }), @@ -8088,7 +8099,7 @@ export class CommandController extends Controller { .then(async (res) => { _command = res; }) - .catch(() => { }); + .catch(() => {}); let issue = command.isBangkok == "OFFICE" diff --git a/src/controllers/ExRetirementController.ts b/src/controllers/ExRetirementController.ts index c17a232b..128cb4d1 100644 --- a/src/controllers/ExRetirementController.ts +++ b/src/controllers/ExRetirementController.ts @@ -14,6 +14,7 @@ import { } from "tsoa"; import HttpError from "../interfaces/http-error"; import HttpStatusCode from "../interfaces/http-status"; +import { addLogSequence } from "../interfaces/utils"; interface CachedToken { token: string; @@ -171,6 +172,7 @@ async function getToken(ClientID: string, ClientSecret: string): Promise // function post retire data to exprofile system export async function PostRetireToExprofile( + request: any, citizenID: string, prefix: string, firstName: string, @@ -225,19 +227,6 @@ export async function PostRetireToExprofile( }, }); - // addLogSequence(request, { - // action: "request", - // status: "success", - // description: "connected", - // request: { - // method: "POST", - // url: url, - // payload: JSON.stringify(sendData), - // response: JSON.stringify(response.data.result), - // }, - // }); - - return res.data; } catch (error: any) { if (error.response?.status === 500 && retryCount < maxRetries - 1) { @@ -245,6 +234,18 @@ export async function PostRetireToExprofile( retryCount++; continue; } + + addLogSequence(request, { + action: "request", + status: "error", + description: "unconnected to exprofile api", + request: { + method: "POST", + url: API_URL_BANGKOK + "/importData", + response: JSON.stringify(error), + }, + }); + throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "ไม่สามารถติดต่อ API ได้"); } } diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 141b1b82..896717c8 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -3011,7 +3011,7 @@ export class ProfileController extends Controller { }; const orgRoot = await this.orgRootRepo.findOne({ select: { id: true, isDeputy: true }, - where: { + where: { id: Not(posMaster.orgRootId ?? ""), isDeputy: true, orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false }, @@ -11013,7 +11013,8 @@ export class ProfileController extends Controller { ].filter(Boolean); organizeName = names.join(" "); } - await PostRetireToExprofile( + PostRetireToExprofile( + request, profile.citizenId ?? "", profile.prefix ?? "", profile.firstName ?? "", diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 72835a48..43dbd8f3 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -2290,27 +2290,27 @@ export class ProfileEmployeeController extends Controller { @Get("history/user") async getHistoryProfileByUser(@Request() request: RequestWithUser) { const profile = await this.profileRepo.findOne({ - where: { keycloak: request.user.sub } + where: { keycloak: request.user.sub }, }); if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); const profileHistory = await this.profileHistoryRepo.find({ where: { profileEmployeeId: profile.id }, - order: { createdAt: "ASC" } + order: { createdAt: "ASC" }, }); - + if (profileHistory.length == 0) { await this.profileHistoryRepo.save( Object.assign(new ProfileEmployeeHistory(), { ...profile, birthDateOld: profile?.birthDate, profileEmployeeId: profile.id, - id: undefined + id: undefined, }), ); const firstRecord = await this.profileHistoryRepo.find({ where: { profileEmployeeId: profile.id }, - order: { createdAt: "ASC" } + order: { createdAt: "ASC" }, }); return new HttpSuccess(firstRecord); } @@ -3207,27 +3207,27 @@ export class ProfileEmployeeController extends Controller { async getProfileHistory(@Path() id: string, @Request() req: RequestWithUser) { //await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", id); ไม่แน่ใจEMPปิดไว้ก่อน; const profile = await this.profileRepo.findOne({ - where: { id: id } + where: { id: id }, }); if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); const profileHistory = await this.profileHistoryRepo.find({ where: { profileEmployeeId: id }, - order: { createdAt: "ASC" } + order: { createdAt: "ASC" }, }); - + if (profileHistory.length == 0) { await this.profileHistoryRepo.save( Object.assign(new ProfileEmployeeHistory(), { ...profile, birthDateOld: profile?.birthDate, profileEmployeeId: id, - id: undefined + id: undefined, }), ); const firstRecord = await this.profileHistoryRepo.find({ where: { profileEmployeeId: id }, - order: { createdAt: "ASC" } + order: { createdAt: "ASC" }, }); return new HttpSuccess(firstRecord); } @@ -5450,7 +5450,8 @@ export class ProfileEmployeeController extends Controller { ].filter(Boolean); organizeName = names.join(" "); } - await PostRetireToExprofile( + PostRetireToExprofile( + request, profile.citizenId ?? "", profile.prefix ?? "", profile.firstName ?? "", diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index 72dd1c43..7930b872 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -1295,27 +1295,27 @@ export class ProfileEmployeeTempController extends Controller { @Get("history/user") async getHistoryProfileByUser(@Request() request: RequestWithUser) { const profile = await this.profileRepo.findOne({ - where: { keycloak: request.user.sub } + where: { keycloak: request.user.sub }, }); if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); const profileHistory = await this.profileHistoryRepo.find({ where: { profileEmployeeId: profile.id }, - order: { createdAt: "ASC" } + order: { createdAt: "ASC" }, }); - + if (profileHistory.length == 0) { await this.profileHistoryRepo.save( Object.assign(new ProfileEmployeeHistory(), { ...profile, birthDateOld: profile?.birthDate, profileEmployeeId: profile.id, - id: undefined + id: undefined, }), ); const firstRecord = await this.profileHistoryRepo.find({ where: { profileEmployeeId: profile.id }, - order: { createdAt: "ASC" } + order: { createdAt: "ASC" }, }); return new HttpSuccess(firstRecord); } @@ -1828,27 +1828,27 @@ export class ProfileEmployeeTempController extends Controller { async getProfileHistory(@Path() id: string, @Request() req: RequestWithUser) { // await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP");//ไม่แน่ใจTEMPปิดไว้ก่อน const profile = await this.profileRepo.findOne({ - where: { id: id } + where: { id: id }, }); if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); const profileHistory = await this.profileHistoryRepo.find({ where: { profileEmployeeId: id }, - order: { createdAt: "ASC" } + order: { createdAt: "ASC" }, }); - + if (profileHistory.length == 0) { await this.profileHistoryRepo.save( Object.assign(new ProfileEmployeeHistory(), { ...profile, birthDateOld: profile?.birthDate, profileEmployeeId: id, - id: undefined + id: undefined, }), ); const firstRecord = await this.profileHistoryRepo.find({ where: { profileEmployeeId: id }, - order: { createdAt: "ASC" } + order: { createdAt: "ASC" }, }); return new HttpSuccess(firstRecord); } @@ -3606,7 +3606,8 @@ export class ProfileEmployeeTempController extends Controller { ].filter(Boolean); organizeName = names.join(" "); } - await PostRetireToExprofile( + PostRetireToExprofile( + request, profile.citizenId ?? "", profile.prefix ?? "", profile.firstName ?? "",