hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-16 10:33:42 +07:00
commit 0bbd172f2b
6 changed files with 56 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ProfileAvatarController.ts
View file

@ -32,6 +32,7 @@ export class ProfileAvatarController extends Controller {
if (!profile) {
throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
}
result.isActive = true;
profile.avatar = result.avatar;
profile.avatarName = result.avatarName;
return new HttpSuccess();
@ -59,6 +60,7 @@ export class ProfileAvatarController extends Controller {
await this.avatarRepository.save(data);
let avatar = `ทะเบียนประวัติ/โปรไฟล์/${profile.id}`;
let fileName = `profile-${data.id}`;
data.isActive = true;
data.avatar = avatar;
data.avatarName = fileName;
await this.avatarRepository.save(data);

6
src/entities/ProfileAvatar.ts
View file

@ -12,6 +12,12 @@ export class ProfileAvatar extends EntityBase {
})
avatar: string;
@Column({
comment: "สถานะการใช้งาน",
default: false,
})
isActive: boolean;
@Column({
nullable: true,
comment: "รูปถ่าย",

1
src/entities/ProfileDiscipline.ts
View file

@ -15,6 +15,7 @@ export class ProfileDiscipline extends EntityBase {
date: Date;
@Column({
nullable: true,
length: 40,
comment: "ไอดีโปรไฟล์",
type: "uuid",

10
src/entities/ProfileSalaryEmployee.ts
View file

@ -222,11 +222,11 @@ export class ProfileSalaryEmployee extends EntityBase {
})
order: number;
@Column({
comment: "เลขที่คำสั่ง",
type: "text",
})
commandNo: string;
// @Column({
// comment: "เลขที่คำสั่ง",
// type: "text",
// })
// commandNo: string;
@Column({
comment: "ประเภทคำสั่ง",

20
src/migration/1715826963808-add_table_avatarName2.ts Normal file
View file

@ -0,0 +1,20 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class AddTableAvatarName21715826963808 implements MigrationInterface {
name = 'AddTableAvatarName21715826963808'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`profileSalaryEmployee\` DROP COLUMN \`commandNo\``);
await queryRunner.query(`ALTER TABLE \`profileDiscipline\` DROP FOREIGN KEY \`FK_0031dcb981836876de8524eaff1\``);
await queryRunner.query(`ALTER TABLE \`profileDiscipline\` CHANGE \`profileId\` \`profileId\` varchar(40) NULL COMMENT 'ไอดีโปรไฟล์'`);
await queryRunner.query(`ALTER TABLE \`profileDiscipline\` ADD CONSTRAINT \`FK_0031dcb981836876de8524eaff1\` FOREIGN KEY (\`profileId\`) REFERENCES \`profile\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`profileDiscipline\` DROP FOREIGN KEY \`FK_0031dcb981836876de8524eaff1\``);
await queryRunner.query(`ALTER TABLE \`profileDiscipline\` CHANGE \`profileId\` \`profileId\` varchar(40) NOT NULL COMMENT 'ไอดีโปรไฟล์'`);
await queryRunner.query(`ALTER TABLE \`profileDiscipline\` ADD CONSTRAINT \`FK_0031dcb981836876de8524eaff1\` FOREIGN KEY (\`profileId\`) REFERENCES \`profile\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE \`profileSalaryEmployee\` ADD \`commandNo\` text NOT NULL COMMENT 'เลขที่คำสั่ง'`);
}
}

22
src/migration/1715828430262-update_table_ProfileAvatar_add_isactive.ts Normal file
View file

@ -0,0 +1,22 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableProfileAvatarAddIsactive1715828430262 implements MigrationInterface {
name = 'UpdateTableProfileAvatarAddIsactive1715828430262'
public async up(queryRunner: QueryRunner): Promise<void> {
// await queryRunner.query(`ALTER TABLE \`profileSalaryEmployee\` DROP COLUMN \`commandNo\``);
await queryRunner.query(`ALTER TABLE \`profileAvatar\` ADD \`isActive\` tinyint NOT NULL COMMENT 'สถานะการใช้งาน' DEFAULT 0`);
// await queryRunner.query(`ALTER TABLE \`profileDiscipline\` DROP FOREIGN KEY \`FK_0031dcb981836876de8524eaff1\``);
// await queryRunner.query(`ALTER TABLE \`profileDiscipline\` CHANGE \`profileId\` \`profileId\` varchar(40) NULL COMMENT 'ไอดีโปรไฟล์'`);
// await queryRunner.query(`ALTER TABLE \`profileDiscipline\` ADD CONSTRAINT \`FK_0031dcb981836876de8524eaff1\` FOREIGN KEY (\`profileId\`) REFERENCES \`profile\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
// await queryRunner.query(`ALTER TABLE \`profileDiscipline\` DROP FOREIGN KEY \`FK_0031dcb981836876de8524eaff1\``);
// await queryRunner.query(`ALTER TABLE \`profileDiscipline\` CHANGE \`profileId\` \`profileId\` varchar(40) NOT NULL COMMENT 'ไอดีโปรไฟล์'`);
// await queryRunner.query(`ALTER TABLE \`profileDiscipline\` ADD CONSTRAINT \`FK_0031dcb981836876de8524eaff1\` FOREIGN KEY (\`profileId\`) REFERENCES \`profile\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE \`profileAvatar\` DROP COLUMN \`isActive\``);
// await queryRunner.query(`ALTER TABLE \`profileSalaryEmployee\` ADD \`commandNo\` text NOT NULL COMMENT 'เลขที่คำสั่ง'`);
}
}