From 60b25c662055dd8a75949332b251e2448018c524 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 13 Feb 2024 17:21:33 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20error=20=E0=B8=AA?= =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=20node?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/OrgChild1Controller.ts | 15 ++++++++------- src/controllers/OrgChild2Controller.ts | 13 +++++++------ src/controllers/OrgChild3Controller.ts | 15 ++++++++------- src/controllers/OrgChild4Controller.ts | 15 ++++++++------- src/controllers/OrgRootController.ts | 15 ++++++++------- src/controllers/PositionController.ts | 13 ------------- 6 files changed, 39 insertions(+), 47 deletions(-) diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts index fca3a6df..a453bbaa 100644 --- a/src/controllers/OrgChild1Controller.ts +++ b/src/controllers/OrgChild1Controller.ts @@ -130,12 +130,12 @@ export class OrgChild1Controller { if (chkCode != null) { throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); } - const order:any = await this.child1Repository.findOne({ + const order: any = await this.child1Repository.findOne({ where: { - orgRootId: requestBody.orgRootId + orgRootId: requestBody.orgRootId, }, - order: { orgChild1Order: "DESC" } - }) + order: { orgChild1Order: "DESC" }, + }); try { const child1 = Object.assign(new OrgChild1(), requestBody) as OrgChild1; child1.orgChild1Name = requestBody.orgChild1Name; @@ -145,7 +145,8 @@ export class OrgChild1Controller { child1.lastUpdateFullName = request.user.name; child1.orgRevisionId = String(rootIdExits?.orgRevisionId); child1.orgRootId = String(rootIdExits?.id); - child1.orgChild1Order = order.orgChild1Order == null ? 1 : order.orgChild1Order+1; + child1.orgChild1Order = + order == null || order.orgChild1Order == null ? 1 : order.orgChild1Order + 1; await this.child1Repository.save(child1); return new HttpSuccess(); } catch (error) { @@ -262,7 +263,7 @@ export class OrgChild1Controller { // } try { const posMasters = await this.posMasterRepository.find({ - where: { orgChild1Id: id} + where: { orgChild1Id: id }, }); const positions = await this.positionRepository.find({ where: [{ posMasterId: In(posMasters.map((x) => x.id)) }], @@ -273,7 +274,7 @@ export class OrgChild1Controller { await this.child4Repository.delete({ orgChild1Id: id }); await this.child3Repository.delete({ orgChild1Id: id }); await this.child2Repository.delete({ orgChild1Id: id }); - await this.child1Repository.delete({id}); + await this.child1Repository.delete({ id }); return new HttpSuccess(); } catch (error) { return error; diff --git a/src/controllers/OrgChild2Controller.ts b/src/controllers/OrgChild2Controller.ts index a4b7ac85..3c75a933 100644 --- a/src/controllers/OrgChild2Controller.ts +++ b/src/controllers/OrgChild2Controller.ts @@ -136,12 +136,12 @@ export class OrgChild2Controller extends Controller { if (!validOrgChild2Ranks.includes(requestBody.orgChild2Rank.toUpperCase())) { throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgChild2Rank"); } - const order:any = await this.child2Repository.findOne({ + const order: any = await this.child2Repository.findOne({ where: { - orgChild1Id: requestBody.orgChild1Id + orgChild1Id: requestBody.orgChild1Id, }, - order: { orgChild2Order: "DESC" } - }) + order: { orgChild2Order: "DESC" }, + }); try { const child2 = Object.assign(new OrgChild2(), requestBody) as OrgChild2; child2.orgChild2Name = requestBody.orgChild2Name; @@ -152,7 +152,8 @@ export class OrgChild2Controller extends Controller { child2.orgRootId = String(child1?.orgRootId); child2.orgRevisionId = String(child1?.orgRevisionId); child2.orgChild1Id = String(child1?.id); - child2.orgChild2Order = order.orgChild2Order == null ? 1 : order.orgChild2Order+1; + child2.orgChild2Order = + order == null || order.orgChild2Order == null ? 1 : order.orgChild2Order + 1; await this.child2Repository.save(child2); return new HttpSuccess(); } catch (error) { @@ -276,7 +277,7 @@ export class OrgChild2Controller extends Controller { // } try { const posMasters = await this.posMasterRepository.find({ - where: { orgChild2Id: id} + where: { orgChild2Id: id }, }); const positions = await this.positionRepository.find({ where: [{ posMasterId: In(posMasters.map((x) => x.id)) }], diff --git a/src/controllers/OrgChild3Controller.ts b/src/controllers/OrgChild3Controller.ts index 82b73085..b656f646 100644 --- a/src/controllers/OrgChild3Controller.ts +++ b/src/controllers/OrgChild3Controller.ts @@ -118,12 +118,12 @@ export class OrgChild3Controller { if (!validOrgChild3Ranks.includes(requestBody.orgChild3Rank.toUpperCase())) { throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgChild3Rank"); } - const order:any = await this.child3Repository.findOne({ + const order: any = await this.child3Repository.findOne({ where: { - orgChild2Id: requestBody.orgChild2Id + orgChild2Id: requestBody.orgChild2Id, }, - order: { orgChild3Order: "DESC" } - }) + order: { orgChild3Order: "DESC" }, + }); try { const child3 = Object.assign(new OrgChild3(), requestBody) as OrgChild3; child3.orgChild3Name = requestBody.orgChild3Name; @@ -135,7 +135,8 @@ export class OrgChild3Controller { child3.orgChild1Id = String(child2?.orgChild1Id); child3.orgRevisionId = String(child2?.orgRevisionId); child3.orgChild2Id = String(child2?.id); - child3.orgChild3Order = order.orgChild3Order == null ? 1 : order.orgChild3Order+1; + child3.orgChild3Order = + order == null || order.orgChild3Order == null ? 1 : order.orgChild3Order + 1; await this.child3Repository.save(child3); return new HttpSuccess(); } catch (error) { @@ -246,7 +247,7 @@ export class OrgChild3Controller { // } try { const posMasters = await this.posMasterRepository.find({ - where: { orgChild3Id: id} + where: { orgChild3Id: id }, }); const positions = await this.positionRepository.find({ where: [{ posMasterId: In(posMasters.map((x) => x.id)) }], @@ -255,7 +256,7 @@ export class OrgChild3Controller { await this.positionRepository.remove(positions); await this.posMasterRepository.remove(posMasters); await this.child4Repository.delete({ orgChild3Id: id }); - await this.child3Repository.delete( id ); + await this.child3Repository.delete(id); return new HttpSuccess(); } catch (error) { return error; diff --git a/src/controllers/OrgChild4Controller.ts b/src/controllers/OrgChild4Controller.ts index e25f08ed..ca426372 100644 --- a/src/controllers/OrgChild4Controller.ts +++ b/src/controllers/OrgChild4Controller.ts @@ -134,12 +134,12 @@ export class OrgChild4Controller extends Controller { if (!validOrgChild4Ranks.includes(requestBody.orgChild4Rank.toUpperCase())) { throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgChild4Rank"); } - const order:any = await this.child4Repository.findOne({ + const order: any = await this.child4Repository.findOne({ where: { - orgChild3Id: requestBody.orgChild3Id + orgChild3Id: requestBody.orgChild3Id, }, - order: { orgChild4Order: "DESC" } - }) + order: { orgChild4Order: "DESC" }, + }); try { const child4 = Object.assign(new OrgChild4(), requestBody) as OrgChild4; child4.orgChild4Name = requestBody.orgChild4Name; @@ -152,7 +152,8 @@ export class OrgChild4Controller extends Controller { child4.orgChild2Id = String(child3?.orgChild2Id); child4.orgRevisionId = String(child3?.orgRevisionId); child4.orgChild3Id = String(child3?.id); - child4.orgChild4Order = order.orgChild4Order == null ? 1 : order.orgChild4Order+1; + child4.orgChild4Order = + order == null || order.orgChild4Order == null ? 1 : order.orgChild4Order + 1; await this.child4Repository.save(child4); return new HttpSuccess(); @@ -271,7 +272,7 @@ export class OrgChild4Controller extends Controller { } try { const posMasters = await this.posMasterRepository.find({ - where: { orgChild4Id: id} + where: { orgChild4Id: id }, }); const positions = await this.positionRepository.find({ where: [{ posMasterId: In(posMasters.map((x) => x.id)) }], @@ -279,7 +280,7 @@ export class OrgChild4Controller extends Controller { await this.positionRepository.remove(positions); await this.posMasterRepository.remove(posMasters); - await this.child4Repository.delete( id ); + await this.child4Repository.delete(id); return new HttpSuccess(); } catch (error) { return error; diff --git a/src/controllers/OrgRootController.ts b/src/controllers/OrgRootController.ts index 4e3aed70..857c9ff9 100644 --- a/src/controllers/OrgRootController.ts +++ b/src/controllers/OrgRootController.ts @@ -128,18 +128,19 @@ export class OrgRootController extends Controller { "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false", ); } - const order:any = await this.orgRootRepository.findOne({ + const order: any = await this.orgRootRepository.findOne({ where: { - orgRevisionId: requestBody.orgRevisionId + orgRevisionId: requestBody.orgRevisionId, }, - order: { orgRootOrder: "DESC" } - }) + order: { orgRootOrder: "DESC" }, + }); try { orgRoot.createdUserId = request.user.sub; orgRoot.createdFullName = request.user.name; orgRoot.lastUpdateUserId = request.user.sub; orgRoot.lastUpdateFullName = request.user.name; - orgRoot.orgRootOrder = order.orgRootOrder == null ? 1 : order.orgRootOrder+1; + orgRoot.orgRootOrder = + order == null || order.orgRootOrder == null ? 1 : order.orgRootOrder + 1; await this.orgRootRepository.save(orgRoot); return new HttpSuccess(); @@ -263,7 +264,7 @@ export class OrgRootController extends Controller { } try { const posMasters = await this.posMasterRepository.find({ - where: { orgRootId: id} + where: { orgRootId: id }, }); const positions = await this.positionRepository.find({ where: [{ posMasterId: In(posMasters.map((x) => x.id)) }], @@ -275,7 +276,7 @@ export class OrgRootController extends Controller { await this.orgChild3Repository.delete({ orgRootId: id }); await this.orgChild2Repository.delete({ orgRootId: id }); await this.orgChild1Repository.delete({ orgRootId: id }); - await this.orgRootRepository.delete({id}); + await this.orgRootRepository.delete({ id }); return new HttpSuccess(); } catch (error) { diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 90773a6a..02829078 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -1829,19 +1829,6 @@ export class PositionController extends Controller { ); } - // const dataPosMaster = await this.posMasterRepository.find({ - // where: { - // orgRevisionId: findDraft?.id, - // ancestorDNA: dataPublish.ancestorDNA, - // }, - // }); - // if (!dataPosMaster) { - // throw new HttpError( - // HttpStatusCode.NOT_FOUND, - // "ไม่พบข้อมูลไอดีนี้ใน posMaster (publishPositionId) : " + requestBody.publishPositionId, - // ); - // } - try { await this.posMasterRepository.update( { orgRevisionId: findDraft.id, ancestorDNA: dataPublish.ancestorDNA },