diff --git a/src/entity/hrms/hrms_leave.ts b/src/entity/hrms/hrms_leave.ts index b20024a..928abd1 100644 --- a/src/entity/hrms/hrms_leave.ts +++ b/src/entity/hrms/hrms_leave.ts @@ -20,12 +20,12 @@ export class HrmsLeave { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => HrmsEmployee, { onDelete: "RESTRICT", nullable: false }) - @JoinColumn({ name: "employee_id" }) + @ManyToOne(() => HrmsEmployee, { onDelete: "RESTRICT", nullable: true }) + @JoinColumn() employee: HrmsEmployee; - @ManyToOne(() => HrmsLeaveType, { onDelete: "RESTRICT", nullable: false }) - @JoinColumn({ name: "leave_type_id" }) + @ManyToOne(() => HrmsLeaveType, { onDelete: "RESTRICT", nullable: true }) + @JoinColumn() leave_type: HrmsLeaveType; @Column({ type: "date", nullable: false }) diff --git a/src/entity/hrms/hrms_leave_approval.ts b/src/entity/hrms/hrms_leave_approval.ts index 9c4110d..30b15ed 100644 --- a/src/entity/hrms/hrms_leave_approval.ts +++ b/src/entity/hrms/hrms_leave_approval.ts @@ -26,8 +26,8 @@ export class HrmsLeaveApproval { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => HrmsLeave, leave => leave.approvals, { onDelete: "CASCADE", nullable: false }) - @JoinColumn({ name: "leave_id" }) + @ManyToOne(() => HrmsLeave, leave => leave.approvals, { onDelete: "CASCADE", nullable: true }) + @JoinColumn() leave: HrmsLeave; @Column({ @@ -37,8 +37,8 @@ export class HrmsLeaveApproval { }) approval_type: ApprovalType; - @ManyToOne(() => HrmsEmployee, { onDelete: "RESTRICT", nullable: false }) - @JoinColumn({ name: "approver_id" }) + @ManyToOne(() => HrmsEmployee, { onDelete: "RESTRICT", nullable: true }) + @JoinColumn() approver: HrmsEmployee; @Column({ diff --git a/src/entity/hrms/hrms_leave_document.ts b/src/entity/hrms/hrms_leave_document.ts index 70cfc99..9d0c2da 100644 --- a/src/entity/hrms/hrms_leave_document.ts +++ b/src/entity/hrms/hrms_leave_document.ts @@ -13,8 +13,8 @@ export class HrmsLeaveDocument { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => HrmsLeave, leave => leave.documents, { onDelete: "CASCADE", nullable: false }) - @JoinColumn({ name: "leave_id" }) + @ManyToOne(() => HrmsLeave, leave => leave.documents, { onDelete: "CASCADE", nullable: true }) + @JoinColumn() leave: HrmsLeave; @Column({ length: 256, nullable: false }) diff --git a/src/entity/hrms/hrms_payroll.ts b/src/entity/hrms/hrms_payroll.ts index 2c6f454..a03a71e 100644 --- a/src/entity/hrms/hrms_payroll.ts +++ b/src/entity/hrms/hrms_payroll.ts @@ -17,12 +17,12 @@ export class HrmsPayroll { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => HrmsEmployee, { onDelete: "RESTRICT", nullable: false }) - @JoinColumn({ name: "employee_id" }) + @ManyToOne(() => HrmsEmployee, { onDelete: "RESTRICT", nullable: true }) + @JoinColumn() employee: HrmsEmployee; - @ManyToOne(() => HrmsBank, { onDelete: "RESTRICT", nullable: false }) - @JoinColumn({ name: "bank_id" }) + @ManyToOne(() => HrmsBank, { onDelete: "RESTRICT", nullable: true }) + @JoinColumn() bank: HrmsBank; @Column({ length: 128, nullable: false }) diff --git a/src/entity/hrms/hrms_payroll_monthly.ts b/src/entity/hrms/hrms_payroll_monthly.ts index 4107c5d..2d2aa60 100644 --- a/src/entity/hrms/hrms_payroll_monthly.ts +++ b/src/entity/hrms/hrms_payroll_monthly.ts @@ -19,12 +19,12 @@ export class HrmsPayrollMonthly { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => HrmsEmployee, { onDelete: "RESTRICT", nullable: false }) - @JoinColumn({ name: "employee_id" }) + @ManyToOne(() => HrmsEmployee, { onDelete: "RESTRICT", nullable: true }) + @JoinColumn() employee: HrmsEmployee; @ManyToOne(() => HrmsPayroll, { onDelete: "RESTRICT", nullable: true }) - @JoinColumn({ name: "payroll_setup_id" }) + @JoinColumn() payroll_setup: HrmsPayroll; @Column({ type: "int", nullable: false }) diff --git a/src/entity/hrms/hrms_position.ts b/src/entity/hrms/hrms_position.ts index 367bc2f..a33a2ac 100644 --- a/src/entity/hrms/hrms_position.ts +++ b/src/entity/hrms/hrms_position.ts @@ -29,24 +29,24 @@ export class HrmsPosition { description: string; @ManyToOne(() => HrmsDepartment, { - nullable: false, + nullable: true, onDelete: "RESTRICT" }) - @JoinColumn({ name: "department_id" }) + @JoinColumn() department: HrmsDepartment; @ManyToOne(() => HrmsPosition, position => position.children, { nullable: true, onDelete: "SET NULL" }) - @JoinColumn({ name: "parent_id" }) + @JoinColumn() parent: HrmsPosition; @OneToMany(() => HrmsPosition, position => position.parent) children: HrmsPosition[]; @Column({ - nullable: false, + nullable: true, length: 64 }) status: Status;