From ede58734e307a36d1d76387fd6b2318b3e3f9449 Mon Sep 17 00:00:00 2001 From: "fazri.is" Date: Wed, 20 Aug 2025 16:51:57 +0700 Subject: [PATCH] update --- src/entity/eform_beneficial_owner_identities.ts | 5 ++--- src/entity/eform_beneficial_owner_jobs.ts | 5 ++--- src/entity/eform_beneficial_owners.ts | 12 +++++++++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/entity/eform_beneficial_owner_identities.ts b/src/entity/eform_beneficial_owner_identities.ts index 3984fdc..0e0b549 100644 --- a/src/entity/eform_beneficial_owner_identities.ts +++ b/src/entity/eform_beneficial_owner_identities.ts @@ -1,4 +1,4 @@ -import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm"; +import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm"; import { EformBeneficialOwner } from "./eform_beneficial_owners"; import { EformIdentityType } from "../types/eform"; @@ -7,8 +7,7 @@ export class EformBeneficialOwnerIdentity { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EformBeneficialOwner, { onDelete: "NO ACTION", nullable: true }) - @JoinColumn() + @OneToOne(() => EformBeneficialOwner, (beneficial_owner) => beneficial_owner.identity, { onDelete: "CASCADE" }) beneficial_owner: EformBeneficialOwner; @Column({ diff --git a/src/entity/eform_beneficial_owner_jobs.ts b/src/entity/eform_beneficial_owner_jobs.ts index 732b6ce..e721b86 100644 --- a/src/entity/eform_beneficial_owner_jobs.ts +++ b/src/entity/eform_beneficial_owner_jobs.ts @@ -1,4 +1,4 @@ -import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm"; +import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm"; import { EformConfigOccupation } from "./eform_config_occupations"; import { EformConfigBusinessField } from "./eform_config_business_fields"; import { EformConfigSourceIncome } from "./eform_config_source_incomes"; @@ -9,8 +9,7 @@ export class EformBeneficialOwnerJob { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EformBeneficialOwner, { onDelete: "NO ACTION", nullable: true }) - @JoinColumn() + @OneToOne(() => EformBeneficialOwner, (beneficial_owner) => beneficial_owner.identity, { onDelete: "CASCADE" }) beneficial_owner: EformBeneficialOwner; @ManyToOne(() => EformConfigOccupation, { onDelete: "NO ACTION", nullable: true }) diff --git a/src/entity/eform_beneficial_owners.ts b/src/entity/eform_beneficial_owners.ts index 338ef2c..3d288f6 100644 --- a/src/entity/eform_beneficial_owners.ts +++ b/src/entity/eform_beneficial_owners.ts @@ -1,4 +1,4 @@ -import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm"; +import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm"; import { EformGender, EformIdentityType } from "../types/eform"; import { EformRegionMunisipo } from "./eform_region_munisipos"; import { EformRegionAdministrativu } from "./eform_region_administrativus"; @@ -10,6 +10,8 @@ import { EformConfigSourceIncome } from "./eform_config_source_incomes"; import { EformConfigRelation } from "./eform_config_relations"; import { EformConfigNationality } from "./eform_config_nationalities"; import { EformRequest } from "./eform_requests"; +import { EformBeneficialOwnerIdentity } from "./eform_beneficial_owner_identities"; +import { EformBeneficialOwnerJob } from "./eform_beneficial_owner_jobs"; @Entity("eform_beneficial_owners", { schema: "eforms" }) export class EformBeneficialOwner { @PrimaryGeneratedColumn("uuid") @@ -51,6 +53,14 @@ export class EformBeneficialOwner { @JoinColumn() aldeia: EformRegionAldeia; + @OneToOne(() => EformBeneficialOwnerIdentity, (beneficial_identity) => beneficial_identity.beneficial_owner, { cascade: true }) + @JoinColumn() + identity: EformBeneficialOwnerIdentity; + + @OneToOne(() => EformBeneficialOwnerJob, (beneficial_job) => beneficial_job.beneficial_owner, { cascade: true }) + @JoinColumn() + job: EformBeneficialOwnerJob; + @Column({ nullable: false, length: 4096,