diff --git a/src/controllers/KpiSpecialController.ts b/src/controllers/KpiSpecialController.ts index 6bb2e6f..0eac036 100644 --- a/src/controllers/KpiSpecialController.ts +++ b/src/controllers/KpiSpecialController.ts @@ -102,7 +102,7 @@ export class kpiSpecialController extends Controller { } kpiSpecial.lastUpdateUserId = request.user.sub; kpiSpecial.lastUpdateFullName = request.user.name; - this.kpiSpecialRepository.merge(kpiSpecial, requestBody); + Object.assign(kpiSpecial, requestBody); await this.kpiSpecialRepository.save(kpiSpecial); return new HttpSuccess(id); } diff --git a/src/controllers/KpiUserPlannedController.ts b/src/controllers/KpiUserPlannedController.ts index 504e426..e589885 100644 --- a/src/controllers/KpiUserPlannedController.ts +++ b/src/controllers/KpiUserPlannedController.ts @@ -148,7 +148,7 @@ export class KpiUserPlannedController extends Controller { // kpiUserPlanned.achievement4 = request.user.achievement4; // kpiUserPlanned.achievement5 = request.user.achievement5; - this.kpiUserPlannedRepository.merge(kpiUserPlanned, requestBody); + Object.assign(kpiUserPlanned, requestBody); kpiUserPlanned.startDate = requestBody.startDate == undefined ? null : requestBody.startDate; kpiUserPlanned.endDate = requestBody.endDate == undefined ? null : requestBody.endDate; await this.kpiUserPlannedRepository.save(kpiUserPlanned); diff --git a/src/controllers/KpiUserRoleController.ts b/src/controllers/KpiUserRoleController.ts index afaa7a2..bd5d481 100644 --- a/src/controllers/KpiUserRoleController.ts +++ b/src/controllers/KpiUserRoleController.ts @@ -150,7 +150,7 @@ export class KpiUserRoleController extends Controller { kpiUserRole.lastUpdateUserId = request.user.sub; kpiUserRole.lastUpdateFullName = request.user.name; - this.kpiUserRoleRepository.merge(kpiUserRole, requestBody); + Object.assign(kpiUserRole, requestBody); kpiUserRole.startDate = requestBody.startDate == undefined ? null : requestBody.startDate; kpiUserRole.endDate = requestBody.endDate == undefined ? null : requestBody.endDate; await this.kpiUserRoleRepository.save(kpiUserRole); diff --git a/src/entities/kpiSpecial.ts b/src/entities/kpiSpecial.ts index 535848b..841baa4 100644 --- a/src/entities/kpiSpecial.ts +++ b/src/entities/kpiSpecial.ts @@ -166,7 +166,7 @@ export class CreateKpiSpecial { @Column() target: string; @Column() - unit: string; + unit: string | null; @Column() weight: number; @Column() @@ -199,7 +199,7 @@ export class UpdateKpiSpecial { @Column() target: string; @Column() - unit: string; + unit: string | null; @Column() weight: number; @Column() diff --git a/src/entities/kpiUserPlanned.ts b/src/entities/kpiUserPlanned.ts index 0c3c2ea..878a860 100644 --- a/src/entities/kpiUserPlanned.ts +++ b/src/entities/kpiUserPlanned.ts @@ -18,7 +18,7 @@ export class KpiUserPlanned extends EntityBase { comment: "หน่วยนับ", default: null, }) - unit: number; + unit: string; @Column({ nullable: true, @@ -149,7 +149,7 @@ export class CreateKpiUserPlanned { @Column() target: string; @Column() - unit: number; + unit: string | null; @Column() weight: number; @Column() @@ -182,7 +182,7 @@ export class UpdateKpiUserPlanned { @Column() target: string; @Column() - unit: number; + unit: string | null; @Column() weight: number; @Column() diff --git a/src/entities/kpiUserRole.ts b/src/entities/kpiUserRole.ts index 08e32b2..da899d1 100644 --- a/src/entities/kpiUserRole.ts +++ b/src/entities/kpiUserRole.ts @@ -19,7 +19,7 @@ export class KpiUserRole extends EntityBase { comment: "หน่วยนับ", default: null, }) - unit: number; + unit: string; @Column({ nullable: true, @@ -150,7 +150,7 @@ export class CreateKpiUserRole { @Column() target: string; @Column() - unit: number; + unit: string | null; @Column() weight: number; @Column() @@ -183,7 +183,7 @@ export class UpdateKpiUserRole { @Column() target: string; @Column() - unit: number; + unit: string | null; @Column() weight: number; @Column() diff --git a/src/entities/kpiUserSpecial.ts b/src/entities/kpiUserSpecial.ts index cce0811..78cd13e 100644 --- a/src/entities/kpiUserSpecial.ts +++ b/src/entities/kpiUserSpecial.ts @@ -185,7 +185,7 @@ export class CreateKpiUserSpecial { @Column() target: string; @Column() - unit: string; + unit: string | null; @Column() weight: number; @Column() @@ -224,7 +224,7 @@ export class UpdateKpiUserSpecial { @Column() target: string; @Column() - unit: string; + unit: string | null; @Column() weight: number; @Column() diff --git a/src/migration/1715244414852-update_table_kpiSpecial_unit_to_string.ts b/src/migration/1715244414852-update_table_kpiSpecial_unit_to_string.ts new file mode 100644 index 0000000..e8fd120 --- /dev/null +++ b/src/migration/1715244414852-update_table_kpiSpecial_unit_to_string.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateTableKpiSpecialUnitToString1715244414852 implements MigrationInterface { + name = 'UpdateTableKpiSpecialUnitToString1715244414852' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`kpiUserPlanned\` DROP COLUMN \`unit\``); + await queryRunner.query(`ALTER TABLE \`kpiUserPlanned\` ADD \`unit\` varchar(255) NULL COMMENT 'หน่วยนับ'`); + await queryRunner.query(`ALTER TABLE \`kpiUserRole\` DROP COLUMN \`unit\``); + await queryRunner.query(`ALTER TABLE \`kpiUserRole\` ADD \`unit\` varchar(255) NULL COMMENT 'หน่วยนับ'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`kpiUserRole\` DROP COLUMN \`unit\``); + await queryRunner.query(`ALTER TABLE \`kpiUserRole\` ADD \`unit\` int NULL COMMENT 'หน่วยนับ'`); + await queryRunner.query(`ALTER TABLE \`kpiUserPlanned\` DROP COLUMN \`unit\``); + await queryRunner.query(`ALTER TABLE \`kpiUserPlanned\` ADD \`unit\` int NULL COMMENT 'หน่วยนับ'`); + } + +}