From fcbbdbf4d1fe4bf836bd22230d7dc6fdc6b2362f Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Tue, 14 May 2024 17:24:38 +0700 Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrganizationUnauthorizeController.ts | 8 +- src/controllers/ProfileController.ts | 64 ++++++----- .../ProfileDisciplineController.ts | 2 +- .../ProfileDisciplineEmployeeController.ts | 2 +- src/controllers/ProfileDutyController.ts | 2 +- .../ProfileDutyEmployeeController.ts | 2 +- src/controllers/ProfileEmployeeController.ts | 4 +- src/controllers/ProfileLeaveController.ts | 2 +- .../ProfileLeaveEmployeeController.ts | 2 +- src/controllers/ProfileOtherController.ts | 2 +- .../ProfileOtherEmployeeController.ts | 2 +- src/entities/Profile.ts | 4 +- src/entities/ProfileDiscipline.ts | 2 +- src/entities/ProfileDisciplineEmployee.ts | 106 ------------------ .../ProfileDisciplineEmployeeHistory.ts | 74 ------------ src/entities/ProfileEmployee.ts | 4 - 16 files changed, 50 insertions(+), 232 deletions(-) delete mode 100644 src/entities/ProfileDisciplineEmployee.ts delete mode 100644 src/entities/ProfileDisciplineEmployeeHistory.ts diff --git a/src/controllers/OrganizationUnauthorizeController.ts b/src/controllers/OrganizationUnauthorizeController.ts index 6be5ae66..eb232e63 100644 --- a/src/controllers/OrganizationUnauthorizeController.ts +++ b/src/controllers/OrganizationUnauthorizeController.ts @@ -60,7 +60,7 @@ export class OrganizationUnauthorizeController extends Controller { .leftJoinAndSelect("posMaster.positions", "positions") .leftJoinAndSelect("positions.posExecutive", "posExecutive") .leftJoinAndSelect("current_holder.profileSalary", "profileSalary") - .leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline") + .leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines") .leftJoinAndSelect("current_holder.posLevel", "posLevel") .leftJoinAndSelect("current_holder.posType", "posType") .where({ @@ -219,7 +219,7 @@ export class OrganizationUnauthorizeController extends Controller { result: null, duration: null, isPunish: - item.current_holder.profileDiscipline.filter( + item.current_holder.profileDisciplines.filter( (x: any) => new Date( `${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`, @@ -278,7 +278,7 @@ export class OrganizationUnauthorizeController extends Controller { .leftJoinAndSelect("employeePosMaster.orgChild4", "orgChild4") .leftJoinAndSelect("employeePosMaster.positions", "positions") .leftJoinAndSelect("current_holder.profileSalary", "profileSalary") - .leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline") + .leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines") .leftJoinAndSelect("current_holder.posLevel", "posLevel") .leftJoinAndSelect("current_holder.posType", "posType") .where({ @@ -426,7 +426,7 @@ export class OrganizationUnauthorizeController extends Controller { result: null, duration: null, isPunish: - item.current_holder.profileDiscipline.filter( + item.current_holder.profileDisciplines.filter( (x: any) => new Date( `${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`, diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index e1d76c73..3e91d89d 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -218,7 +218,7 @@ export class ProfileController extends Controller { @Request() request: RequestWithUser, @Body() body: CreateProfileAllFields, ) { - const profileExist = await this.profileRepo.findOneBy({ citizenId: body.citizenId }) + const profileExist = await this.profileRepo.findOneBy({ citizenId: body.citizenId }); if (profileExist) { return new HttpSuccess(profileExist.id); } @@ -755,11 +755,11 @@ export class ProfileController extends Controller { ? null : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id); - const position = await this.positionRepository.findOne({ + const position = await this.positionRepository.findOne({ relations: ["posExecutive"], - where: { - posMasterId: posMaster?.id - } + where: { + posMasterId: posMaster?.id, + }, }); const _profile: any = { @@ -777,15 +777,16 @@ export class ProfileController extends Controller { posTypeName: profile.posType == null ? null : profile.posType.posTypeName, posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank, posTypeId: profile.posType == null ? null : profile.posType.id, - posExecutiveName: position == null || position.posExecutive == null - ? null - : position.posExecutive.posExecutiveName, - posExecutivePriority: position == null || position.posExecutive == null - ? null - : position.posExecutive.posExecutivePriority, - posExecutiveId: position == null || position.posExecutive == null - ? null - : position.posExecutive.id, + posExecutiveName: + position == null || position.posExecutive == null + ? null + : position.posExecutive.posExecutiveName, + posExecutivePriority: + position == null || position.posExecutive == null + ? null + : position.posExecutive.posExecutivePriority, + posExecutiveId: + position == null || position.posExecutive == null ? null : position.posExecutive.id, rootId: profile.current_holders == null || profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == @@ -1725,7 +1726,7 @@ export class ProfileController extends Controller { .leftJoinAndSelect("posMaster.positions", "positions") .leftJoinAndSelect("positions.posExecutive", "posExecutive") .leftJoinAndSelect("current_holder.profileSalary", "profileSalary") - .leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline") + .leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines") .leftJoinAndSelect("current_holder.posLevel", "posLevel") .leftJoinAndSelect("current_holder.posType", "posType") .where((qb) => { @@ -1886,7 +1887,7 @@ export class ProfileController extends Controller { result: null, duration: null, isPunish: - item.current_holder.profileDiscipline.filter( + item.current_holder.profileDisciplines.filter( (x: any) => new Date( `${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`, @@ -1933,14 +1934,14 @@ export class ProfileController extends Controller { const posMaster = await this.posMasterRepo.findOne({ where: { current_holderId: profile.id, - orgRevisionId: revisionId - } + orgRevisionId: revisionId, + }, }); - const position = await this.positionRepository.findOne({ + const position = await this.positionRepository.findOne({ relations: ["posExecutive"], - where: { - posMasterId: posMaster?.id - } + where: { + posMasterId: posMaster?.id, + }, }); const _profile = { @@ -1957,15 +1958,16 @@ export class ProfileController extends Controller { posTypeName: profile.posType == null ? null : profile.posType.posTypeName, posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank, posTypeId: profile.posType == null ? null : profile.posType.id, - posExecutiveName: position == null || position.posExecutive == null - ? null - : position.posExecutive.posExecutiveName, - posExecutivePriority: position == null || position.posExecutive == null - ? null - : position.posExecutive.posExecutivePriority, - posExecutiveId: position == null || position.posExecutive == null - ? null - : position.posExecutive.id, + posExecutiveName: + position == null || position.posExecutive == null + ? null + : position.posExecutive.posExecutiveName, + posExecutivePriority: + position == null || position.posExecutive == null + ? null + : position.posExecutive.posExecutivePriority, + posExecutiveId: + position == null || position.posExecutive == null ? null : position.posExecutive.id, rootId: profile.current_holders == null || profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null || diff --git a/src/controllers/ProfileDisciplineController.ts b/src/controllers/ProfileDisciplineController.ts index 62fc4256..e7690b77 100644 --- a/src/controllers/ProfileDisciplineController.ts +++ b/src/controllers/ProfileDisciplineController.ts @@ -169,7 +169,7 @@ export class ProfileDisciplineController extends Controller { } @Delete("{disciplineId}") - public async deleteTraning(@Path() disciplineId: string) { + public async deleteDiscipline(@Path() disciplineId: string) { await this.disciplineHistoryRepository.delete({ profileDisciplineId: disciplineId, }); diff --git a/src/controllers/ProfileDisciplineEmployeeController.ts b/src/controllers/ProfileDisciplineEmployeeController.ts index 9dc1ff47..9ed528c8 100644 --- a/src/controllers/ProfileDisciplineEmployeeController.ts +++ b/src/controllers/ProfileDisciplineEmployeeController.ts @@ -145,7 +145,7 @@ export class ProfileDisciplineEmployeeController extends Controller { } @Delete("{disciplineId}") - public async deleteTraning(@Path() disciplineId: string) { + public async deleteDiscipline(@Path() disciplineId: string) { await this.disciplineHistoryRepository.delete({ profileDisciplineId: disciplineId, }); diff --git a/src/controllers/ProfileDutyController.ts b/src/controllers/ProfileDutyController.ts index d2c0ba92..b88754c6 100644 --- a/src/controllers/ProfileDutyController.ts +++ b/src/controllers/ProfileDutyController.ts @@ -157,7 +157,7 @@ export class ProfileDutyController extends Controller { } @Delete("{dutyId}") - public async deleteTraning(@Path() dutyId: string) { + public async deleteDuty(@Path() dutyId: string) { await this.dutyHistoryRepository.delete({ profileDutyId: dutyId, }); diff --git a/src/controllers/ProfileDutyEmployeeController.ts b/src/controllers/ProfileDutyEmployeeController.ts index 25f40f0e..70077ec3 100644 --- a/src/controllers/ProfileDutyEmployeeController.ts +++ b/src/controllers/ProfileDutyEmployeeController.ts @@ -118,7 +118,7 @@ export class ProfileDutyEmployeeController extends Controller { } @Delete("{dutyId}") - public async deleteTraning(@Path() dutyId: string) { + public async deleteDuty(@Path() dutyId: string) { await this.dutyHistoryRepository.delete({ profileDutyId: dutyId, }); diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index a553539b..3df03f86 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -975,7 +975,7 @@ export class ProfileEmployeeController extends Controller { .leftJoinAndSelect("employeePosMaster.orgChild4", "orgChild4") .leftJoinAndSelect("employeePosMaster.positions", "positions") .leftJoinAndSelect("current_holder.profileSalary", "profileSalary") - .leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline") + .leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines") .leftJoinAndSelect("current_holder.posLevel", "posLevel") .leftJoinAndSelect("current_holder.posType", "posType") .where((qb) => { @@ -1128,7 +1128,7 @@ export class ProfileEmployeeController extends Controller { result: null, duration: null, isPunish: - item.current_holder.profileDiscipline.filter( + item.current_holder.profileDisciplines.filter( (x: any) => new Date( `${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`, diff --git a/src/controllers/ProfileLeaveController.ts b/src/controllers/ProfileLeaveController.ts index 54fb5d8e..6510dff1 100644 --- a/src/controllers/ProfileLeaveController.ts +++ b/src/controllers/ProfileLeaveController.ts @@ -221,7 +221,7 @@ export class ProfileLeaveController extends Controller { } @Delete("{leaveId}") - public async deleteTraning(@Path() leaveId: string) { + public async deleteLeave(@Path() leaveId: string) { await this.leaveHistoryRepo.delete({ profileLeaveId: leaveId, }); diff --git a/src/controllers/ProfileLeaveEmployeeController.ts b/src/controllers/ProfileLeaveEmployeeController.ts index 2a88b9a6..6fa06140 100644 --- a/src/controllers/ProfileLeaveEmployeeController.ts +++ b/src/controllers/ProfileLeaveEmployeeController.ts @@ -119,7 +119,7 @@ export class ProfileLeaveEmployeeController extends Controller { } @Delete("{leaveId}") - public async deleteTraning(@Path() leaveId: string) { + public async deleteLeave(@Path() leaveId: string) { await this.leaveHistoryRepo.delete({ profileLeaveId: leaveId, }); diff --git a/src/controllers/ProfileOtherController.ts b/src/controllers/ProfileOtherController.ts index f5e1f81e..1a4eeeed 100644 --- a/src/controllers/ProfileOtherController.ts +++ b/src/controllers/ProfileOtherController.ts @@ -134,7 +134,7 @@ export class ProfileOtherController extends Controller { } @Delete("{otherId}") - public async deleteTraning(@Path() otherId: string) { + public async deleteOther(@Path() otherId: string) { await this.otherHistoryRepository.delete({ profileOtherId: otherId, }); diff --git a/src/controllers/ProfileOtherEmployeeController.ts b/src/controllers/ProfileOtherEmployeeController.ts index c6312bba..c71ed332 100644 --- a/src/controllers/ProfileOtherEmployeeController.ts +++ b/src/controllers/ProfileOtherEmployeeController.ts @@ -105,7 +105,7 @@ export class ProfileOtherEmployeeController extends Controller { } @Delete("{otherId}") - public async deleteTraning(@Path() otherId: string) { + public async deleteOther(@Path() otherId: string) { await this.otherHistoryRepository.delete({ profileOtherId: otherId, }); diff --git a/src/entities/Profile.ts b/src/entities/Profile.ts index 1d7b8d04..28e0763d 100644 --- a/src/entities/Profile.ts +++ b/src/entities/Profile.ts @@ -4,7 +4,6 @@ import { PosMaster } from "./PosMaster"; import { PosLevel } from "./PosLevel"; import { PosType } from "./PosType"; import { ProfileSalary } from "./ProfileSalary"; -import { ProfileDiscipline } from "./ProfileDiscipline"; import { ProfileCertificate } from "./ProfileCertificate"; import { ProfileEducation } from "./ProfileEducation"; import { ProfileTraining } from "./ProfileTraining"; @@ -22,6 +21,7 @@ import { Province } from "./Province"; import { SubDistrict } from "./SubDistrict"; import { District } from "./District"; import { ProfileAvatar } from "./ProfileAvatar"; +import { ProfileDiscipline } from "./ProfileDiscipline"; @Entity("profile") export class Profile extends EntityBase { @@ -267,7 +267,7 @@ export class Profile extends EntityBase { profileSalary: ProfileSalary[]; @OneToMany(() => ProfileDiscipline, (profileDiscipline) => profileDiscipline.profile) - profileDiscipline: ProfileDiscipline[]; + profileDisciplines: ProfileDiscipline[]; @OneToMany(() => ProfileCertificate, (profileCertificate) => profileCertificate.profile) profileCertificates: ProfileCertificate[]; diff --git a/src/entities/ProfileDiscipline.ts b/src/entities/ProfileDiscipline.ts index 0c93adf2..ca698a75 100644 --- a/src/entities/ProfileDiscipline.ts +++ b/src/entities/ProfileDiscipline.ts @@ -75,7 +75,7 @@ export class ProfileDiscipline extends EntityBase { ) profileDisciplineHistories: ProfileDisciplineHistory[]; - @ManyToOne(() => Profile, (profile) => profile.profileDiscipline) + @ManyToOne(() => Profile, (profile) => profile.profileDisciplines) @JoinColumn({ name: "profileId" }) profile: Profile; diff --git a/src/entities/ProfileDisciplineEmployee.ts b/src/entities/ProfileDisciplineEmployee.ts deleted file mode 100644 index 70cb6207..00000000 --- a/src/entities/ProfileDisciplineEmployee.ts +++ /dev/null @@ -1,106 +0,0 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; -import { EntityBase } from "./base/Base"; -import { ProfileEmployee } from "./ProfileEmployee"; -import { ProfileDisciplineEmployeeHistory } from "./ProfileDisciplineEmployeeHistory"; - -@Entity("profileDisciplineEmployee") -export class ProfileDisciplineEmployee extends EntityBase { - @Column({ - nullable: true, - type: "datetime", - comment: "วันที่", - default: null, - }) - date: Date; - - @Column({ - length: 40, - comment: "ไอดีโปรไฟล์", - type: "uuid", - }) - profileId: string; - - @Column({ - comment: "สถานะการใช้งาน", - default: false, - }) - isActive: boolean; - - @Column({ - nullable: true, - comment: "ระดับความผิด", - type: "text", - default: null, - }) - level: string; - - @Column({ - nullable: true, - comment: "รายละเอียด", - type: "text", - default: null, - }) - detail: string; - - @Column({ - nullable: true, - type: "datetime", - comment: "เอกสารอ้างอิง (ลงวันที่)", - default: null, - }) - refCommandDate: Date; - - @Column({ - nullable: true, - comment: "เอกสารอ้างอิง (เลขที่คำสั่ง)", - type: "text", - default: null, - }) - refCommandNo: string; - - @Column({ - nullable: true, - comment: "ล้างมลทิน", - type: "text", - default: null, - }) - unStigma: string; - - @OneToMany( - () => ProfileDisciplineEmployeeHistory, - (profileDisciplineHistory) => profileDisciplineHistory.histories, - ) - profileDisciplineHistories: ProfileDisciplineEmployeeHistory[]; - - @ManyToOne(() => ProfileEmployee, (profile) => profile.profileDiscipline) - @JoinColumn({ name: "profileId" }) - profile: ProfileEmployee; -} - -export class CreateProfileDisciplineEmployee { - @Column() - date: Date | null; - - @Column() - profileId: string; - - @Column() - isActive: boolean | null; - - @Column() - level: string | null; - - @Column() - detail: string | null; - - @Column() - refCommandDate: Date | null; - - @Column() - refCommandNo: string | null; - - @Column() - unStigma: string | null; -} - -export type UpdateProfileDisciplineEmployee = Partial; diff --git a/src/entities/ProfileDisciplineEmployeeHistory.ts b/src/entities/ProfileDisciplineEmployeeHistory.ts deleted file mode 100644 index 2b8089c4..00000000 --- a/src/entities/ProfileDisciplineEmployeeHistory.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; -import { EntityBase } from "./base/Base"; -import { ProfileDisciplineEmployee } from "./ProfileDisciplineEmployee"; - -@Entity("profileDisciplineEmployeeHistory") -export class ProfileDisciplineEmployeeHistory extends EntityBase { - @Column({ - nullable: true, - type: "datetime", - comment: "วันที่", - default: null, - }) - date: Date; - - @Column({ - length: 40, - comment: "ล้างมลทิน", - type: "uuid", - }) - profileDisciplineId: string; - - @Column({ - comment: "สถานะการใช้งาน", - default: false, - }) - isActive: boolean; - - @Column({ - nullable: true, - comment: "ระดับความผิด", - type: "text", - default: null, - }) - level: string; - - @Column({ - nullable: true, - comment: "รายละเอียด", - type: "text", - default: null, - }) - detail: string; - - @Column({ - nullable: true, - type: "datetime", - comment: "เอกสารอ้างอิง (ลงวันที่)", - default: null, - }) - refCommandDate: Date; - - @Column({ - nullable: true, - comment: "เอกสารอ้างอิง (เลขที่คำสั่ง)", - type: "text", - default: null, - }) - refCommandNo: string; - - @Column({ - nullable: true, - comment: "ล้างมลทิน", - type: "text", - default: null, - }) - unStigma: string; - - @ManyToOne( - () => ProfileDisciplineEmployee, - (profileDiscipline) => profileDiscipline.profileDisciplineHistories, - ) - @JoinColumn({ name: "profileDisciplineId" }) - histories: ProfileDisciplineEmployee; -} diff --git a/src/entities/ProfileEmployee.ts b/src/entities/ProfileEmployee.ts index 53d5b1cd..db38a05c 100644 --- a/src/entities/ProfileEmployee.ts +++ b/src/entities/ProfileEmployee.ts @@ -4,7 +4,6 @@ import { EmployeePosLevel } from "./EmployeePosLevel"; import { EmployeePosType } from "./EmployeePosType"; import { EmployeePosMaster } from "./EmployeePosMaster"; import { ProfileSalaryEmployee } from "./ProfileSalaryEmployee"; -import { ProfileDisciplineEmployee } from "./ProfileDisciplineEmployee"; import { ProfileCertificate } from "./ProfileCertificate"; import { ProfileTraining } from "./ProfileTraining"; import { ProfileInsignia } from "./ProfileInsignia"; @@ -216,9 +215,6 @@ export class ProfileEmployee extends EntityBase { @OneToMany(() => ProfileSalaryEmployee, (v) => v.profile) profileSalary: ProfileSalaryEmployee[]; - @OneToMany(() => ProfileDisciplineEmployee, (v) => v.profile) - profileDiscipline: ProfileDisciplineEmployee[]; - @OneToMany(() => ProfileCertificate, (v) => v.profileEmployee) profileCertificates: ProfileCertificate[];