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

ปรับ validate orgRevision (child1-4)

Browse source
This commit is contained in:
Bright 2024-01-29 18:10:01 +07:00
parent 4a6fb0aa28
commit 7d6d214b98
4 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/controllers/OrgChild1Controller.ts
View file

@ -93,11 +93,14 @@ export class OrgChild1Controller {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRootId");
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: rootIdExits.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: rootIdExits.orgRevisionId }
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const validOrgChild1Ranks = ["OFFICE", "DIVISION", "SECTION"];
if (!validOrgChild1Ranks.includes(requestBody.orgChild1Rank.toUpperCase())) {
@ -150,11 +153,14 @@ export class OrgChild1Controller {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RootId");
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: rootIdExits.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: rootIdExits.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const validOrgChild1Ranks = ["OFFICE", "DIVISION", "SECTION"];
if (
@ -207,11 +213,14 @@ export class OrgChild1Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child1.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child1.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const exitsChild2 = await this.child2Repository.findOne({ where: { orgChild1Id: id } });
if (exitsChild2) {

15
src/controllers/OrgChild2Controller.ts
View file

@ -110,11 +110,14 @@ export class OrgChild2Controller extends Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child1.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child1.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const validOrgChild2Ranks = ["OFFICE", "DIVISION", "SECTION"];
if (!validOrgChild2Ranks.includes(requestBody.orgChild2Rank.toUpperCase())) {
@ -173,11 +176,14 @@ export class OrgChild2Controller extends Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child1IdExits.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child1IdExits.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const validOrgChild2Ranks = ["OFFICE", "DIVISION", "SECTION"];
if (
@ -222,11 +228,14 @@ export class OrgChild2Controller extends Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child2.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child2.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const exitsChild3 = await this.child3Repository.findOne({ where: { orgChild2Id: id } });
if (exitsChild3) {

15
src/controllers/OrgChild3Controller.ts
View file

@ -94,11 +94,14 @@ export class OrgChild3Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child2.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child2.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const validOrgChild3Ranks = ["OFFICE", "DIVISION", "SECTION"];
if (!validOrgChild3Ranks.includes(requestBody.orgChild3Rank.toUpperCase())) {
@ -144,11 +147,14 @@ export class OrgChild3Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child2IdExits.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child2IdExits.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const validOrgChild3Ranks = ["OFFICE", "DIVISION", "SECTION"];
if (
@ -194,11 +200,14 @@ export class OrgChild3Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child3.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child3.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const exitsChild4 = await this.child4Repository.findOne({ where: { orgChild3Id: id } });
if (exitsChild4) {

15
src/controllers/OrgChild4Controller.ts
View file

@ -110,11 +110,14 @@ export class OrgChild4Controller extends Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child3.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child3.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const validOrgChild4Ranks = ["OFFICE", "DIVISION", "SECTION"];
if (!validOrgChild4Ranks.includes(requestBody.orgChild4Rank.toUpperCase())) {
@ -176,11 +179,14 @@ export class OrgChild4Controller extends Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child3IdExits.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child3IdExits.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
const validOrgChild4Ranks = ["OFFICE", "DIVISION", "SECTION"];
if (
@ -227,11 +233,14 @@ export class OrgChild4Controller extends Controller {
}
const revisionIdExits = await this.orgRevisionRepository.findOne({
where: { id: child4.orgRevisionId, orgRevisionIsDraft: true, orgRevisionIsCurrent: false },
where: { id: child4.orgRevisionId },
});
if (!revisionIdExits) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
if(revisionIdExits.orgRevisionIsDraft != true && revisionIdExits.orgRevisionIsCurrent != false){
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgRevisionIsDraft:true, orgRevisionIsCurrent:false");
}
await this.child4Repository.remove(child4);
return new HttpSuccess();