This commit is contained in:
parent
a55fd3d6d0
commit
1aba13d2f7
2 changed files with 41 additions and 1 deletions
|
|
@ -162,6 +162,7 @@ export class OrganizationController extends Controller {
|
||||||
request: request.user,
|
request: request.user,
|
||||||
revision: revision,
|
revision: revision,
|
||||||
},
|
},
|
||||||
|
user: request.user,
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
await sendToQueueOrgDraft(msg);
|
await sendToQueueOrgDraft(msg);
|
||||||
|
|
|
||||||
|
|
@ -418,7 +418,6 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
orgRevisionDraft.orgRevisionIsDraft = false;
|
orgRevisionDraft.orgRevisionIsDraft = false;
|
||||||
await repoOrgRevision.save(orgRevisionDraft);
|
await repoOrgRevision.save(orgRevisionDraft);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { data, token, user } = JSON.parse(msg.content.toString());
|
const { data, token, user } = JSON.parse(msg.content.toString());
|
||||||
const { id, status, lastUpdateUserId, lastUpdateFullName, lastUpdatedAt } = data;
|
const { id, status, lastUpdateUserId, lastUpdateFullName, lastUpdatedAt } = data;
|
||||||
try {
|
try {
|
||||||
|
|
@ -1400,9 +1399,29 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log("[AMQ] Excecute Organization Success");
|
console.log("[AMQ] Excecute Organization Success");
|
||||||
|
if (user) {
|
||||||
|
sendWebSocket(
|
||||||
|
"send-publish-org",
|
||||||
|
{
|
||||||
|
success: true,
|
||||||
|
message: `ระบบทำการเผยแพร่โครงสร้างหน่วยงานเรียบร้อยแล้ว`,
|
||||||
|
},
|
||||||
|
{ userId: user?.sub },
|
||||||
|
).catch(console.error);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
if (user) {
|
||||||
|
sendWebSocket(
|
||||||
|
"send-publish-org",
|
||||||
|
{
|
||||||
|
success: false,
|
||||||
|
message: `ระบบทำการเผยแพร่โครงสร้างหน่วยงานไม่สำเร็จ`,
|
||||||
|
},
|
||||||
|
{ userId: user?.sub },
|
||||||
|
).catch(console.error);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2097,9 +2116,29 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
await orgRevisionRepository.remove(_orgRevisions);
|
await orgRevisionRepository.remove(_orgRevisions);
|
||||||
|
|
||||||
console.log("[AMQ] Create Draft Success");
|
console.log("[AMQ] Create Draft Success");
|
||||||
|
if (user) {
|
||||||
|
await sendWebSocket(
|
||||||
|
"send-create-draft-org",
|
||||||
|
{
|
||||||
|
success: true,
|
||||||
|
message: `ระบบทำการสร้างแบบร่างโครงสร้างหน่วยงานเรียบร้อยแล้ว`,
|
||||||
|
},
|
||||||
|
{ userId: user?.sub },
|
||||||
|
).catch(console.error);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
if (user) {
|
||||||
|
await sendWebSocket(
|
||||||
|
"send-create-draft-org",
|
||||||
|
{
|
||||||
|
success: false,
|
||||||
|
message: `ระบบทำการสร้างแบบร่างโครงสร้างหน่วยงานไม่สำเร็จ`,
|
||||||
|
},
|
||||||
|
{ userId: user?.sub },
|
||||||
|
).catch(console.error);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue