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-14 10:33:48 +07:00
commit a826726c80
14 changed files with 313 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileEmployeeAssessmentsController.ts → src/controllers/ProfileAssessmentsEmployeeController.ts
View file

@ -33,7 +33,7 @@ import { RequestWithUser } from "../middlewares/user";
@Route("api/v1/org/profile-employee/assessments")
@Tags("ProfileEmployeeAssessments")
@Security("bearerAuth")
export class ProfileEmployeeAssessmentsController extends Controller {
export class ProfileAssessmentsEmployeeController extends Controller {
private profileEmployeeRepo = AppDataSource.getRepository(ProfileEmployee);
private profileAssessmentsRepository = AppDataSource.getRepository(ProfileAssessment);
private profileAssessmentsHistoryRepository =
@ -188,7 +188,7 @@ export class ProfileEmployeeAssessmentsController extends Controller {
const result = await this.profileAssessmentsRepository.delete({ id: assessmentId });
if (result.affected && result.affected <= 0)
if (result.affected == undefined || result.affected <= 0)
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
return new HttpSuccess();

4
src/controllers/ProfileEmployeeCertificateController.ts → src/controllers/ProfileCertificateEmployeeController.ts
View file

@ -28,7 +28,7 @@ import { ProfileEmployee } from "../entities/ProfileEmployee";
@Route("api/v1/org/profile-employee/certificate")
@Tags("ProfileEmployeeCertificate")
@Security("bearerAuth")
export class ProfileEmployeeCertificateController extends Controller {
export class ProfileCertificateEmployeeController extends Controller {
private profileEmployeeRepo = AppDataSource.getRepository(ProfileEmployee);
private certificateRepo = AppDataSource.getRepository(ProfileCertificate);
private certificateHistoryRepo = AppDataSource.getRepository(ProfileCertificateHistory);
@ -171,7 +171,7 @@ export class ProfileEmployeeCertificateController extends Controller {
id: certificateId,
});
if (certificateResult.affected && certificateResult.affected <= 0) {
if (certificateResult.affected == undefined || certificateResult.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}

26
src/controllers/ProfileEmployeeDisciplineController.ts → src/controllers/ProfileDisciplineEmployeeController.ts
View file

@ -68,30 +68,6 @@ export class ProfileDisciplineEmployeeController extends Controller {
}
@Get("history/{disciplineId}")
@Example({
status: 200,
message: "สำเร็จ",
result: [
{
id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
date: "2024-03-12T10:09:47.000Z",
level: "string",
detail: "string",
unStigma: "string",
refCommandNo: "string",
refCommandDate: "2024-03-12T10:09:47.000Z",
},
{
id: "ba0e2f82-014e-46c6-8b82-a7c28eb5325f",
date: "2024-03-12T10:09:47.000Z",
level: "string",
detail: "string",
unStigma: "string",
refCommandNo: "string",
refCommandDate: "2024-03-12T10:09:47.000Z",
},
],
})
public async disciplineHistory(@Path() disciplineId: string) {
const record = await this.disciplineHistoryRepository.find({
where: { profileDisciplineId: disciplineId },
@ -176,7 +152,7 @@ export class ProfileDisciplineEmployeeController extends Controller {
const result = await this.disciplineRepository.delete({ id: disciplineId });
if (result.affected && result.affected <= 0) {
if (result.affected == undefined || result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}

45
src/controllers/ProfileEmployeeDutyController.ts → src/controllers/ProfileDutyEmployeeController.ts
View file

@ -21,30 +21,15 @@ import { RequestWithUser } from "../middlewares/user";
import { ProfileEmployee } from "../entities/ProfileEmployee";
import { CreateProfileEmployeeDuty, ProfileDuty, UpdateProfileDuty } from "../entities/ProfileDuty";
@Route("api/v1/org/profile/duty")
@Route("api/v1/org/profile-employee/duty")
@Tags("ProfileDuty")
@Security("bearerAuth")
export class ProfileDutyController extends Controller {
export class ProfileDutyEmployeeController extends Controller {
private profileRepository = AppDataSource.getRepository(ProfileEmployee);
private dutyRepository = AppDataSource.getRepository(ProfileDuty);
private dutyHistoryRepository = AppDataSource.getRepository(ProfileDutyHistory);
@Get("{profileId}")
@Example({
status: 200,
message: "สำเร็จ",
result: [
{
id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
dateStart: "2024-03-12T10:09:47.000Z",
dateEnd: "string",
reference: "string",
detail: "string",
refCommandNo: "string",
refCommandDate: "2024-03-12T10:09:47.000Z",
},
],
})
public async getDuty(@Path() profileId: string) {
const lists = await this.dutyRepository.find({
where: { profileEmployeeId: profileId },
@ -62,30 +47,6 @@ export class ProfileDutyController extends Controller {
}
@Get("history/{dutyId}")
@Example({
status: 200,
message: "สำเร็จ",
result: [
{
id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
dateStart: "2024-03-12T10:09:47.000Z",
dateEnd: "string",
reference: "string",
detail: "string",
refCommandNo: "string",
refCommandDate: "2024-03-12T10:09:47.000Z",
},
{
id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
dateStart: "2024-03-12T10:09:47.000Z",
dateEnd: "string",
reference: "string",
detail: "string",
refCommandNo: "string",
refCommandDate: "2024-03-12T10:09:47.000Z",
},
],
})
public async dutyHistory(@Path() dutyId: string) {
const record = await this.dutyHistoryRepository.find({
where: { profileDutyId: dutyId },
@ -164,7 +125,7 @@ export class ProfileDutyController extends Controller {
const result = await this.dutyRepository.delete({ id: dutyId });
if (result.affected && result.affected <= 0) {
if (result.affected == undefined || result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}

237
src/controllers/ProfileEmployeeLeaveController.ts
View file

@ -1,237 +0,0 @@
import {
Body,
Controller,
Delete,
Example,
Get,
Patch,
Path,
Post,
Request,
Route,
Security,
Tags,
} from "tsoa";
import { AppDataSource } from "../database/data-source";
import {
ProfileLeaveHistory,
CreateProfileEmployeeLeave,
ProfileLeave,
UpdateProfileLeave,
} from "../entities/ProfileLeave";
import HttpSuccess from "../interfaces/http-success";
import HttpStatus from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { RequestWithUser } from "../middlewares/user";
import { LeaveType } from "../entities/LeaveType";
import { ProfileEmployee } from "../entities/ProfileEmployee";
@Route("api/v1/org/profile/leave")
@Tags("ProfileLeave")
@Security("bearerAuth")
export class ProfileLeaveController extends Controller {
private profileRepo = AppDataSource.getRepository(ProfileEmployee);
private leaveRepo = AppDataSource.getRepository(ProfileLeave);
private leaveHistoryRepo = AppDataSource.getRepository(ProfileLeaveHistory);
private leaveTypeRepository = AppDataSource.getRepository(LeaveType);
@Get("{profileId}")
@Example({
status: 200,
message: "สำเร็จ",
result: {
id: "adbb08a6-d2f4-41b0-a9c1-49e883ca96bc",
createdAt: "2024-03-20T23:35:45.230Z",
createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
lastUpdatedAt: "2024-03-20T23:40:06.000Z",
lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
createdFullName: "สาวิตรี ศรีสมัย",
lastUpdateFullName: "สาวิตรี ศรีสมัย",
profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
leaveTypeId: "8dc5e672-b416-4323-b086-06dde8c4353c",
dateLeaveStart: "2024-03-21T06:39:46.000Z",
dateLeaveEnd: "2024-03-21T06:39:46.000Z",
leaveDays: 0,
leaveCount: null,
totalLeave: 0,
status: "string",
reason: "string",
leaveType: {
id: "8dc5e672-b416-4323-b086-06dde8c4353c",
createdAt: "2024-02-04T21:28:40.536Z",
createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
lastUpdatedAt: "2024-02-04T21:28:40.536Z",
lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
createdFullName: "สาวิตรี ศรีสมัย",
lastUpdateFullName: "สาวิตรี ศรีสมัย",
name: "ลาป่วย",
code: "CM-002",
limit: 1,
},
},
})
public async getLeave(@Path() profileId: string) {
const record = await this.leaveRepo.find({
relations: { leaveType: true },
where: { profileId },
});
return new HttpSuccess(record);
}
@Get("history/{leaveId}")
@Example({
status: 200,
message: "สำเร็จ",
result: [
{
id: "7eed2e72-d71c-4b3b-a90b-e1b7abdaa838",
createdAt: "2024-03-20T23:35:45.230Z",
createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
lastUpdatedAt: "2024-03-20T23:40:06.000Z",
lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
createdFullName: "สาวิตรี ศรีสมัย",
lastUpdateFullName: "สาวิตรี ศรีสมัย",
profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
leaveTypeId: "8dc5e672-b416-4323-b086-06dde8c4353c",
dateLeaveStart: "2024-03-21T06:39:46.000Z",
dateLeaveEnd: "2024-03-21T06:39:46.000Z",
leaveDays: 0,
leaveCount: null,
totalLeave: 0,
status: "string",
reason: "string",
leaveType: {
id: "8dc5e672-b416-4323-b086-06dde8c4353c",
createdAt: "2024-02-04T21:28:40.536Z",
createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
lastUpdatedAt: "2024-02-04T21:28:40.536Z",
lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
createdFullName: "สาวิตรี ศรีสมัย",
lastUpdateFullName: "สาวิตรี ศรีสมัย",
name: "ลาป่วย",
code: "CM-002",
limit: 1,
},
profileLeaveId: "adbb08a6-d2f4-41b0-a9c1-49e883ca96bc",
},
{
id: "b1b9c291-9c96-4cbb-9309-6ff5a2a6e0e8",
createdAt: "2024-03-20T23:35:45.230Z",
createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
lastUpdatedAt: "2024-03-20T23:35:45.230Z",
lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
createdFullName: "สาวิตรี ศรีสมัย",
lastUpdateFullName: "สาวิตรี ศรีสมัย",
profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
leaveTypeId: "7dc4e314-b456-4323-b086-06dde8c4353c",
dateLeaveStart: "2024-03-21T06:34:49.000Z",
dateLeaveEnd: "2024-03-21T06:34:49.000Z",
leaveDays: 2,
leaveCount: null,
totalLeave: 200,
status: "ไม่ผ่าน",
reason: "ติดงานสำคัญ",
leaveType: {
id: "7dc4e314-b456-4323-b086-06dde8c4353c",
createdAt: "2024-02-04T21:28:40.536Z",
createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
lastUpdatedAt: "2024-02-04T21:28:40.536Z",
lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
createdFullName: "สาวิตรี ศรีสมัย",
lastUpdateFullName: "สาวิตรี ศรีสมัย",
name: "ลาพักร้อน",
code: "CM-001",
limit: 356,
},
profileLeaveId: "adbb08a6-d2f4-41b0-a9c1-49e883ca96bc",
},
],
})
public async leaveHistory(@Path() leaveId: string) {
const record = await this.leaveHistoryRepo.find({
relations: { leaveType: true },
where: { profileLeaveId: leaveId },
});
return new HttpSuccess(record);
}
@Post()
public async newLeave(@Request() req: RequestWithUser, @Body() body: CreateProfileEmployeeLeave) {
if (!body.profileEmployeeId) {
throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
}
const profile = await this.profileRepo.findOneBy({ id: body.profileEmployeeId });
if (!profile) {
throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
}
const leaveType = await this.leaveTypeRepository.findOne({
where: { id: body.leaveTypeId },
});
if (!leaveType) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทลานี้");
}
const data = new ProfileLeave();
const meta = {
createdUserId: req.user.sub,
createdFullName: req.user.name,
lastUpdateUserId: req.user.sub,
lastUpdateFullName: req.user.name,
};
Object.assign(data, { ...body, ...meta });
await this.leaveRepo.save(data);
return new HttpSuccess();
}
@Patch("{leaveId}")
public async editLeave(
@Request() req: RequestWithUser,
@Body() body: UpdateProfileLeave,
@Path() leaveId: string,
) {
const record = await this.leaveRepo.findOneBy({ id: leaveId });
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
const leaveType = await this.leaveTypeRepository.findOne({
where: { id: body.leaveTypeId },
});
if (!leaveType) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทลานี้");
}
const history = new ProfileLeaveHistory();
Object.assign(history, { ...record, id: undefined });
Object.assign(record, body);
history.profileLeaveId = leaveId;
record.lastUpdateFullName = req.user.name;
history.lastUpdateFullName = req.user.name;
await Promise.all([this.leaveRepo.save(record), this.leaveHistoryRepo.save(history)]);
return new HttpSuccess();
}
@Delete("{leaveId}")
public async deleteTraning(@Path() leaveId: string) {
await this.leaveHistoryRepo.delete({
profileLeaveId: leaveId,
});
const result = await this.leaveRepo.delete({ id: leaveId });
if (result.affected && result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}
return new HttpSuccess();
}
}

4
src/controllers/ProfileEmployeeHonorController.ts → src/controllers/ProfileHonorEmployeeController.ts
View file

@ -24,7 +24,7 @@ import { ProfileEmployee } from "../entities/ProfileEmployee";
@Route("api/v1/org/profile-employee/honor")
@Tags("ProfileEmployeeHonor")
@Security("bearerAuth")
export class ProfileEmployeeHonorController extends Controller {
export class ProfileHonorEmployeeController extends Controller {
private profileEmployeeRepo = AppDataSource.getRepository(ProfileEmployee);
private honorRepo = AppDataSource.getRepository(ProfileHonor);
private honorHistoryRepo = AppDataSource.getRepository(ProfileHonorHistory);
@ -162,7 +162,7 @@ export class ProfileEmployeeHonorController extends Controller {
const result = await this.honorRepo.delete({ id: honorId });
if (result.affected && result.affected <= 0) {
if (result.affected == undefined || result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}

4
src/controllers/ProfileEmployeeInsigniaController.ts → src/controllers/ProfileInsigniaEmployeeController.ts
View file

@ -29,7 +29,7 @@ import { Insignia } from "../entities/Insignia";
@Route("api/v1/org/profile-employee/insignia")
@Tags("ProfileEmployeeInsignia")
@Security("bearerAuth")
export class ProfileEmployeeInsigniaController extends Controller {
export class ProfileInsigniaEmployeeController extends Controller {
private profileEmployeeRepo = AppDataSource.getRepository(ProfileEmployee);
private insigniaRepo = AppDataSource.getRepository(ProfileInsignia);
private insigniaHistoryRepo = AppDataSource.getRepository(ProfileInsigniaHistory);
@ -220,7 +220,7 @@ export class ProfileEmployeeInsigniaController extends Controller {
const result = await this.insigniaRepo.delete({ id: insigniaId });
if (result.affected && result.affected <= 0) {
if (result.affected == undefined || result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}

135
src/controllers/ProfileLeaveEmployeeController.ts Normal file
View file

@ -0,0 +1,135 @@
import {
Body,
Controller,
Delete,
Example,
Get,
Patch,
Path,
Post,
Request,
Route,
Security,
Tags,
} from "tsoa";
import { AppDataSource } from "../database/data-source";
import {
ProfileLeaveHistory,
CreateProfileEmployeeLeave,
ProfileLeave,
UpdateProfileLeave,
} from "../entities/ProfileLeave";
import HttpSuccess from "../interfaces/http-success";
import HttpStatus from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { RequestWithUser } from "../middlewares/user";
import { LeaveType } from "../entities/LeaveType";
import { ProfileEmployee } from "../entities/ProfileEmployee";
@Route("api/v1/org/profile-employee/leave")
@Tags("ProfileLeave")
@Security("bearerAuth")
export class ProfileLeaveEmployeeController extends Controller {
private profileRepo = AppDataSource.getRepository(ProfileEmployee);
private leaveRepo = AppDataSource.getRepository(ProfileLeave);
private leaveHistoryRepo = AppDataSource.getRepository(ProfileLeaveHistory);
private leaveTypeRepository = AppDataSource.getRepository(LeaveType);
@Get("{profileId}")
public async getLeave(@Path() profileId: string) {
const record = await this.leaveRepo.find({
relations: { leaveType: true },
where: { profileId },
});
return new HttpSuccess(record);
}
@Get("history/{leaveId}")
public async leaveHistory(@Path() leaveId: string) {
const record = await this.leaveHistoryRepo.find({
relations: { leaveType: true },
where: { profileLeaveId: leaveId },
});
return new HttpSuccess(record);
}
@Post()
public async newLeave(@Request() req: RequestWithUser, @Body() body: CreateProfileEmployeeLeave) {
if (!body.profileEmployeeId) {
throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
}
const profile = await this.profileRepo.findOneBy({ id: body.profileEmployeeId });
if (!profile) {
throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
}
const leaveType = await this.leaveTypeRepository.findOne({
where: { id: body.leaveTypeId },
});
if (!leaveType) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทลานี้");
}
const data = new ProfileLeave();
const meta = {
createdUserId: req.user.sub,
createdFullName: req.user.name,
lastUpdateUserId: req.user.sub,
lastUpdateFullName: req.user.name,
};
Object.assign(data, { ...body, ...meta });
await this.leaveRepo.save(data);
return new HttpSuccess();
}
@Patch("{leaveId}")
public async editLeave(
@Request() req: RequestWithUser,
@Body() body: UpdateProfileLeave,
@Path() leaveId: string,
) {
const record = await this.leaveRepo.findOneBy({ id: leaveId });
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
const leaveType = await this.leaveTypeRepository.findOne({
where: { id: body.leaveTypeId },
});
if (!leaveType) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทลานี้");
}
const history = new ProfileLeaveHistory();
Object.assign(history, { ...record, id: undefined });
Object.assign(record, body);
history.profileLeaveId = leaveId;
record.lastUpdateFullName = req.user.name;
history.lastUpdateFullName = req.user.name;
await Promise.all([this.leaveRepo.save(record), this.leaveHistoryRepo.save(history)]);
return new HttpSuccess();
}
@Delete("{leaveId}")
public async deleteTraning(@Path() leaveId: string) {
await this.leaveHistoryRepo.delete({
profileLeaveId: leaveId,
});
const result = await this.leaveRepo.delete({ id: leaveId });
if (result.affected == undefined || result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}
return new HttpSuccess();
}
}

28
src/controllers/ProfileEmployeeNopaidController.ts → src/controllers/ProfileNopaidEmployeeController.ts
View file

@ -25,10 +25,10 @@ import {
UpdateProfileNopaid,
} from "../entities/ProfileNopaid";
@Route("api/v1/org/profile/nopaid")
@Route("api/v1/org/profile-employee/nopaid")
@Tags("ProfileNopaid")
@Security("bearerAuth")
export class ProfileNopaidController extends Controller {
export class ProfileNopaidEmployeeController extends Controller {
private profileRepository = AppDataSource.getRepository(ProfileEmployee);
private nopaidRepository = AppDataSource.getRepository(ProfileNopaid);
private nopaidHistoryRepository = AppDataSource.getRepository(ProfileNopaidHistory);
@ -56,28 +56,6 @@ export class ProfileNopaidController extends Controller {
}
@Get("history/{nopaidId}")
@Example({
status: 200,
message: "สำเร็จ",
result: [
{
id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
date: "2024-03-12T10:09:47.000Z",
reference: "string",
detail: "string",
refCommandNo: "string",
refCommandDate: "2024-03-12T10:09:47.000Z",
},
{
id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
date: "2024-03-12T10:09:47.000Z",
reference: "string",
detail: "string",
refCommandNo: "string",
refCommandDate: "2024-03-12T10:09:47.000Z",
},
],
})
public async nopaidHistory(@Path() nopaidId: string) {
const record = await this.nopaidHistoryRepository.find({
where: { profileNopaidId: nopaidId },
@ -151,7 +129,7 @@ export class ProfileNopaidController extends Controller {
const result = await this.nopaidRepository.delete({ id: nopaidId });
if (result.affected && result.affected <= 0) {
if (result.affected == undefined || result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}

121
src/controllers/ProfileOtherEmployeeController.ts Normal file
View file

@ -0,0 +1,121 @@
import {
Body,
Controller,
Delete,
Example,
Get,
Patch,
Path,
Post,
Request,
Route,
Security,
Tags,
} from "tsoa";
import { AppDataSource } from "../database/data-source";
import HttpSuccess from "../interfaces/http-success";
import HttpStatus from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { ProfileOtherHistory } from "../entities/ProfileOtherHistory";
import { RequestWithUser } from "../middlewares/user";
import { ProfileEmployee } from "../entities/ProfileEmployee";
import {
CreateProfileEmployeeOther,
ProfileOther,
UpdateProfileOther,
} from "../entities/ProfileOther";
@Route("api/v1/org/profile-employee/other")
@Tags("ProfileOther")
@Security("bearerAuth")
export class ProfileOtherEmployeeController extends Controller {
private profileRepository = AppDataSource.getRepository(ProfileEmployee);
private otherRepository = AppDataSource.getRepository(ProfileOther);
private otherHistoryRepository = AppDataSource.getRepository(ProfileOtherHistory);
@Get("{profileId}")
public async getOther(@Path() profileId: string) {
const lists = await this.otherRepository.find({
where: { profileEmployeeId: profileId },
});
return new HttpSuccess(lists);
}
@Get("history/{otherId}")
public async otherHistory(@Path() otherId: string) {
const record = await this.otherHistoryRepository.find({
where: { profileOtherId: otherId },
order: { createdAt: "DESC" },
});
return new HttpSuccess(record);
}
@Post()
public async newOther(@Request() req: RequestWithUser, @Body() body: CreateProfileEmployeeOther) {
if (!body.profileEmployeeId) {
throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
}
const profile = await this.profileRepository.findOneBy({ id: body.profileEmployeeId });
if (!profile) {
throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
}
const data = new ProfileOther();
const meta = {
createdUserId: req.user.sub,
createdFullName: req.user.name,
lastUpdateUserId: req.user.sub,
lastUpdateFullName: req.user.name,
};
Object.assign(data, { ...body, ...meta });
await this.otherRepository.save(data);
return new HttpSuccess();
}
@Patch("{otherId}")
public async editOther(
@Request() req: RequestWithUser,
@Body() body: UpdateProfileOther,
@Path() otherId: string,
) {
const record = await this.otherRepository.findOneBy({ id: otherId });
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
const history = new ProfileOtherHistory();
Object.assign(history, { ...record, id: undefined });
Object.assign(record, body);
history.profileOtherId = otherId;
record.lastUpdateFullName = req.user.name;
history.lastUpdateFullName = req.user.name;
await Promise.all([
this.otherRepository.save(record),
this.otherHistoryRepository.save(history),
]);
return new HttpSuccess();
}
@Delete("{otherId}")
public async deleteTraning(@Path() otherId: string) {
await this.otherHistoryRepository.delete({
profileOtherId: otherId,
});
const result = await this.otherRepository.delete({ id: otherId });
if (result.affected == undefined || result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}
return new HttpSuccess();
}
}

4
src/controllers/ProfileEmployeeTrainingController.ts → src/controllers/ProfileTrainingEmployeeController.ts
View file

@ -28,7 +28,7 @@ import { ProfileEmployee } from "../entities/ProfileEmployee";
@Route("api/v1/org/profile-employee/training")
@Tags("ProfileEmployeeTraining")
@Security("bearerAuth")
export class ProfileEmployeeTrainingController extends Controller {
export class ProfileTrainingEmployeeController extends Controller {
private profileEmployeeRepo = AppDataSource.getRepository(ProfileEmployee);
private trainingRepo = AppDataSource.getRepository(ProfileTraining);
private trainingHistoryRepo = AppDataSource.getRepository(ProfileTrainingHistory);
@ -184,7 +184,7 @@ export class ProfileEmployeeTrainingController extends Controller {
const result = await this.trainingRepo.delete({ id: trainingId });
if (result.affected && result.affected <= 0) {
if (result.affected == undefined || result.affected <= 0) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}

6
src/entities/ProfileEmployee.ts
View file

@ -18,6 +18,7 @@ import { ProfileChangeName } from "./ProfileChangeName";
import { ProfileChildren, ProfileFamilyHistory } from "./ProfileFamily";
import { ProfileEducation } from "./ProfileEducation";
import { ProfileAbility } from "./ProfileAbility";
import { ProfileOther } from "./ProfileOther";
@Entity("profileEmployee")
export class ProfileEmployee extends EntityBase {
@Column({
@ -251,6 +252,9 @@ export class ProfileEmployee extends EntityBase {
@OneToMany(() => ProfileAbility, (v) => v.profileEmployee)
profileAbilities: ProfileAbility[];
@OneToMany(() => ProfileOther, (v) => v.profileEmployee)
profileOthers: ProfileOther[];
@ManyToOne(() => EmployeePosLevel, (v) => v.profiles)
posLevel: EmployeePosLevel;
@ -294,7 +298,7 @@ export class CreateProfileEmployee {
gender: string | null;
relationship: string | null;
bloodGroup: string | null;
email: string | null ;
email: string | null;
phone: string | null;
}

19
src/entities/ProfileOther.ts
View file

@ -1,6 +1,7 @@
import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm";
import { EntityBase } from "./base/Base";
import { Profile } from "./Profile";
import { ProfileEmployee } from "./ProfileEmployee";
import { ProfileOtherHistory } from "./ProfileOtherHistory";
@Entity("profileOther")
@ -13,6 +14,14 @@ export class ProfileOther extends EntityBase {
})
profileId: string;
@Column({
nullable: true,
length: 40,
comment: "คีย์นอก(FK)ของตาราง ProfileEmployee",
default: null,
})
profileEmployeeId: string;
@Column({
nullable: true,
comment: "รายละเอียด",
@ -35,6 +44,10 @@ export class ProfileOther extends EntityBase {
@ManyToOne(() => Profile, (profile) => profile.profileOthers)
@JoinColumn({ name: "profileId" })
profile: Profile;
@ManyToOne(() => ProfileEmployee, (ProfileEmployee) => ProfileEmployee.profileOthers)
@JoinColumn({ name: "profileEmployeeId" })
profileEmployee: ProfileEmployee;
}
export class CreateProfileOther {
@ -43,6 +56,12 @@ export class CreateProfileOther {
date: Date | null;
}
export class CreateProfileEmployeeOther {
profileEmployeeId: string | null;
detail: string | null;
date: Date | null;
}
export type UpdateProfileOther = {
detail?: string | null;
date?: Date | null;

16
src/migration/1715597418469-update_table_profileemployee_add_pk3.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableProfileemployeeAddPk31715597418469 implements MigrationInterface {
name = 'UpdateTableProfileemployeeAddPk31715597418469'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`profileOther\` ADD \`profileEmployeeId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง ProfileEmployee'`);
await queryRunner.query(`ALTER TABLE \`profileOther\` ADD CONSTRAINT \`FK_b7ef3007bce554a41bdb896ed96\` FOREIGN KEY (\`profileEmployeeId\`) REFERENCES \`profileEmployee\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`profileOther\` DROP FOREIGN KEY \`FK_b7ef3007bce554a41bdb896ed96\``);
await queryRunner.query(`ALTER TABLE \`profileOther\` DROP COLUMN \`profileEmployeeId\``);
}
}