From c17a8604d3d149b9525a82810b3de5e99cb7d515 Mon Sep 17 00:00:00 2001 From: "fazri.is" Date: Wed, 31 Dec 2025 14:07:11 +0700 Subject: [PATCH 1/4] update --- src/entity/hrms/hrms_training.ts | 6 +++++- src/entity/hrms/hrms_training_participant.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/entity/hrms/hrms_training.ts b/src/entity/hrms/hrms_training.ts index 5e4ee5f..fbbc3ae 100644 --- a/src/entity/hrms/hrms_training.ts +++ b/src/entity/hrms/hrms_training.ts @@ -1,8 +1,9 @@ -import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { Status } from "../../types/status"; import { HrmsFaculty } from "./hrms_faculty"; import { HrmsEmployee } from "./hrms_employee"; +import { HrmsTrainingParticipant } from "./hrms_training_participant"; @Entity("hrms_trainings") export class HrmsTraining { @@ -37,6 +38,9 @@ export class HrmsTraining { }) status: Status; + @OneToMany(() => HrmsTrainingParticipant, (participant) => participant.training) + training_participant: HrmsTrainingParticipant[]; + @Column() @CreateDateColumn() created_at: Date; diff --git a/src/entity/hrms/hrms_training_participant.ts b/src/entity/hrms/hrms_training_participant.ts index 12f9b71..6141b0e 100644 --- a/src/entity/hrms/hrms_training_participant.ts +++ b/src/entity/hrms/hrms_training_participant.ts @@ -10,7 +10,7 @@ export class HrmsTrainingParticipant { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => HrmsTraining, { onDelete: "NO ACTION", nullable: false }) + @ManyToOne(() => HrmsTraining, (training) => training.training_participant, { onDelete: "NO ACTION" }) @JoinColumn() training: HrmsTraining; From d9aee140cdf0fa4fb482079dd478b9b375637092 Mon Sep 17 00:00:00 2001 From: "fazri.is" Date: Wed, 31 Dec 2025 14:08:32 +0700 Subject: [PATCH 2/4] update --- src/entity/hrms/hrms_training.ts | 6 +----- src/entity/hrms/hrms_training_participant.ts | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/entity/hrms/hrms_training.ts b/src/entity/hrms/hrms_training.ts index fbbc3ae..5e4ee5f 100644 --- a/src/entity/hrms/hrms_training.ts +++ b/src/entity/hrms/hrms_training.ts @@ -1,9 +1,8 @@ -import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn } from "typeorm"; import { Status } from "../../types/status"; import { HrmsFaculty } from "./hrms_faculty"; import { HrmsEmployee } from "./hrms_employee"; -import { HrmsTrainingParticipant } from "./hrms_training_participant"; @Entity("hrms_trainings") export class HrmsTraining { @@ -38,9 +37,6 @@ export class HrmsTraining { }) status: Status; - @OneToMany(() => HrmsTrainingParticipant, (participant) => participant.training) - training_participant: HrmsTrainingParticipant[]; - @Column() @CreateDateColumn() created_at: Date; diff --git a/src/entity/hrms/hrms_training_participant.ts b/src/entity/hrms/hrms_training_participant.ts index 6141b0e..12f9b71 100644 --- a/src/entity/hrms/hrms_training_participant.ts +++ b/src/entity/hrms/hrms_training_participant.ts @@ -10,7 +10,7 @@ export class HrmsTrainingParticipant { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => HrmsTraining, (training) => training.training_participant, { onDelete: "NO ACTION" }) + @ManyToOne(() => HrmsTraining, { onDelete: "NO ACTION", nullable: false }) @JoinColumn() training: HrmsTraining; From 43a9d72548ad58abe821b0afff1831fba1f48962 Mon Sep 17 00:00:00 2001 From: "fazri.is" Date: Wed, 31 Dec 2025 15:29:54 +0700 Subject: [PATCH 3/4] update --- src/entity/hrms/hrms_faculty.ts | 2 +- src/entity/hrms/hrms_scholarship.ts | 2 +- src/entity/hrms/hrms_study.ts | 2 +- src/entity/hrms/hrms_training.ts | 2 +- src/entity/hrms/hrms_training_participant.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/entity/hrms/hrms_faculty.ts b/src/entity/hrms/hrms_faculty.ts index 735f95a..e4862f6 100644 --- a/src/entity/hrms/hrms_faculty.ts +++ b/src/entity/hrms/hrms_faculty.ts @@ -2,7 +2,7 @@ import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateCol import { Status } from "../../types/status"; -@Entity("hrms_faculties") +@Entity("hrms_faculties", { schema: "hrms" }) export class HrmsFaculty { @PrimaryGeneratedColumn("uuid") id: string; diff --git a/src/entity/hrms/hrms_scholarship.ts b/src/entity/hrms/hrms_scholarship.ts index d7138e6..86743c1 100644 --- a/src/entity/hrms/hrms_scholarship.ts +++ b/src/entity/hrms/hrms_scholarship.ts @@ -5,7 +5,7 @@ import { HrmsFaculty } from "./hrms_faculty"; import { HrmsEmployee } from "./hrms_employee"; import { HrmsStudy } from "./hrms_study"; -@Entity("hrms_scholarships") +@Entity("hrms_scholarships", { schema: "hrms" }) export class HrmsScholarship { @PrimaryGeneratedColumn("uuid") id: string; diff --git a/src/entity/hrms/hrms_study.ts b/src/entity/hrms/hrms_study.ts index e50fe6a..933fe69 100644 --- a/src/entity/hrms/hrms_study.ts +++ b/src/entity/hrms/hrms_study.ts @@ -2,7 +2,7 @@ import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateCol import { Status } from "../../types/status"; -@Entity("studies") +@Entity("studies", { schema: "hrms" }) export class HrmsStudy { @PrimaryGeneratedColumn("uuid") id: string; diff --git a/src/entity/hrms/hrms_training.ts b/src/entity/hrms/hrms_training.ts index 5e4ee5f..28f726c 100644 --- a/src/entity/hrms/hrms_training.ts +++ b/src/entity/hrms/hrms_training.ts @@ -4,7 +4,7 @@ import { Status } from "../../types/status"; import { HrmsFaculty } from "./hrms_faculty"; import { HrmsEmployee } from "./hrms_employee"; -@Entity("hrms_trainings") +@Entity("hrms_trainings", { schema: "hrms" }) export class HrmsTraining { @PrimaryGeneratedColumn("uuid") id: string; diff --git a/src/entity/hrms/hrms_training_participant.ts b/src/entity/hrms/hrms_training_participant.ts index 12f9b71..a3973c2 100644 --- a/src/entity/hrms/hrms_training_participant.ts +++ b/src/entity/hrms/hrms_training_participant.ts @@ -5,7 +5,7 @@ import { HrmsEmployee } from "./hrms_employee"; import { HrmsDepartment } from "./hrms_department"; import { HrmsTraining } from "./hrms_training"; -@Entity("hrms_training_participants") +@Entity("hrms_training_participants", { schema: "hrms" }) export class HrmsTrainingParticipant { @PrimaryGeneratedColumn("uuid") id: string; From 56d84a09416ff1f89bbc2242face3a765174a67f Mon Sep 17 00:00:00 2001 From: Sony Surahmn Date: Wed, 31 Dec 2025 16:20:15 +0700 Subject: [PATCH 4/4] Add finance funding sources entity and update exports --- src/entity/finance/finance_funding_sources.ts | 56 +++++++++++++++++++ src/index.ts | 3 +- src/schema/finances.ts | 1 + 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 src/entity/finance/finance_funding_sources.ts create mode 100644 src/schema/finances.ts diff --git a/src/entity/finance/finance_funding_sources.ts b/src/entity/finance/finance_funding_sources.ts new file mode 100644 index 0000000..569aa8f --- /dev/null +++ b/src/entity/finance/finance_funding_sources.ts @@ -0,0 +1,56 @@ +import { Entity, PrimaryGeneratedColumn, Column, OneToMany, PrimaryColumn, CreateDateColumn, UpdateDateColumn, DeleteDateColumn } from "typeorm"; +import { Status } from "../../types/status"; + +@Entity("finance_funding_sources", { schema: "finances" }) +export class FinanceFundingSource { + @PrimaryGeneratedColumn("uuid") + id: string; + + @Column({ + nullable: false, + unique: false, + length: 64, + }) + code: string; + + @Column({ + nullable: false, + unique: false, + length: 64, + }) + name: string; + + @Column({ + nullable: true, + unique: false, + length: 64, + }) + description: string; + + @Column({ + nullable: false, + length: 64, + }) + status: Status; + + @Column() + @CreateDateColumn() + created_at: Date; + + @Column({ nullable: true, length: 256 }) + created_by: string; + + @Column({ nullable: true }) + @UpdateDateColumn() + updated_at: Date; + + @Column({ nullable: true, length: 256 }) + updated_by: string; + + @Column({ nullable: true }) + @DeleteDateColumn() + deleted_at: Date; + + @Column({ nullable: true, length: 256 }) + deleted_by: string; +} diff --git a/src/index.ts b/src/index.ts index bad606b..9544fa4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,2 +1,3 @@ export * from "./schema/public"; -export * from "./schema/hrms"; \ No newline at end of file +export * from "./schema/hrms"; +export * from "./schema/finances"; diff --git a/src/schema/finances.ts b/src/schema/finances.ts new file mode 100644 index 0000000..add5a81 --- /dev/null +++ b/src/schema/finances.ts @@ -0,0 +1 @@ +export * from "../entity/finance/finance_funding_sources";