แก้แบบร่าง
This commit is contained in:
parent
9b4db9a66f
commit
ed1cbea7c6
1 changed files with 438 additions and 428 deletions
|
|
@ -30,9 +30,20 @@ export let sendToQueueOrg: (payload: any) => void;
|
||||||
export let sendToQueueOrgDraft: (payload: any) => void;
|
export let sendToQueueOrgDraft: (payload: any) => void;
|
||||||
export async function init() {
|
export async function init() {
|
||||||
//----> (1) Producer
|
//----> (1) Producer
|
||||||
if (!process.env.AMQ_URL || !process.env.AMQ_QUEUE || !process.env.AMQ_QUEUE_ORG || !process.env.AMQ_QUEUE_ORG_DRAFT) return;
|
if (
|
||||||
|
!process.env.AMQ_URL ||
|
||||||
|
!process.env.AMQ_QUEUE ||
|
||||||
|
!process.env.AMQ_QUEUE_ORG ||
|
||||||
|
!process.env.AMQ_QUEUE_ORG_DRAFT
|
||||||
|
)
|
||||||
|
return;
|
||||||
|
|
||||||
const { AMQ_URL: url, AMQ_QUEUE: queue, AMQ_QUEUE_ORG: queue_org, AMQ_QUEUE_ORG_DRAFT: queue_org_draft } = process.env; //----> (1.2) get url and queue from .env
|
const {
|
||||||
|
AMQ_URL: url,
|
||||||
|
AMQ_QUEUE: queue,
|
||||||
|
AMQ_QUEUE_ORG: queue_org,
|
||||||
|
AMQ_QUEUE_ORG_DRAFT: queue_org_draft,
|
||||||
|
} = process.env; //----> (1.2) get url and queue from .env
|
||||||
|
|
||||||
const connection = await amqp.connect(url); //----> (1.3) set up url with amqp protocol
|
const connection = await amqp.connect(url); //----> (1.3) set up url with amqp protocol
|
||||||
|
|
||||||
|
|
@ -1109,7 +1120,7 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
//หา dna tree ถ้าไม่มีให้เอาตัวเองเป็น dna
|
//หา dna tree ถ้าไม่มีให้เอาตัวเองเป็น dna
|
||||||
const orgRoot = await orgRootRepository.find({
|
const orgRoot = await orgRootRepository.find({
|
||||||
where: { orgRevisionId: requestBody.orgRevisionId },
|
where: { orgRevisionId: requestBody.orgRevisionId },
|
||||||
order:{orgRootOrder:"ASC"}
|
order: { orgRootOrder: "ASC" },
|
||||||
});
|
});
|
||||||
let _orgRoot: any = orgRoot.map((x) => ({
|
let _orgRoot: any = orgRoot.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
|
|
@ -1122,7 +1133,7 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
|
|
||||||
const orgChild1 = await child1Repository.find({
|
const orgChild1 = await child1Repository.find({
|
||||||
where: { orgRevisionId: requestBody.orgRevisionId },
|
where: { orgRevisionId: requestBody.orgRevisionId },
|
||||||
order:{orgChild1Order:"ASC"}
|
order: { orgChild1Order: "ASC" },
|
||||||
});
|
});
|
||||||
let _orgChild1: any = orgChild1.map((x) => ({
|
let _orgChild1: any = orgChild1.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
|
|
@ -1135,7 +1146,7 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
|
|
||||||
const orgChild2 = await child2Repository.find({
|
const orgChild2 = await child2Repository.find({
|
||||||
where: { orgRevisionId: requestBody.orgRevisionId },
|
where: { orgRevisionId: requestBody.orgRevisionId },
|
||||||
order:{orgChild2Order:"ASC"}
|
order: { orgChild2Order: "ASC" },
|
||||||
});
|
});
|
||||||
let _orgChild2: any = orgChild2.map((x) => ({
|
let _orgChild2: any = orgChild2.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
|
|
@ -1148,7 +1159,7 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
|
|
||||||
const orgChild3 = await child3Repository.find({
|
const orgChild3 = await child3Repository.find({
|
||||||
where: { orgRevisionId: requestBody.orgRevisionId },
|
where: { orgRevisionId: requestBody.orgRevisionId },
|
||||||
order:{orgChild3Order:"ASC"}
|
order: { orgChild3Order: "ASC" },
|
||||||
});
|
});
|
||||||
let _orgChild3: any = orgChild3.map((x) => ({
|
let _orgChild3: any = orgChild3.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
|
|
@ -1161,7 +1172,7 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
|
|
||||||
const orgChild4 = await child4Repository.find({
|
const orgChild4 = await child4Repository.find({
|
||||||
where: { orgRevisionId: requestBody.orgRevisionId },
|
where: { orgRevisionId: requestBody.orgRevisionId },
|
||||||
order:{orgChild4Order:"ASC"}
|
order: { orgChild4Order: "ASC" },
|
||||||
});
|
});
|
||||||
let _orgChild4: any = orgChild4.map((x) => ({
|
let _orgChild4: any = orgChild4.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
|
|
@ -1201,8 +1212,8 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
// Create org
|
// Create org
|
||||||
for await (const x0 of _orgRoot) {
|
for await (const x0 of _orgRoot) {
|
||||||
var dataId = x0.id;
|
var dataId = x0.id;
|
||||||
console.log(`ch0 ${x0.orgRootOrder}`)
|
console.log(`ch0 ${x0.orgRootOrder}`);
|
||||||
console.log(dataId)
|
console.log(dataId);
|
||||||
delete x0.id;
|
delete x0.id;
|
||||||
const data = Object.assign(new OrgRoot(), x0);
|
const data = Object.assign(new OrgRoot(), x0);
|
||||||
data.orgRevisionId = revision.id;
|
data.orgRevisionId = revision.id;
|
||||||
|
|
@ -1297,8 +1308,8 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
// Create orgChild1
|
// Create orgChild1
|
||||||
for await (const x1 of _orgChild1.filter((x: OrgChild1) => x.orgRootId == dataId)) {
|
for await (const x1 of _orgChild1.filter((x: OrgChild1) => x.orgRootId == dataId)) {
|
||||||
var data1Id = x1.id;
|
var data1Id = x1.id;
|
||||||
console.log(`ch1 ${x1.orgChild1Order}`)
|
console.log(`ch1 ${x1.orgChild1Order}`);
|
||||||
console.log(data1Id)
|
console.log(data1Id);
|
||||||
delete x1.id;
|
delete x1.id;
|
||||||
const data1 = Object.assign(new OrgChild1(), x1);
|
const data1 = Object.assign(new OrgChild1(), x1);
|
||||||
data1.orgRootId = data.id;
|
data1.orgRootId = data.id;
|
||||||
|
|
@ -1388,8 +1399,8 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
}
|
}
|
||||||
for await (const x2 of _orgChild2.filter((x: OrgChild2) => x.orgChild1Id == data1Id)) {
|
for await (const x2 of _orgChild2.filter((x: OrgChild2) => x.orgChild1Id == data1Id)) {
|
||||||
var data2Id = x2.id;
|
var data2Id = x2.id;
|
||||||
console.log(`ch2 ${x2.orgChild2Order}`)
|
console.log(`ch2 ${x2.orgChild2Order}`);
|
||||||
console.log(data2Id)
|
console.log(data2Id);
|
||||||
delete x2.id;
|
delete x2.id;
|
||||||
const data2 = Object.assign(new OrgChild2(), x2);
|
const data2 = Object.assign(new OrgChild2(), x2);
|
||||||
data2.orgChild1Id = data1.id;
|
data2.orgChild1Id = data1.id;
|
||||||
|
|
@ -1480,8 +1491,8 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
// Create org
|
// Create org
|
||||||
for await (const x3 of _orgChild3.filter((x: OrgChild3) => x.orgChild2Id == data2Id)) {
|
for await (const x3 of _orgChild3.filter((x: OrgChild3) => x.orgChild2Id == data2Id)) {
|
||||||
var data3Id = x3.id;
|
var data3Id = x3.id;
|
||||||
console.log(`ch3 ${x3.orgChild3Order}`)
|
console.log(`ch3 ${x3.orgChild3Order}`);
|
||||||
console.log(data3Id)
|
console.log(data3Id);
|
||||||
delete x3.id;
|
delete x3.id;
|
||||||
const data3 = Object.assign(new OrgChild3(), x3);
|
const data3 = Object.assign(new OrgChild3(), x3);
|
||||||
data3.orgChild2Id = data2.id;
|
data3.orgChild2Id = data2.id;
|
||||||
|
|
@ -1575,8 +1586,8 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
(x: OrgChild4) => x.orgChild3Id == data3Id,
|
(x: OrgChild4) => x.orgChild3Id == data3Id,
|
||||||
)) {
|
)) {
|
||||||
var data4Id = x4.id;
|
var data4Id = x4.id;
|
||||||
console.log(`ch4 ${x4.orgChild4Order}`)
|
console.log(`ch4 ${x4.orgChild4Order}`);
|
||||||
console.log(data4Id)
|
console.log(data4Id);
|
||||||
delete x4.id;
|
delete x4.id;
|
||||||
const data4 = Object.assign(new OrgChild4(), x4);
|
const data4 = Object.assign(new OrgChild4(), x4);
|
||||||
data4.orgChild3Id = data3.id;
|
data4.orgChild3Id = data3.id;
|
||||||
|
|
@ -1673,7 +1684,7 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
console.log("ssssssssss");
|
||||||
const _orgRevisions = await orgRevisionRepository.find({
|
const _orgRevisions = await orgRevisionRepository.find({
|
||||||
where: [{ orgRevisionIsDraft: true, id: Not(revision.id) }],
|
where: [{ orgRevisionIsDraft: true, id: Not(revision.id) }],
|
||||||
});
|
});
|
||||||
|
|
@ -1721,4 +1732,3 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue