From 3bfd309ae854ffc84da6c487cd1bffbb498fd031 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 9 May 2024 11:25:08 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B9=88?=
 =?UTF-8?q?=E0=B8=B2=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/KpiUserEvaluationController.ts   | 10 ++++++----
 src/entities/kpiUserEvaluation.ts                |  4 ++--
 ...e_kpiUserEvaluation_add_evaluationReqEdit1.ts | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts

diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts
index 7490744..0fa0fc6 100644
--- a/src/controllers/KpiUserEvaluationController.ts
+++ b/src/controllers/KpiUserEvaluationController.ts
@@ -240,7 +240,7 @@ export class KpiUserEvaluationController extends Controller {
   @Get("{id}")
   async GetKpiUserEvaluationById(@Path() id: string) {
     const kpiUserEvaluation = await this.kpiUserEvalutionRepository.findOne({
-      relations:["kpiPeriod"],
+      relations: ["kpiPeriod"],
       where: { id: id },
     });
     if (!kpiUserEvaluation) {
@@ -257,6 +257,7 @@ export class KpiUserEvaluationController extends Controller {
       lastName: kpiUserEvaluation.lastName,
       evaluationStatus: kpiUserEvaluation.evaluationStatus,
       evaluationResults: kpiUserEvaluation.evaluationResults,
+      evaluationReqEdit: kpiUserEvaluation.evaluationReqEdit,
       createdAt: kpiUserEvaluation.createdAt,
       evaluatorId: kpiUserEvaluation.evaluatorId,
       commanderId: kpiUserEvaluation.commanderId,
@@ -267,8 +268,9 @@ export class KpiUserEvaluationController extends Controller {
       capacityPoint: kpiUserEvaluation.capacityPoint,
       kpiPeriodId: kpiUserEvaluation.kpiPeriodId,
       year: kpiUserEvaluation.kpiPeriod == null ? null : kpiUserEvaluation.kpiPeriod.year,
-      durationKPI: kpiUserEvaluation.kpiPeriod == null ? null :  kpiUserEvaluation.kpiPeriod.durationKPI,
-    }
+      durationKPI:
+        kpiUserEvaluation.kpiPeriod == null ? null : kpiUserEvaluation.kpiPeriod.durationKPI,
+    };
     return new HttpSuccess(mapData);
   }
 
@@ -289,7 +291,7 @@ export class KpiUserEvaluationController extends Controller {
   ) {
     const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
       .createQueryBuilder("kpiUserEvaluation")
-      .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") 
+      .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
       .andWhere(kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", {
         kpiPeriodId: kpiPeriodId,
       })
diff --git a/src/entities/kpiUserEvaluation.ts b/src/entities/kpiUserEvaluation.ts
index 0754186..61955bb 100644
--- a/src/entities/kpiUserEvaluation.ts
+++ b/src/entities/kpiUserEvaluation.ts
@@ -80,7 +80,7 @@ export class KpiUserEvaluation extends EntityBase {
     length: 40,
     comment:
       "ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน",
-    default: null,
+    default: "PENDING",
   })
   evaluationResults: string;
 
@@ -88,7 +88,7 @@ export class KpiUserEvaluation extends EntityBase {
     nullable: true,
     length: 40,
     comment: "คำขอแก้ไข",
-    default: null,
+    default: "NEW",
   })
   evaluationReqEdit: string;
 
diff --git a/src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts b/src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts
new file mode 100644
index 0000000..4f9c5fc
--- /dev/null
+++ b/src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts
@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateTableKpiUserEvaluationAddEvaluationReqEdit11715228658780 implements MigrationInterface {
+    name = 'UpdateTableKpiUserEvaluationAddEvaluationReqEdit11715228658780'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationResults\` \`evaluationResults\` varchar(40) NULL COMMENT 'ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน' DEFAULT 'PENDING'`);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationReqEdit\` \`evaluationReqEdit\` varchar(40) NULL COMMENT 'คำขอแก้ไข' DEFAULT 'NEW'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationReqEdit\` \`evaluationReqEdit\` varchar(40) NULL COMMENT 'คำขอแก้ไข'`);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationResults\` \`evaluationResults\` varchar(40) NULL COMMENT 'ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน'`);
+    }
+
+}