diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts index 0c18117c..844b4587 100644 --- a/src/services/rabbitmq.ts +++ b/src/services/rabbitmq.ts @@ -402,7 +402,9 @@ async function handler_command_noti(msg: amqp.ConsumeMessage): Promise const { profiles, command } = data; try { - const profilesNotiRequest = new CallAPI() + let profilesNotiRequest: Promise | undefined; + if (!(["C-PM-10"].includes(command.commandType.code))) { + profilesNotiRequest = new CallAPI() .PostData( { headers: { authorization: token } }, "/placement/noti/profiles", @@ -432,6 +434,7 @@ async function handler_command_noti(msg: amqp.ConsumeMessage): Promise } console.error("Full error object:", error); }); + } let profilesSend = command && command.commandSends.length > 0 @@ -475,13 +478,12 @@ async function handler_command_noti(msg: amqp.ConsumeMessage): Promise }); /*เฉพาะคำสั่ง C-PM-10 ให้ตัด profilesNotiRequest ที่ส่ง noti ครั้งแรกออก*/ - if (command && command.commandType && ["C-PM-10"].includes(command.commandType.code)) { + if (["C-PM-10"].includes(command.commandType.code)) { await Promise.all([profilesSendRequest]); } else { - await Promise.all([profilesNotiRequest, profilesSendRequest]); + await Promise.all([profilesNotiRequest!, profilesSendRequest]); } - console.log("[AMQ] Send Notification Success"); return true;