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

Merge branch 'adiDev' into develop

Browse source
This commit is contained in:
AdisakKanthawilang 2024-09-09 15:44:11 +07:00
commit 74e64176e6
3 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controllers/ProfileAbilityController.ts
View file

@ -66,7 +66,6 @@ export class ProfileAbilityController extends Controller {
@Path() abilityId: string, @Path() abilityId: string,
@Request() req: RequestWithUser, @Request() req: RequestWithUser,
) { ) {
const _record = await this.profileAbilityRepo.findOne({ const _record = await this.profileAbilityRepo.findOne({
where: { id: abilityId }, where: { id: abilityId },
}); });

18
src/controllers/ProfileAbilityEmployeeController.ts
View file

@ -64,8 +64,8 @@ export class ProfileAbilityEmployeeController extends Controller {
return new HttpSuccess(getProfileAbilityId); return new HttpSuccess(getProfileAbilityId);
} }
@Get("history/{abilityId}") @Get("admin/history/{abilityId}")
public async getProfileAbilityHistory( public async getProfileAdminAbilityHistory(
@Path() abilityId: string, @Path() abilityId: string,
@Request() req: RequestWithUser, @Request() req: RequestWithUser,
) { ) {
@ -87,6 +87,20 @@ export class ProfileAbilityEmployeeController extends Controller {
return new HttpSuccess(record); return new HttpSuccess(record);
} }
@Get("history/{abilityId}")
public async getProfileAbilityHistory(
@Path() abilityId: string,
) {
const record = await this.profileAbilityHistoryRepo.find({
where: { profileAbilityId: abilityId },
order: { createdAt: "DESC" },
});
if (!record) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}
return new HttpSuccess(record);
}
@Post() @Post()
public async newProfileAbility( public async newProfileAbility(
@Request() req: RequestWithUser, @Request() req: RequestWithUser,

18
src/controllers/ProfileAbilityEmployeeTempController.ts
View file

@ -64,8 +64,8 @@ export class ProfileAbilityEmployeeTempController extends Controller {
return new HttpSuccess(getProfileAbilityId); return new HttpSuccess(getProfileAbilityId);
} }
@Get("history/{abilityId}") @Get("admin/history/{abilityId}")
public async getProfileAbilityHistory( public async getProfileAdminAbilityHistory(
@Path() abilityId: string, @Path() abilityId: string,
@Request() req: RequestWithUser, @Request() req: RequestWithUser,
) { ) {
@ -83,6 +83,20 @@ export class ProfileAbilityEmployeeTempController extends Controller {
return new HttpSuccess(record); return new HttpSuccess(record);
} }
@Get("history/{abilityId}")
public async getProfileAbilityHistory(
@Path() abilityId: string,
) {
const record = await this.profileAbilityHistoryRepo.find({
where: { profileAbilityId: abilityId },
order: { createdAt: "DESC" },
});
if (!record) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}
return new HttpSuccess(record);
}
@Post() @Post()
public async newProfileAbility( public async newProfileAbility(
@Request() req: RequestWithUser, @Request() req: RequestWithUser,