Merge branch 'develop' into adiDev
# Conflicts: # src/controllers/ProfileAssessmentsController.ts # src/controllers/ProfileCertificateController.ts # src/controllers/ProfileEducationsController.ts # src/controllers/ProfileSalaryController.ts
This commit is contained in:
commit
27ef5cabef
105 changed files with 2060 additions and 3540 deletions
|
|
@ -1,7 +1,6 @@
|
|||
import {
|
||||
Controller,
|
||||
Post,
|
||||
Put,
|
||||
Delete,
|
||||
Route,
|
||||
Security,
|
||||
|
|
@ -9,12 +8,8 @@ import {
|
|||
Body,
|
||||
Path,
|
||||
Request,
|
||||
SuccessResponse,
|
||||
Response,
|
||||
Get,
|
||||
Query,
|
||||
Patch,
|
||||
Example,
|
||||
} from "tsoa";
|
||||
|
||||
import HttpSuccess from "../interfaces/http-success";
|
||||
|
|
@ -47,6 +42,7 @@ export class ProfileEducationsController extends Controller {
|
|||
}
|
||||
const getProfileEducation = await this.profileEducationRepo.find({
|
||||
where: { profileId: profile.id },
|
||||
order: { createdAt: "ASC" },
|
||||
});
|
||||
if (!getProfileEducation) {
|
||||
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
|
|
@ -55,45 +51,12 @@ export class ProfileEducationsController extends Controller {
|
|||
}
|
||||
|
||||
@Get("{profileId}")
|
||||
@Example({
|
||||
status: 200,
|
||||
message: "สำเร็จ",
|
||||
result: [
|
||||
{
|
||||
id: "f6c693b4-1a9b-4fbe-95c5-ed4da50d35b6",
|
||||
createdAt: "2024-03-12T20:26:42.621Z",
|
||||
createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
|
||||
lastUpdatedAt: "2024-03-12T20:33:09.000Z",
|
||||
lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
|
||||
createdFullName: "test bar",
|
||||
lastUpdateFullName: "test bar",
|
||||
profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
|
||||
isActive: true,
|
||||
country: "string",
|
||||
degree: "ปวส",
|
||||
duration: "-",
|
||||
durationYear: 0,
|
||||
field: "ชางเทคนิค ชั้นสูง",
|
||||
finishDate: "2024-03-13T03:23:31.000Z",
|
||||
fundName: "-",
|
||||
gpa: "3.64",
|
||||
institute: "เทคโนเชียงใหม่",
|
||||
other: "string",
|
||||
startDate: "2024-03-13T03:23:31.000Z",
|
||||
endDate: "2024-03-13T03:23:31.000Z",
|
||||
educationLevel: "ปวส",
|
||||
educationLevelId: "string",
|
||||
positionPath: "string",
|
||||
positionPathId: "string",
|
||||
note: "string",
|
||||
isDate: true,
|
||||
isEducation: true,
|
||||
},
|
||||
],
|
||||
})
|
||||
public async detailProfileEducation(@Path() profileId: string, @Request() req: RequestWithUser) {
|
||||
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
|
||||
const getProfileEducation = await this.profileEducationRepo.findBy({ profileId });
|
||||
const getProfileEducation = await this.profileEducationRepo.find({
|
||||
where: { profileId: profileId },
|
||||
order: { createdAt: "ASC" },
|
||||
});
|
||||
if (!getProfileEducation) {
|
||||
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
}
|
||||
|
|
@ -101,79 +64,19 @@ export class ProfileEducationsController extends Controller {
|
|||
}
|
||||
|
||||
@Get("history/{educationId}")
|
||||
@Example({
|
||||
status: 200,
|
||||
message: "สำเร็จ",
|
||||
result: [
|
||||
{
|
||||
id: "294aa117-6ce7-4c23-b5bd-fe1f12932c4a",
|
||||
createdAt: "2024-03-12T20:29:45.251Z",
|
||||
createdUserId: "00000000-0000-0000-0000-000000000000",
|
||||
lastUpdatedAt: "2024-03-12T20:29:45.251Z",
|
||||
lastUpdateUserId: "00000000-0000-0000-0000-000000000000",
|
||||
createdFullName: "string",
|
||||
lastUpdateFullName: "test bar",
|
||||
isActive: true,
|
||||
country: "string",
|
||||
degree: "ปวส",
|
||||
duration: "-",
|
||||
durationYear: 0,
|
||||
field: "ชางเทคนิค",
|
||||
finishDate: "2024-03-13T03:23:31.000Z",
|
||||
fundName: "-",
|
||||
gpa: "3.64",
|
||||
institute: "เทคโนเชียงใหม่",
|
||||
other: "string",
|
||||
startDate: "2024-03-13T03:23:31.000Z",
|
||||
endDate: "2024-03-13T03:23:31.000Z",
|
||||
educationLevel: "ปวส",
|
||||
educationLevelId: "string",
|
||||
positionPath: "string",
|
||||
positionPathId: "string",
|
||||
note: "string",
|
||||
isDate: true,
|
||||
isEducation: true,
|
||||
profileEducationId: "f6c693b4-1a9b-4fbe-95c5-ed4da50d35b6",
|
||||
public async getProfileEducationHistory(
|
||||
@Path() educationId: string,
|
||||
@Request() req: RequestWithUser,
|
||||
) {
|
||||
// const _record = await this.profileEducationRepo.findOneBy({ id: educationId });
|
||||
// if (_record) {
|
||||
// await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
|
||||
// }
|
||||
const record = await this.profileEducationHistoryRepo.find({
|
||||
where: {
|
||||
profileEducationId: educationId,
|
||||
},
|
||||
{
|
||||
id: "2f00bd59-be3e-46d8-92a2-c4700baabf12",
|
||||
createdAt: "2024-03-12T20:33:09.128Z",
|
||||
createdUserId: "00000000-0000-0000-0000-000000000000",
|
||||
lastUpdatedAt: "2024-03-12T20:33:09.128Z",
|
||||
lastUpdateUserId: "00000000-0000-0000-0000-000000000000",
|
||||
createdFullName: "string",
|
||||
lastUpdateFullName: "test bar",
|
||||
isActive: true,
|
||||
country: "string",
|
||||
degree: "ปวส",
|
||||
duration: "-",
|
||||
durationYear: 0,
|
||||
field: "ชางเทคนิค ชั้นสูง",
|
||||
finishDate: "2024-03-13T03:23:31.000Z",
|
||||
fundName: "-",
|
||||
gpa: "3.64",
|
||||
institute: "เทคโนเชียงใหม่",
|
||||
other: "string",
|
||||
startDate: "2024-03-13T03:23:31.000Z",
|
||||
endDate: "2024-03-13T03:23:31.000Z",
|
||||
educationLevel: "ปวส",
|
||||
educationLevelId: "string",
|
||||
positionPath: "string",
|
||||
positionPathId: "string",
|
||||
note: "string",
|
||||
isDate: true,
|
||||
isEducation: true,
|
||||
profileEducationId: "f6c693b4-1a9b-4fbe-95c5-ed4da50d35b6",
|
||||
},
|
||||
],
|
||||
})
|
||||
public async getProfileEducationHistory(@Path() educationId: string, @Request() req: RequestWithUser) {
|
||||
// const _record = await this.profileEducationRepo.findOneBy({ id: educationId });
|
||||
// if (_record) {
|
||||
// await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
|
||||
// }
|
||||
const record = await this.profileEducationHistoryRepo.findBy({
|
||||
profileEducationId: educationId,
|
||||
order: { createdAt: "DESC" },
|
||||
});
|
||||
if (!record) {
|
||||
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
|
|
@ -189,7 +92,7 @@ export class ProfileEducationsController extends Controller {
|
|||
if (!body.profileId) {
|
||||
throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
|
||||
}
|
||||
|
||||
|
||||
const profile = await this.profileRepo.findOneBy({ id: body.profileId });
|
||||
if (!profile) {
|
||||
throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
|
||||
|
|
@ -202,6 +105,8 @@ export class ProfileEducationsController extends Controller {
|
|||
createdFullName: req.user.name,
|
||||
lastUpdateUserId: req.user.sub,
|
||||
lastUpdateFullName: req.user.name,
|
||||
createdAt: new Date(),
|
||||
lastUpdatedAt: new Date(),
|
||||
};
|
||||
|
||||
Object.assign(data, { ...body, ...meta });
|
||||
|
|
@ -228,15 +133,18 @@ export class ProfileEducationsController extends Controller {
|
|||
const history = new ProfileEducationHistory();
|
||||
|
||||
Object.assign(record, body);
|
||||
Object.assign(history, body);
|
||||
Object.assign(history, { ...record, id: undefined });
|
||||
|
||||
history.profileEducationId = educationId;
|
||||
record.lastUpdateUserId = req.user.sub;
|
||||
record.lastUpdateFullName = req.user.name;
|
||||
record.lastUpdatedAt = new Date();
|
||||
history.lastUpdateUserId = req.user.sub;
|
||||
history.lastUpdateFullName = req.user.name;
|
||||
history.createdUserId = req.user.sub;
|
||||
history.createdFullName = req.user.name;
|
||||
history.createdAt = new Date();
|
||||
history.lastUpdatedAt = new Date();
|
||||
|
||||
await Promise.all([
|
||||
this.profileEducationRepo.save(record),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue