diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts index 83f39d7e..61df06f5 100644 --- a/src/services/rabbitmq.ts +++ b/src/services/rabbitmq.ts @@ -134,7 +134,6 @@ async function handler(msg: amqp.ConsumeMessage): Promise { } async function handler_org(msg: amqp.ConsumeMessage): Promise { - console.log("zzzzzzzzzzzzzzzz"); //----> condition before process consume const repoPosmaster = AppDataSource.getRepository(PosMaster); const repoEmployeePosmaster = AppDataSource.getRepository(EmployeePosMaster); @@ -149,13 +148,11 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { const child3Repository = AppDataSource.getRepository(OrgChild3); const child4Repository = AppDataSource.getRepository(OrgChild4); - console.log("zzzzzzzzzzzzzzzz"); const orgRevisionPublish = await repoOrgRevision .createQueryBuilder("orgRevision") .where("orgRevision.orgRevisionIsDraft = false") .andWhere("orgRevision.orgRevisionIsCurrent = true") .getOne(); - console.log("zzzzzzzzzzzzzzzz"); const orgRevisionDraft = await repoOrgRevision .createQueryBuilder("orgRevision") @@ -167,17 +164,14 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { orgRevisionPublish.orgRevisionIsCurrent = false; await repoOrgRevision.save(orgRevisionPublish); } - console.log("zzzzzzzzzzzzzzzz"); if (orgRevisionDraft) { orgRevisionDraft.orgRevisionIsCurrent = true; orgRevisionDraft.orgRevisionIsDraft = false; await repoOrgRevision.save(orgRevisionDraft); } - console.log("zzzzzzzzzzzzzzzz"); const { data, token, user } = JSON.parse(msg.content.toString()); const { id, status, lastUpdateUserId, lastUpdateFullName, lastUpdatedAt } = data; - console.log("zzzzzzzzzzzzzzzz"); try { const posMaster = await repoPosmaster.find({ where: { orgRevisionId: id }, @@ -193,9 +187,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { "positions.posExecutive", ], }); - console.log("zzzzzzzzzzzzzzzz"); for (const item of posMaster) { - console.log("zzzzzzzzzzzzzzzz"); if (item.next_holderId != null && status == "NOW") { const profile = await repoProfile.findOne({ where: { id: item.next_holderId == null ? "" : item.next_holderId }, @@ -216,10 +208,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { item.lastUpdatedAt = lastUpdatedAt; await repoPosmaster.save(item).catch((e) => console.log(e)); } - console.log(orgRevisionPublish); - console.log("zzzzzzzzzzzzzzzz"); if (orgRevisionPublish != null && orgRevisionDraft !=null) { - console.log("cccccccccccccccccccccc"); //new main revision const before = null; @@ -252,14 +241,12 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { where: { orgRevisionId: orgRevisionPublish.id }, }); - console.log("xxxxxxxxxxxxxxxxxxx"); //หา dna posmaster ถ้าไม่มีให้เอาตัวเองเป็น dna const orgemployeePosMaster = await repoEmployeePosmaster.find({ where: { orgRevisionId: orgRevisionPublish.id }, relations: ["positions"], }); - console.log("vvvvvvvvvvvvvvvvvvv"); let _orgemployeePosMaster: EmployeePosMaster[]; // if ( // requestBody.typeDraft.toUpperCase() == "ORG_POSITION" || @@ -274,9 +261,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { ? x.id : x.ancestorDNA, })); - console.log("aaaaaaaaaaaaaaaaaa"); await repoEmployeePosmaster.save(_orgemployeePosMaster); - console.log("sssssssssssssss"); // } //หา dna posmaster ถ้าไม่มีให้เอาตัวเองเป็น dna const orgemployeeTempPosMaster = await repoEmployeeTempPosmaster.find({ @@ -284,7 +269,6 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { relations: ["positions"], }); - console.log("ddddddddddddddddf"); let _orgemployeeTempPosMaster: EmployeeTempPosMaster[]; // if ( // requestBody.typeDraft.toUpperCase() == "ORG_POSITION" || @@ -299,14 +283,11 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { ? x.id : x.ancestorDNA, })); - console.log("ffffffffffffffffff"); await repoEmployeeTempPosmaster.save(_orgemployeeTempPosMaster); - console.log("gggggggggggggggggg"); // } //create org orgRoot.forEach(async (x: any) => { - console.log("qqqqqqqqqqqqqqqqq"); var dataId = x.id; // if ( // requestBody.typeDraft.toUpperCase() == "ORG_POSITION" || @@ -319,7 +300,6 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise { _orgemployeePosMaster .filter((x: EmployeePosMaster) => x.orgRootId == dataId && x.orgChild1Id == null) .map(async (item: any) => { - console.log("ttttttttttttttttttttt"); delete item.id; const employeePosMaster = Object.assign(new EmployeePosMaster(), item); employeePosMaster.positions = [];