From eb554bc0e3b241c0cdf9f24c44095647cfb1fdf9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 31 Oct 2024 11:26:44 +0700
Subject: [PATCH] add columns Assign=>   reportPersonId

---
 src/controllers/AssignController.ts      |  1 +
 src/entities/Assign.ts                   | 56 +++++++++++++++++++-----
 src/migration/1730347219061-addcolmns.ts | 14 ++++++
 3 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 src/migration/1730347219061-addcolmns.ts

diff --git a/src/controllers/AssignController.ts b/src/controllers/AssignController.ts
index 8cb4540..5213d2f 100644
--- a/src/controllers/AssignController.ts
+++ b/src/controllers/AssignController.ts
@@ -467,6 +467,7 @@ export class AssignController extends Controller {
 				"active",
 				"createdAt",
 				"updatedAt",
+				"reportPersonId"
 			],
 			where: { id: assign_id },
 		})
diff --git a/src/entities/Assign.ts b/src/entities/Assign.ts
index 2ab3644..1bf5cbf 100644
--- a/src/entities/Assign.ts
+++ b/src/entities/Assign.ts
@@ -1,7 +1,20 @@
-import { CreateEvaluateCommander, EvaluateCommander } from "./EvaluateCommander";
-import { Entity, Column, OneToMany, JoinColumn, PrimaryGeneratedColumn, ManyToOne } from "typeorm";
+import {
+  CreateEvaluateCommander,
+  EvaluateCommander,
+} from "./EvaluateCommander";
+import {
+  Entity,
+  Column,
+  OneToMany,
+  JoinColumn,
+  PrimaryGeneratedColumn,
+  ManyToOne,
+} from "typeorm";
 import { EntityBase } from "./base/Base";
-import { AssignCompetencyGroup, CreateAssignCompetencyGroup } from "./AssignCompetencyGroup";
+import {
+  AssignCompetencyGroup,
+  CreateAssignCompetencyGroup,
+} from "./AssignCompetencyGroup";
 import { CreateSurvel, Survey } from "./Survey";
 import { AssignCompetency, CreateAssignCompetency } from "./AssignCompetency";
 import { AssignDirector, CreateAssignDirector } from "./AssignDirector";
@@ -10,7 +23,10 @@ import { AssignKnowledge, CreateAssignKnowledge } from "./AssignKnowledge";
 import { AssignLaw, CreateAssignLaw } from "./AssignLaw";
 import { AssignOutput, CreateAssignOutput } from "./AssignOutput";
 import { AssignSkill, CreateAssignSkill } from "./AssignSkill";
-import { CreateEvaluateAchievement, EvaluateAchievement } from "./EvaluateAchievement";
+import {
+  CreateEvaluateAchievement,
+  EvaluateAchievement,
+} from "./EvaluateAchievement";
 import { CreateEvaluateAssessor, EvaluateAssessor } from "./EvaluateAssessor";
 import { CreateEvaluateChairman, EvaluateChairman } from "./EvaluateChairman";
 import { CreateEvaluateResult, EvaluateResult } from "./EvaluateResult";
@@ -98,16 +114,22 @@ export class Assign extends EntityBase {
 
   @OneToMany(
     () => AssignCompetencyGroup,
-    (competencyGroup: AssignCompetencyGroup) => competencyGroup.assign,
+    (competencyGroup: AssignCompetencyGroup) => competencyGroup.assign
   )
   @JoinColumn({ name: "id" })
   competencyGroups: AssignCompetencyGroup[];
 
-  @OneToMany(() => AssignCompetency, (competency: AssignCompetency) => competency.assign)
+  @OneToMany(
+    () => AssignCompetency,
+    (competency: AssignCompetency) => competency.assign
+  )
   @JoinColumn({ name: "id" })
   competencys: AssignCompetency[];
 
-  @OneToMany(() => AssignDirector, (director: AssignDirector) => director.assign)
+  @OneToMany(
+    () => AssignDirector,
+    (director: AssignDirector) => director.assign
+  )
   @JoinColumn({ name: "id" })
   directors: AssignDirector[];
 
@@ -115,7 +137,10 @@ export class Assign extends EntityBase {
   @JoinColumn({ name: "id" })
   jobs: AssignJob[];
 
-  @OneToMany(() => AssignKnowledge, (knowledge: AssignKnowledge) => knowledge.assign)
+  @OneToMany(
+    () => AssignKnowledge,
+    (knowledge: AssignKnowledge) => knowledge.assign
+  )
   @JoinColumn({ name: "id" })
   knowledges: AssignKnowledge[];
 
@@ -137,28 +162,28 @@ export class Assign extends EntityBase {
 
   @OneToMany(
     () => EvaluateAchievement,
-    (evaluateAchievement: EvaluateAchievement) => evaluateAchievement.assign,
+    (evaluateAchievement: EvaluateAchievement) => evaluateAchievement.assign
   )
   @JoinColumn({ name: "id" })
   evaluateAchievements: EvaluateAchievement;
 
   @OneToMany(
     () => EvaluateAssessor,
-    (evaluateAssessor: EvaluateAssessor) => evaluateAssessor.assign,
+    (evaluateAssessor: EvaluateAssessor) => evaluateAssessor.assign
   )
   @JoinColumn({ name: "id" })
   evaluateAssessors: EvaluateAssessor;
 
   @OneToMany(
     () => EvaluateChairman,
-    (evaluateChairman: EvaluateChairman) => evaluateChairman.assign,
+    (evaluateChairman: EvaluateChairman) => evaluateChairman.assign
   )
   @JoinColumn({ name: "id" })
   evaluateChairmans: EvaluateChairman;
 
   @OneToMany(
     () => EvaluateCommander,
-    (evaluateCommander: EvaluateCommander) => evaluateCommander.assign,
+    (evaluateCommander: EvaluateCommander) => evaluateCommander.assign
   )
   @JoinColumn({ name: "id" })
   evaluateCommanders: EvaluateCommander;
@@ -166,6 +191,12 @@ export class Assign extends EntityBase {
   @OneToMany(() => EvaluateResult, (result: EvaluateResult) => result.assign)
   @JoinColumn({ name: "id" })
   evaluateResults: EvaluateResult;
+
+  @Column({
+    nullable: false,
+    comment: "id คณะกรรมการที่จะประเมินผล",
+  })
+  reportPersonId: string;
 }
 
 export class CreateAssign {
@@ -186,6 +217,7 @@ export class CreateAssign {
   monthSelect?: number;
   other_desc?: string;
   appointId?: string;
+  reportPersonId?: string;
 
   assign_competency_group: CreateAssignCompetencyGroup[];
   assign_competency: CreateAssignCompetency[];
diff --git a/src/migration/1730347219061-addcolmns.ts b/src/migration/1730347219061-addcolmns.ts
new file mode 100644
index 0000000..acade4e
--- /dev/null
+++ b/src/migration/1730347219061-addcolmns.ts
@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class Addculmns1730347219061 implements MigrationInterface {
+    name = 'Addculmns1730347219061'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`assign\` ADD \`reportPersonId\` varchar(255) NOT NULL COMMENT 'id คณะกรรมการที่จะประเมินผล'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`assign\` DROP COLUMN \`reportPersonId\``);
+    }
+
+}