hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into develop-Bright

Browse source
This commit is contained in:
Bright 2025-07-07 13:46:07 +07:00
commit 98d9e6d1c1
3 changed files with 65 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app.ts
View file

@ -28,8 +28,8 @@ async function main() {
origin: "*",
}),
);
app.use(express.json());
app.use(express.urlencoded({ extended: true }));
app.use(express.json({limit: "50mb"}));
app.use(express.urlencoded({ extended: true, limit: "50mb" }));
app.use(logMiddleware);
app.use("/", express.static("static"));
app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));

1
src/controllers/OrganizationController.ts
View file

@ -162,6 +162,7 @@ export class OrganizationController extends Controller {
request: request.user,
revision: revision,
},
user: request.user,
};
try {
await sendToQueueOrgDraft(msg);

67
src/services/rabbitmq.ts
View file

@ -394,7 +394,18 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
const child2Repository = AppDataSource.getRepository(OrgChild2);
const child3Repository = AppDataSource.getRepository(OrgChild3);
const child4Repository = AppDataSource.getRepository(OrgChild4);
const { data, token, user } = JSON.parse(msg.content.toString());
const { id, status, lastUpdateUserId, lastUpdateFullName, lastUpdatedAt } = data;
if (user) {
sendWebSocket(
"send-publish-org",
{
success: true,
message: `ระบบกำลังทำการแพร่โครงสร้างหน่วยงาน`,
},
{ userId: user?.sub },
).catch(console.error);
}
const orgRevisionPublish = await repoOrgRevision
.createQueryBuilder("orgRevision")
.where("orgRevision.orgRevisionIsDraft = false")
@ -418,9 +429,6 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
orgRevisionDraft.orgRevisionIsDraft = false;
await repoOrgRevision.save(orgRevisionDraft);
}
const { data, token, user } = JSON.parse(msg.content.toString());
const { id, status, lastUpdateUserId, lastUpdateFullName, lastUpdatedAt } = data;
try {
const posMaster = await repoPosmaster.find({
where: { orgRevisionId: id },
@ -1400,9 +1408,29 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
}
}
console.log("[AMQ] Excecute Organization Success");
if (user) {
sendWebSocket(
"send-publish-org",
{
success: true,
message: `ระบบทำการเผยแพร่โครงสร้างหน่วยงานเรียบร้อยแล้ว`,
},
{ userId: user?.sub },
).catch(console.error);
}
return true;
} catch (error) {
console.error(error);
if (user) {
sendWebSocket(
"send-publish-org",
{
success: false,
message: `ระบบทำการเผยแพร่โครงสร้างหน่วยงานไม่สำเร็จ`,
},
{ userId: user?.sub },
).catch(console.error);
}
return false;
}
}
@ -1424,7 +1452,16 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
const child2Repository = AppDataSource.getRepository(OrgChild2);
const child3Repository = AppDataSource.getRepository(OrgChild3);
const child4Repository = AppDataSource.getRepository(OrgChild4);
if (user) {
sendWebSocket(
"send-publish-org",
{
success: true,
message: `ระบบกำลังทำการสร้างโครงสร้างหน่วยงาน`,
},
{ userId: user?.sub },
).catch(console.error);
}
try {
//cone tree
if (
@ -2097,9 +2134,29 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
await orgRevisionRepository.remove(_orgRevisions);
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;
} catch (error) {
console.error(error);
if (user) {
await sendWebSocket(
"send-create-draft-org",
{
success: false,
message: `ระบบทำการสร้างแบบร่างโครงสร้างหน่วยงานไม่สำเร็จ`,
},
{ userId: user?.sub },
).catch(console.error);
}
return false;
}
}