From 7b6d2712523465568bcf00af786dd32300137efb Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Wed, 19 Mar 2025 10:51:34 +0700 Subject: [PATCH 1/2] fix remove posmaster rabbit --- src/services/rabbitmq.ts | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts index dab09767..6cea1467 100644 --- a/src/services/rabbitmq.ts +++ b/src/services/rabbitmq.ts @@ -1713,17 +1713,20 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise { }); // await posMasterRepository.remove(_posMasters); const batchSize = 1000; - for (let i = 0; i < _posMasters.length; i += batchSize) { - const batch = _posMasters.slice(i, i + batchSize); - try { - await posMasterRepository.remove(batch); - console.log(`Removed PosMaster batch ${i / batchSize + 1}`); - } catch (error) { - console.log(`Failed to remove batch ${i / batchSize + 1}`); + const removeInBatches = async (repository:any, data:any, label:any) => { + for (let i = 0; i < data.length; i += batchSize) { + const batch = data.slice(i, i + batchSize); + try { + await repository.remove(batch); + console.log(`Removed ${label} batch ${i / batchSize + 1}`); + } catch (error) { + console.log(`Failed to remove ${label} batch ${i / batchSize + 1}`); + } } - } - await employeePosMasterRepository.remove(_employeePosMasters); - await employeeTempPosMasterRepository.remove(_employeeTempPosMasters); + }; + await removeInBatches(posMasterRepository, _posMasters, "PosMaster"); + await removeInBatches(employeePosMasterRepository, _employeePosMasters, "EmployeePosMaster"); + await removeInBatches(employeeTempPosMasterRepository, _employeeTempPosMasters, "EmployeeTempPosMaster"); await child4Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); await child3Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); await child2Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); From 0db7a533ee74b3cb35757e16ab1adecb203b6718 Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 19 Mar 2025 11:59:36 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=AA=E0=B9=89=E0=B8=99=E0=B8=AD=E0=B8=AD?= =?UTF-8?q?=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?= =?UTF-8?q?=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interfaces/utils.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/interfaces/utils.ts b/src/interfaces/utils.ts index 183561b1..b4beacde 100644 --- a/src/interfaces/utils.ts +++ b/src/interfaces/utils.ts @@ -548,15 +548,15 @@ export function commandTypePath(commandCode: string): string | null { case "C-PM-32": return "/discipline/result/command32/report"; case "C-PM-33": - return "/salary/report/command/officer/report"; //SALARY + return "/salary/report/command33/officer/report"; //SALARY case "C-PM-34": - return "/salary/report/command/officer/report"; //SALARY + return "/salary/report/command34/officer/report"; //SALARY case "C-PM-35": - return "/salary/report/command/officer/report"; //SALARY + return "/salary/report/command35/officer/report"; //SALARY case "C-PM-36": - return "/salary/report/command/employee/report"; //SALARY + return "/salary/report/command36/employee/report"; //SALARY case "C-PM-37": - return "/salary/report/command/employee/report"; //SALARY + return "/salary/report/command37/employee/report"; //SALARY case "C-PM-38": return "/org/command/command38/officer/report"; //ORG case "C-PM-39":