diff --git a/src/modules/leave-requests/controllers/leave-requests.controller.ts b/src/modules/leave-requests/controllers/leave-requests.controller.ts index 2f794f0..1878b64 100644 --- a/src/modules/leave-requests/controllers/leave-requests.controller.ts +++ b/src/modules/leave-requests/controllers/leave-requests.controller.ts @@ -33,7 +33,7 @@ export class LeaveRequestController { findAll(@Query() filters: SearchLeaveRequestsDto): Promise<(LeaveRequests & {daysRequested:number; cost: number})[]> { return this.leaveRequetsService.findAll(filters); } - + //remove emp_id and use email @Get(':id') //@RolesAllowed(RoleEnum.ACCOUNTING, RoleEnum.ADMIN, RoleEnum.EMPLOYEE, RoleEnum.HR, RoleEnum.SUPERVISOR) @ApiOperation({summary: 'Find leave request' }) @@ -42,7 +42,7 @@ export class LeaveRequestController { findOne(@Param('id', ParseIntPipe) id: number): Promise { return this.leaveRequetsService.findOne(id); } - + //remove emp_id and use email @Patch(':id') //@RolesAllowed(RoleEnum.ACCOUNTING, RoleEnum.ADMIN, RoleEnum.EMPLOYEE, RoleEnum.HR, RoleEnum.SUPERVISOR) @ApiOperation({summary: 'Update leave request' }) @@ -52,6 +52,7 @@ export class LeaveRequestController { return this.leaveRequetsService.update(id, dto); } + //remove emp_id and use email @Delete(':id') //@RolesAllowed(RoleEnum.ACCOUNTING, RoleEnum.ADMIN, RoleEnum.EMPLOYEE, RoleEnum.HR, RoleEnum.SUPERVISOR) @ApiOperation({summary: 'Delete leave request' }) @@ -61,6 +62,7 @@ export class LeaveRequestController { return this.leaveRequetsService.remove(id); } + //remove emp_id and use email @Patch(':id/approval') updateApproval( @Param('id', ParseIntPipe) id: number, @Body('is_approved', ParseBoolPipe) is_approved: boolean): Promise { diff --git a/src/modules/leave-requests/dtos/create-leave-request.dto.ts b/src/modules/leave-requests/dtos/create-leave-request.dto.ts index 54b08f8..676f432 100644 --- a/src/modules/leave-requests/dtos/create-leave-request.dto.ts +++ b/src/modules/leave-requests/dtos/create-leave-request.dto.ts @@ -9,6 +9,8 @@ export class CreateLeaveRequestsDto { description: 'Leave request`s unique id(auto-incremented)', }) id: number; + + //remove emp_id and use email @ApiProperty({ example: '4655867', description: 'Employee`s id', diff --git a/src/modules/leave-requests/dtos/search-leave-request.dto.ts b/src/modules/leave-requests/dtos/search-leave-request.dto.ts index cfa566b..85bd95b 100644 --- a/src/modules/leave-requests/dtos/search-leave-request.dto.ts +++ b/src/modules/leave-requests/dtos/search-leave-request.dto.ts @@ -3,6 +3,7 @@ import { Type } from "class-transformer"; import { IsOptional, IsInt, IsEnum, IsDateString } from "class-validator"; export class SearchLeaveRequestsDto { + //remove emp_id and use email @IsOptional() @Type(()=> Number) @IsInt() diff --git a/src/modules/leave-requests/services/leave-requests.service.ts b/src/modules/leave-requests/services/leave-requests.service.ts index 4ce97b1..ed5e8bd 100644 --- a/src/modules/leave-requests/services/leave-requests.service.ts +++ b/src/modules/leave-requests/services/leave-requests.service.ts @@ -18,6 +18,7 @@ export class LeaveRequestsService { private readonly sickLeaveService: SickLeaveService ) {} + //remove emp_id and use email async create(dto: CreateLeaveRequestsDto): Promise { const { employee_id, bank_code_id, leave_type, start_date_time, end_date_time, comment, approval_status } = dto; @@ -85,6 +86,7 @@ export class LeaveRequestsService { ); } + //remove emp_id and use email async findOne(id:number): Promise { const request = await this.prisma.leaveRequests.findUnique({ where: { id }, @@ -125,6 +127,7 @@ export class LeaveRequestsService { return {...request, days_requested: diff_days, cost }; } + //remove emp_id and use email async update(id: number, dto: UpdateLeaveRequestsDto): Promise { await this.findOne(id); const { employee_id, leave_type, start_date_time, end_date_time, comment, approval_status } = dto; @@ -186,6 +189,7 @@ export class LeaveRequestsService { return this.prisma.leaveRequestsArchive.findMany(); } + //remove emp_id and use email //fetches an archived employee async findOneArchived(id: number): Promise { return this.prisma.leaveRequestsArchive.findUniqueOrThrow({ where: { id } });