fix OrgController

src/entities/OrgChild1.ts

@@ -114,9 +114,6 @@ export class CreateOrgChild1 {
   @Column()
   orgChild1Rank: string;
 
-  // @Column()
-  // orgChild1Order?: number;
-
   @Column()
   orgChild1PhoneEx: string;
 
@@ -126,9 +123,6 @@ export class CreateOrgChild1 {
   @Column()
   orgChild1Fax: string;
 
-  @Column()
-  orgChild1IsNormal: boolean;
-
   @Column('uuid')
   orgRootId: string;
 

src/entities/OrgChild2.ts

@@ -129,9 +129,6 @@ export class CreateOrgChild2 {
   @Column()
   orgChild2Rank: string;
 
-  // @Column()
-  // orgChild2Order: number;
-
   @Column()
   orgChild2PhoneEx: string;
 
@@ -141,9 +138,6 @@ export class CreateOrgChild2 {
   @Column()
   orgChild2Fax: string;
 
-  @Column()
-  orgChild2IsNormal: boolean;
-
   @Column('uuid')
   orgChild1Id: string;
 

src/entities/OrgChild3.ts

@@ -126,9 +126,6 @@ export class CreateOrgChild3 {
   @Column()
   orgChild3Rank: string;
 
-  // @Column()
-  // orgChild3Order: number;
-
   @Column()
   orgChild3PhoneEx: string;
 
@@ -138,9 +135,6 @@ export class CreateOrgChild3 {
   @Column()
   orgChild3Fax: string;
 
-  @Column()
-  orgChild3IsNormal: boolean;
-
   @Column('uuid')
   orgChild2Id: string;
 

src/entities/OrgChild4.ts

@@ -136,9 +136,6 @@ export class CreateOrgChild4 {
   @Column()
   orgChild4Rank: string;
 
-  // @Column()
-  // orgChild4Order: number;
-
   @Column()
   orgChild4PhoneEx: string;
 
@@ -147,9 +144,6 @@ export class CreateOrgChild4 {
 
   @Column()
   orgChild4Fax: string;
-
-  @Column()
-  orgChild4IsNormal: boolean;
   
   @Column('uuid')
   orgChild3Id: string;

src/entities/OrgRevision.ts

@@ -1,5 +1,6 @@
-import { Entity, Column, ManyToOne, JoinColumn, OneToOne } from "typeorm";
+import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm";
 import { EntityBase } from "./base/Base";
+import { OrgRoot } from "./OrgRoot";
 
 @Entity("orgRevision")
 export class OrgRevision extends EntityBase {
@@ -38,7 +39,9 @@ export class OrgRevision extends EntityBase {
   })
   orgRevisionIsDraft: boolean;
 
-  
+  @OneToMany(() => OrgRoot, (orgRoot) => orgRoot.orgRevision)
+  orgRoots: OrgRoot[];
 }
 
+
 export type UpdateOrgRevision = Partial<OrgRevision>;

src/entities/OrgRoot.ts

@@ -1,6 +1,7 @@
 import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm";
 import { EntityBase } from "./base/Base";
 import { OrgChild1 } from "./OrgChild1";
+import { OrgRevision } from "./OrgRevision";
 
 // ENUM orgRootRank
 enum OrgRootRank {
@@ -75,7 +76,7 @@ export class OrgRoot extends EntityBase {
   @Column({
     nullable: true,
     comment: "สถานะของหน่วยงาน", //ปกติ = 1 , ยุกเลิก = 0
-    default: true,
+    default: false,
   })
   orgRootIsNormal: boolean;
 
@@ -90,12 +91,16 @@ export class OrgRoot extends EntityBase {
     default: "00000000-0000-0000-0000-000000000000",
   })
   isAncestorDNA: string;
-
+  
+  @ManyToOne(() => OrgRevision, orgRevision => orgRevision.orgRoots)
+  @JoinColumn({ name: "orgRevisionId" })
+  orgRevision: OrgRevision;
+  
   @OneToMany(() => OrgChild1, (orgChild1) => orgChild1.orgRoot)
   orgChild1s: OrgChild1[];
+
 }
 
-export type UpdateOrgRoot = Partial<OrgRoot>;
 
 export class CreateOrgRoot {
   @Column()
@@ -110,18 +115,19 @@ export class CreateOrgRoot {
   @Column()
   orgRootRank: OrgRootRank;
 
-  // @Column()
-  // orgRootOrder: number;
+  @Column()
+  orgRootPhoneEx?: string;
 
   @Column()
-  orgRootPhoneEx: string;
+  orgRootPhoneIn?: string;
 
   @Column()
-  orgRootPhoneIn: string;
+  orgRootFax?: string;
+  
+  @Column('uuid')
+  orgRevisionId: string;
 
-  @Column()
-  orgRootFax: string;
 
-  @Column()
-  orgRootIsNormal: boolean;
 }
+
+export type UpdateOrgRoot = Partial<CreateOrgRoot> & { orgRootRank?: OrgRootRank };