louis/targo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(employees): uncomment module and comment archival parts(needs refactoring)

Browse Source
This commit is contained in:
Matthieu Haineault 2025-11-05 08:36:24 -05:00
parent be00798961
commit 02ebb23d7a
8 changed files with 594 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/identity-and-account/employees/controllers/employees.controller.ts
View File

@ -1,99 +1,89 @@
// import { Body,Controller,Get,NotFoundException,Param,Patch } from '@nestjs/common'; import { Controller, Get, Patch, Param, Body, NotFoundException } from "@nestjs/common";
// import { EmployeesService } from '../services/employees.service'; import { ApiBearerAuth, ApiOperation, ApiResponse, ApiParam } from "@nestjs/swagger";
// import { CreateEmployeeDto } from '../dtos/create-employee.dto'; import { EmployeeListItemDto } from "src/identity-and-account/employees/dtos/list-employee.dto";
// import { UpdateEmployeeDto } from '../dtos/update-employee.dto'; import { EmployeeProfileItemDto } from "src/identity-and-account/employees/dtos/profil-employee.dto";
// import { RolesAllowed } from '../../../common/decorators/roles.decorators'; import { UpdateEmployeeDto } from "src/identity-and-account/employees/dtos/update-employee.dto";
// import { ApiBearerAuth, ApiOperation, ApiParam, ApiResponse, ApiTags } from '@nestjs/swagger'; import { EmployeesArchivalService } from "src/identity-and-account/employees/services/employees-archival.service";
// import { EmployeeListItemDto } from '../dtos/list-employee.dto'; import { EmployeesService } from "src/identity-and-account/employees/services/employees.service";
// import { EmployeesArchivalService } from '../services/employees-archival.service';
// import { EmployeeProfileItemDto } from 'src/modules/employees/dtos/profil-employee.dto';
// @ApiTags('Employees') @ApiBearerAuth('access-token')
// @ApiBearerAuth('access-token') // @UseGuards()
// // @UseGuards() @Controller('employees')
// @Controller('employees') export class EmployeesController {
// export class EmployeesController { constructor(
// constructor( private readonly employeesService: EmployeesService,
// private readonly employeesService: EmployeesService, private readonly archiveService: EmployeesArchivalService,
// private readonly archiveService: EmployeesArchivalService, ) {}
// ) {}
// @Get('employee-list') @Get('employee-list')
// //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR, RoleEnum.ACCOUNTING) //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR, RoleEnum.ACCOUNTING)
// @ApiOperation({summary: 'Find all employees with scoped info' })
// @ApiResponse({ status: 200, description: 'List of employees with scoped info found', type: EmployeeListItemDto, isArray: true })
// @ApiResponse({ status: 400, description: 'List of employees with scoped info not found' })
// findListEmployees(): Promise<EmployeeListItemDto[]> {
// return this.employeesService.findListEmployees();
// }
// @Patch(':email') findListEmployees(): Promise<EmployeeListItemDto[]> {
return this.employeesService.findListEmployees();
}
@Patch(':email')
//@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR)
@ApiBearerAuth('access-token')
async updateOrArchiveOrRestore(@Param('email') email: string, @Body() dto: UpdateEmployeeDto,) {
// if last_work_day is set => archive the employee
// else if employee is archived and first_work_day or last_work_day = null => restore
//otherwise => standard update
const result = await this.archiveService.patchEmployee(email, dto);
if(!result) {
throw new NotFoundException(`Employee with email: ${ email } is not found in active or archive.`)
}
return result;
}
//_____________________________________________________________________________________________
// Deprecated or unused methods
//_____________________________________________________________________________________________
// @Post()
// //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR) // //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR)
// @ApiBearerAuth('access-token') // @ApiOperation({summary: 'Create employee' })
// @ApiOperation({ summary: 'Update, archive or restore an employee' }) // @ApiResponse({ status: 201, description: 'Employee created', type: CreateEmployeeDto })
// @ApiParam({ name: 'email', type: Number, description: 'Email of the employee' }) // @ApiResponse({ status: 400, description: 'Incomplete task or invalid data' })
// @ApiResponse({ status: 200, description: 'Employee updated or restored', type: CreateEmployeeDto }) // create(@Body() dto: CreateEmployeeDto): Promise<Employees> {
// @ApiResponse({ status: 202, description: 'Employee archived successfully', type: CreateEmployeeDto }) // return this.employeesService.create(dto);
// @ApiResponse({ status: 404, description: 'Employee not found in active or archive' })
// async updateOrArchiveOrRestore(@Param('email') email: string, @Body() dto: UpdateEmployeeDto,) {
// // if last_work_day is set => archive the employee
// // else if employee is archived and first_work_day or last_work_day = null => restore
// //otherwise => standard update
// const result = await this.archiveService.patchEmployee(email, dto);
// if(!result) {
// throw new NotFoundException(`Employee with email: ${ email } is not found in active or archive.`)
// } // }
// return result; // @Get()
// //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR, RoleEnum.ACCOUNTING)
// @ApiOperation({summary: 'Find all employees' })
// @ApiResponse({ status: 200, description: 'List of employees found', type: CreateEmployeeDto, isArray: true })
// @ApiResponse({ status: 400, description: 'List of employees not found' })
// findAll(): Promise<Employees[]> {
// return this.employeesService.findAll();
// } // }
// //_____________________________________________________________________________________________
// // Deprecated or unused methods
// //_____________________________________________________________________________________________
// // @Post() // @Get(':email')
// // //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR) // //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR,RoleEnum.ACCOUNTING )
// // @ApiOperation({summary: 'Create employee' }) // @ApiOperation({summary: 'Find employee' })
// // @ApiResponse({ status: 201, description: 'Employee created', type: CreateEmployeeDto }) // @ApiResponse({ status: 200, description: 'Employee found', type: CreateEmployeeDto })
// // @ApiResponse({ status: 400, description: 'Incomplete task or invalid data' }) // @ApiResponse({ status: 400, description: 'Employee not found' })
// // create(@Body() dto: CreateEmployeeDto): Promise<Employees> { // findOne(@Param('email', ParseIntPipe) email: string): Promise<Employees> {
// // return this.employeesService.create(dto); // return this.employeesService.findOne(email);
// // }
// // @Get()
// // //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR, RoleEnum.ACCOUNTING)
// // @ApiOperation({summary: 'Find all employees' })
// // @ApiResponse({ status: 200, description: 'List of employees found', type: CreateEmployeeDto, isArray: true })
// // @ApiResponse({ status: 400, description: 'List of employees not found' })
// // findAll(): Promise<Employees[]> {
// // return this.employeesService.findAll();
// // }
// // @Get(':email')
// // //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR,RoleEnum.ACCOUNTING )
// // @ApiOperation({summary: 'Find employee' })
// // @ApiResponse({ status: 200, description: 'Employee found', type: CreateEmployeeDto })
// // @ApiResponse({ status: 400, description: 'Employee not found' })
// // findOne(@Param('email', ParseIntPipe) email: string): Promise<Employees> {
// // return this.employeesService.findOne(email);
// // }
// @Get('profile/:email')
// @ApiOperation({summary: 'Find employee profile' })
// @ApiParam({ name: 'email', type: String, description: 'Identifier of the employee' })
// @ApiResponse({ status: 200, description: 'Employee profile found', type: EmployeeProfileItemDto })
// @ApiResponse({ status: 400, description: 'Employee profile not found' })
// findOneProfile(@Param('email') email: string): Promise<EmployeeProfileItemDto> {
// return this.employeesService.findOneProfile(email);
// } // }
// // @Delete(':email') @Get('profile/:email')
// // //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR ) @ApiOperation({summary: 'Find employee profile' })
// // @ApiOperation({summary: 'Delete employee' }) @ApiParam({ name: 'email', type: String, description: 'Identifier of the employee' })
// // @ApiParam({ name: 'email', type: Number, description: 'Email of the employee to delete' }) @ApiResponse({ status: 200, description: 'Employee profile found', type: EmployeeProfileItemDto })
// // @ApiResponse({ status: 204, description: 'Employee deleted' }) @ApiResponse({ status: 400, description: 'Employee profile not found' })
// // @ApiResponse({ status: 404, description: 'Employee not found' }) findOneProfile(@Param('email') email: string): Promise<EmployeeProfileItemDto> {
// // remove(@Param('email', ParseIntPipe) email: string): Promise<Employees> { return this.employeesService.findOneProfile(email);
// // return this.employeesService.remove(email); }
// // }
// @Delete(':email')
// //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR )
// @ApiOperation({summary: 'Delete employee' })
// @ApiParam({ name: 'email', type: Number, description: 'Email of the employee to delete' })
// @ApiResponse({ status: 204, description: 'Employee deleted' })
// @ApiResponse({ status: 404, description: 'Employee not found' })
// remove(@Param('email', ParseIntPipe) email: string): Promise<Employees> {
// return this.employeesService.remove(email);
// } // }
}

208
src/identity-and-account/employees/dtos/create-employee.dto.ts
View File

@ -1,118 +1,118 @@
// import { import {
// Allow, Allow,
// IsBoolean, IsBoolean,
// IsDateString, IsDateString,
// IsEmail, IsEmail,
// IsInt, IsInt,
// IsNotEmpty, IsNotEmpty,
// IsOptional, IsOptional,
// IsPositive, IsPositive,
// IsString, IsString,
// IsUUID, IsUUID,
// } from 'class-validator'; } from 'class-validator';
// import { Type } from 'class-transformer'; import { Type } from 'class-transformer';
// import { ApiProperty } from '@nestjs/swagger'; import { ApiProperty } from '@nestjs/swagger';
// export class CreateEmployeeDto { export class CreateEmployeeDto {
// @ApiProperty({ @ApiProperty({
// example: 1, example: 1,
// description: 'Unique ID of an employee(primary-key, auto-incremented)', description: 'Unique ID of an employee(primary-key, auto-incremented)',
// }) })
// @Allow() @Allow()
// id: number; id: number;
// @ApiProperty({ @ApiProperty({
// example: '0e6e2e1f-b157-4c7c-ae3f-999b3e4f914d', example: '0e6e2e1f-b157-4c7c-ae3f-999b3e4f914d',
// description: 'UUID of the user linked to that employee', description: 'UUID of the user linked to that employee',
// }) })
// @IsUUID() @IsUUID()
// @IsOptional() @IsOptional()
// user_id?: string; user_id?: string;
// @ApiProperty({ @ApiProperty({
// example: 'Frodo', example: 'Frodo',
// description: 'Employee`s first name', description: 'Employee`s first name',
// }) })
// @IsString() @IsString()
// @IsNotEmpty() @IsNotEmpty()
// first_name: string; first_name: string;
// @ApiProperty({ @ApiProperty({
// example: 'Baggins', example: 'Baggins',
// description: 'Employee`s last name', description: 'Employee`s last name',
// }) })
// @IsString() @IsString()
// @IsNotEmpty() @IsNotEmpty()
// last_name: string; last_name: string;
// @ApiProperty({ @ApiProperty({
// example: 'i_cant_do_this_sam@targointernet.com', example: 'i_cant_do_this_sam@targointernet.com',
// description: 'Employee`s email', description: 'Employee`s email',
// }) })
// @IsEmail() @IsEmail()
// @IsOptional() @IsOptional()
// email: string; email: string;
// @IsOptional() @IsOptional()
// @IsBoolean() @IsBoolean()
// is_supervisor: boolean; is_supervisor: boolean;
// @ApiProperty({ @ApiProperty({
// example: '82538437464', example: '82538437464',
// description: 'Employee`s phone number', description: 'Employee`s phone number',
// }) })
// @IsString() @IsString()
// phone_number: string; phone_number: string;
// @ApiProperty({ @ApiProperty({
// example: '1 Bagshot Row, Hobbiton, The Shire, Middle-earth', example: '1 Bagshot Row, Hobbiton, The Shire, Middle-earth',
// description: 'Employee`s residence', description: 'Employee`s residence',
// required: false, required: false,
// }) })
// @IsString() @IsString()
// @IsOptional() @IsOptional()
// residence?: string; residence?: string;
// @ApiProperty({ @ApiProperty({
// example: 7464, example: 7464,
// description: 'external ID for the pay system', description: 'external ID for the pay system',
// }) })
// @IsInt() @IsInt()
// @IsPositive() @IsPositive()
// @Type(() => Number) @Type(() => Number)
// external_payroll_id: number; external_payroll_id: number;
// @ApiProperty({ @ApiProperty({
// example: 335567447, example: 335567447,
// description: 'Employee`s company code', description: 'Employee`s company code',
// }) })
// @IsInt() @IsInt()
// @IsPositive() @IsPositive()
// @Type(() => Number) @Type(() => Number)
// company_code: number; company_code: number;
// @ApiProperty({ @ApiProperty({
// example:'technicient', example:'technicient',
// description: 'employee`s job title', description: 'employee`s job title',
// }) })
// @IsString() @IsString()
// @IsOptional() @IsOptional()
// job_title: string; job_title: string;
// @ApiProperty({ @ApiProperty({
// example: '23/09/3018', example: '23/09/3018',
// description: 'Employee`s first working day', description: 'Employee`s first working day',
// }) })
// @IsDateString() @IsDateString()
// first_work_day: string; first_work_day: string;
// @ApiProperty({ @ApiProperty({
// example: '25/03/3019', example: '25/03/3019',
// description: 'Employee`s last working day', description: 'Employee`s last working day',
// required: false, required: false,
// }) })
// @IsDateString() @IsDateString()
// @IsOptional() @IsOptional()
// last_work_day?: string; last_work_day?: string;
// } }

16
src/identity-and-account/employees/dtos/list-employee.dto.ts
View File

@ -1,8 +1,8 @@
// export class EmployeeListItemDto { export class EmployeeListItemDto {
// first_name: string; first_name: string;
// last_name: string; last_name: string;
// email: string; email: string;
// supervisor_full_name: string | null; supervisor_full_name: string | null;
// company_name: number | null; company_name: number | null;
// job_title: string | null; job_title: string | null;
// } }

26
src/identity-and-account/employees/dtos/profil-employee.dto.ts
View File

@ -1,13 +1,13 @@
// export class EmployeeProfileItemDto { export class EmployeeProfileItemDto {
// first_name: string; first_name: string;
// last_name: string; last_name: string;
// employee_full_name: string; employee_full_name: string;
// supervisor_full_name: string | null; supervisor_full_name: string | null;
// company_name: number | null; company_name: number | null;
// job_title: string | null; job_title: string | null;
// email: string | null; email: string | null;
// phone_number: string; phone_number: string;
// first_work_day: string; first_work_day: string;
// last_work_day?: string | null; last_work_day?: string | null;
// residence: string | null; residence: string | null;
// } }

36
src/identity-and-account/employees/dtos/update-employee.dto.ts
View File

@ -1,22 +1,22 @@
// import { ApiProperty, PartialType } from '@nestjs/swagger'; import { ApiProperty, PartialType } from '@nestjs/swagger';
// import { CreateEmployeeDto } from './create-employee.dto'; import { CreateEmployeeDto } from './create-employee.dto';
// import { IsDateString, IsOptional, Max } from 'class-validator'; import { IsDateString, IsOptional, Max } from 'class-validator';
// export class UpdateEmployeeDto extends PartialType(CreateEmployeeDto) { export class UpdateEmployeeDto extends PartialType(CreateEmployeeDto) {
// @ApiProperty({ required: false, type: Date, description: 'New hire date or undefined' }) @ApiProperty({ required: false, type: Date, description: 'New hire date or undefined' })
// @IsDateString() @IsDateString()
// @IsOptional() @IsOptional()
// first_work_day?: string; first_work_day?: string;
// @ApiProperty({ required: false, type: Date, description: 'Termination date (null to restore)' }) @ApiProperty({ required: false, type: Date, description: 'Termination date (null to restore)' })
// @IsDateString() @IsDateString()
// @IsOptional() @IsOptional()
// last_work_day?: string; last_work_day?: string;
// @ApiProperty({ required: false, type: Number, description: 'Supervisor ID' }) @ApiProperty({ required: false, type: Number, description: 'Supervisor ID' })
// @IsOptional() @IsOptional()
// supervisor_id?: number; supervisor_id?: number;
// @IsOptional() @IsOptional()
// phone_number: string; phone_number: string;
// } }

158
src/identity-and-account/employees/services/employees-archival.service.ts
View File

@ -1,91 +1,91 @@
// import { Injectable } from "@nestjs/common"; import { Injectable } from "@nestjs/common";
// import { Employees, EmployeesArchive, Users } from "@prisma/client"; import { Employees, Users } from "@prisma/client";
// import { PrismaService } from "src/prisma/prisma.service"; import { UpdateEmployeeDto } from "src/identity-and-account/employees/dtos/update-employee.dto";
// import { UpdateEmployeeDto } from "../dtos/update-employee.dto"; import { toDateOrUndefined, toDateOrNull } from "src/identity-and-account/employees/utils/employee.utils";
// import { toDateOrUndefined, toDateOrNull } from "../utils/employee.utils"; import { PrismaService } from "src/prisma/prisma.service";
// @Injectable() @Injectable()
// export class EmployeesArchivalService { export class EmployeesArchivalService {
// constructor(private readonly prisma: PrismaService) { } constructor(private readonly prisma: PrismaService) { }
// async patchEmployee(email: string, dto: UpdateEmployeeDto): Promise<Employees | EmployeesArchive | null> { async patchEmployee(email: string, dto: UpdateEmployeeDto): Promise<Employees | null> {
// // 1) Tenter sur employés actifs // 1) Tenter sur employés actifs
// const active = await this.prisma.employees.findFirst({ const active = await this.prisma.employees.findFirst({
// where: { user: { email } }, where: { user: { email } },
// include: { user: true }, include: { user: true },
// }); });
// if (active) { if (active) {
// // Archivage : si on reçoit un last_work_day défini et que l'employé n’est pas déjà terminé // Archivage : si on reçoit un last_work_day défini et que l'employé n’est pas déjà terminé
// if (dto.last_work_day !== undefined && active.last_work_day == null && dto.last_work_day !== null) { // if (dto.last_work_day !== undefined && active.last_work_day == null && dto.last_work_day !== null) {
// return this.archiveOnTermination(active, dto); // return this.archiveOnTermination(active, dto);
// } // }
// // Sinon, update standard (split Users/Employees) // Sinon, update standard (split Users/Employees)
// const { const {
// first_name, first_name,
// last_name, last_name,
// email: new_email, email: new_email,
// phone_number, phone_number,
// residence, residence,
// external_payroll_id, external_payroll_id,
// company_code, company_code,
// job_title, job_title,
// first_work_day, first_work_day,
// last_work_day, last_work_day,
// supervisor_id, supervisor_id,
// is_supervisor, is_supervisor,
// } = dto as any; } = dto as any;
// const first_work_d = toDateOrUndefined(first_work_day); const first_work_d = toDateOrUndefined(first_work_day);
// const last_work_d = Object.prototype.hasOwnProperty('last_work_day') const last_work_d = Object.prototype.hasOwnProperty('last_work_day')
// ? toDateOrNull(last_work_day ?? null) ? toDateOrNull(last_work_day ?? null)
// : undefined; : undefined;
// await this.prisma.$transaction(async (transaction) => { await this.prisma.$transaction(async (transaction) => {
// if ( if (
// first_name !== undefined || first_name !== undefined ||
// last_name !== undefined || last_name !== undefined ||
// new_email !== undefined || new_email !== undefined ||
// phone_number !== undefined || phone_number !== undefined ||
// residence !== undefined residence !== undefined
// ) { ) {
// await transaction.users.update({ await transaction.users.update({
// where: { id: active.user_id }, where: { id: active.user_id },
// data: { data: {
// ...(first_name !== undefined ? { first_name } : {}), ...(first_name !== undefined ? { first_name } : {}),
// ...(last_name !== undefined ? { last_name } : {}), ...(last_name !== undefined ? { last_name } : {}),
// ...(email !== undefined ? { email: new_email } : {}), ...(email !== undefined ? { email: new_email } : {}),
// ...(phone_number !== undefined ? { phone_number } : {}), ...(phone_number !== undefined ? { phone_number } : {}),
// ...(residence !== undefined ? { residence } : {}), ...(residence !== undefined ? { residence } : {}),
// }, },
// }); });
// } }
// const updated = await transaction.employees.update({ const updated = await transaction.employees.update({
// where: { id: active.id }, where: { id: active.id },
// data: { data: {
// ...(external_payroll_id !== undefined ? { external_payroll_id } : {}), ...(external_payroll_id !== undefined ? { external_payroll_id } : {}),
// ...(company_code !== undefined ? { company_code } : {}), ...(company_code !== undefined ? { company_code } : {}),
// ...(job_title !== undefined ? { job_title } : {}), ...(job_title !== undefined ? { job_title } : {}),
// ...(first_work_d !== undefined ? { first_work_day: first_work_d } : {}), ...(first_work_d !== undefined ? { first_work_day: first_work_d } : {}),
// ...(last_work_d !== undefined ? { last_work_day: last_work_d } : {}), ...(last_work_d !== undefined ? { last_work_day: last_work_d } : {}),
// ...(is_supervisor !== undefined ? { is_supervisor } : {}), ...(is_supervisor !== undefined ? { is_supervisor } : {}),
// ...(supervisor_id !== undefined ? { supervisor_id } : {}), ...(supervisor_id !== undefined ? { supervisor_id } : {}),
// }, },
// include: { user: true }, include: { user: true },
// }); });
// return updated; return updated;
// }); });
// return this.prisma.employees.findFirst({ where: { user: { email } } }); return this.prisma.employees.findFirst({ where: { user: { email } } });
// } }
// const user = await this.prisma.users.findUnique({ where: { email } }); const user = await this.prisma.users.findUnique({ where: { email } });
// if (!user) return null; if (!user) return null;
// // 2) Pas trouvé en actifs → regarder en archive (pour restauration) // 2) Pas trouvé en actifs → regarder en archive (pour restauration)
// const archived = await this.prisma.employeesArchive.findFirst({ // const archived = await this.prisma.employeesArchive.findFirst({
// where: { user_id: user.id }, // where: { user_id: user.id },
// include: { user: true }, // include: { user: true },
@ -98,11 +98,11 @@
// return this.restoreEmployee(archived, dto); // return this.restoreEmployee(archived, dto);
// } // }
// } // }
// // 3) Ni actif, ni archivé → 404 dans le controller // 3) Ni actif, ni archivé → 404 dans le controller
// return null; return null;
// } }
// //transfers the employee to archive and then delete from employees table //transfers the employee to archive and then delete from employees table
// private async archiveOnTermination(active: Employees & { user: Users }, dto: UpdateEmployeeDto): Promise<EmployeesArchive> { // private async archiveOnTermination(active: Employees & { user: Users }, dto: UpdateEmployeeDto): Promise<EmployeesArchive> {
// const last_work_d = toDateOrNull(dto.last_work_day!); // const last_work_d = toDateOrNull(dto.last_work_day!);
// if (!last_work_d) throw new Error('invalide last_work_day for archive'); // if (!last_work_d) throw new Error('invalide last_work_day for archive');
@ -169,5 +169,5 @@
// return this.prisma.employeesArchive.findUniqueOrThrow({ where: { id } }); // return this.prisma.employeesArchive.findUniqueOrThrow({ where: { id } });
// } // }
// } }

432
src/identity-and-account/employees/services/employees.service.ts
View File

@ -1,230 +1,230 @@
// import { Injectable, NotFoundException } from '@nestjs/common'; import { Injectable, NotFoundException } from "@nestjs/common";
// import { PrismaService } from 'src/prisma/prisma.service'; import { EmployeeListItemDto } from "src/identity-and-account/employees/dtos/list-employee.dto";
// import { EmployeeListItemDto } from '../dtos/list-employee.dto'; import { EmployeeProfileItemDto } from "src/identity-and-account/employees/dtos/profil-employee.dto";
// import { EmployeeProfileItemDto } from '../dtos/profil-employee.dto'; import { PrismaService } from "src/prisma/prisma.service";
// @Injectable() @Injectable()
// export class EmployeesService { export class EmployeesService {
// constructor(private readonly prisma: PrismaService) { } constructor(private readonly prisma: PrismaService) { }
// findListEmployees(): Promise<EmployeeListItemDto[]> { findListEmployees(): Promise<EmployeeListItemDto[]> {
return this.prisma.employees.findMany({
select: {
user: {
select: {
first_name: true,
last_name: true,
email: true,
},
},
supervisor: {
select: {
user: {
select: {
first_name: true,
last_name: true,
},
},
},
},
job_title: true,
company_code: true,
}
}).then(rows => rows.map(r => ({
first_name: r.user.first_name,
last_name: r.user.last_name,
email: r.user.email,
company_name: r.company_code,
job_title: r.job_title,
employee_full_name: `${r.user.first_name} ${r.user.last_name}`,
supervisor_full_name: r.supervisor ? `${r.supervisor.user.first_name} ${r.supervisor.user.last_name}` : null,
})),
);
}
async findOneProfile(email: string): Promise<EmployeeProfileItemDto> {
const emp = await this.prisma.employees.findFirst({
where: { user: { email } },
select: {
user: {
select: {
first_name: true,
last_name: true,
email: true,
phone_number: true,
residence: true,
},
},
supervisor: {
select: {
user: {
select: {
first_name: true,
last_name: true,
},
},
},
},
job_title: true,
company_code: true,
first_work_day: true,
last_work_day: true,
}
});
if (!emp) throw new NotFoundException(`Employee with email ${email} not found`);
return {
first_name: emp.user.first_name,
last_name: emp.user.last_name,
email: emp.user.email,
residence: emp.user.residence,
phone_number: emp.user.phone_number,
company_name: emp.company_code,
job_title: emp.job_title,
employee_full_name: `${emp.user.first_name} ${emp.user.last_name}`,
first_work_day: emp.first_work_day.toISOString().slice(0, 10),
last_work_day: emp.last_work_day ? emp.last_work_day.toISOString().slice(0, 10) : null,
supervisor_full_name: emp.supervisor ? `${emp.supervisor.user.first_name}, ${emp.supervisor.user.last_name}` : null,
};
}
//_____________________________________________________________________________________________
// Deprecated or unused methods
//_____________________________________________________________________________________________
// async create(dto: CreateEmployeeDto): Promise<Employees> {
// const {
// first_name,
// last_name,
// email,
// phone_number,
// residence,
// external_payroll_id,
// company_code,
// job_title,
// first_work_day,
// last_work_day,
// is_supervisor,
// } = dto;
// return this.prisma.$transaction(async (transaction) => {
// const user: Users = await transaction.users.create({
// data: {
// first_name,
// last_name,
// email,
// phone_number,
// residence,
// },
// });
// return transaction.employees.create({
// data: {
// user_id: user.id,
// external_payroll_id,
// company_code,
// job_title,
// first_work_day,
// last_work_day,
// is_supervisor,
// },
// });
// });
// }
// findAll(): Promise<Employees[]> {
// return this.prisma.employees.findMany({ // return this.prisma.employees.findMany({
// select: { // include: { user: true },
// user: { // });
// select: {
// first_name: true,
// last_name: true,
// email: true,
// },
// },
// supervisor: {
// select: {
// user: {
// select: {
// first_name: true,
// last_name: true,
// },
// },
// },
// },
// job_title: true,
// company_code: true,
// }
// }).then(rows => rows.map(r => ({
// first_name: r.user.first_name,
// last_name: r.user.last_name,
// email: r.user.email,
// company_name: r.company_code,
// job_title: r.job_title,
// employee_full_name: `${r.user.first_name} ${r.user.last_name}`,
// supervisor_full_name: r.supervisor ? `${r.supervisor.user.first_name} ${r.supervisor.user.last_name}` : null,
// })),
// );
// } // }
// async findOneProfile(email: string): Promise<EmployeeProfileItemDto> { // async findOne(email: string): Promise<Employees> {
// const emp = await this.prisma.employees.findFirst({ // const emp = await this.prisma.employees.findFirst({
// where: { user: { email } }, // where: { user: { email } },
// select: { // include: { user: true },
// user: {
// select: {
// first_name: true,
// last_name: true,
// email: true,
// phone_number: true,
// residence: true,
// },
// },
// supervisor: {
// select: {
// user: {
// select: {
// first_name: true,
// last_name: true,
// },
// },
// },
// },
// job_title: true,
// company_code: true,
// first_work_day: true,
// last_work_day: true,
// }
// }); // });
// if (!emp) throw new NotFoundException(`Employee with email ${email} not found`);
// return { // //add search for archived employees
// first_name: emp.user.first_name, // if (!emp) {
// last_name: emp.user.last_name, // throw new NotFoundException(`Employee with email: ${email} not found`);
// email: emp.user.email, // }
// residence: emp.user.residence, // return emp;
// phone_number: emp.user.phone_number,
// company_name: emp.company_code,
// job_title: emp.job_title,
// employee_full_name: `${emp.user.first_name} ${emp.user.last_name}`,
// first_work_day: emp.first_work_day.toISOString().slice(0, 10),
// last_work_day: emp.last_work_day ? emp.last_work_day.toISOString().slice(0, 10) : null,
// supervisor_full_name: emp.supervisor ? `${emp.supervisor.user.first_name}, ${emp.supervisor.user.last_name}` : null,
// };
// } // }
// //_____________________________________________________________________________________________ // async update(
// // Deprecated or unused methods // email: string,
// //_____________________________________________________________________________________________ // dto: UpdateEmployeeDto,
// ): Promise<Employees> {
// // async create(dto: CreateEmployeeDto): Promise<Employees> { // const emp = await this.findOne(email);
// // const {
// // first_name,
// // last_name,
// // email,
// // phone_number,
// // residence,
// // external_payroll_id,
// // company_code,
// // job_title,
// // first_work_day,
// // last_work_day,
// // is_supervisor,
// // } = dto;
// // return this.prisma.$transaction(async (transaction) => {
// // const user: Users = await transaction.users.create({
// // data: {
// // first_name,
// // last_name,
// // email,
// // phone_number,
// // residence,
// // },
// // });
// // return transaction.employees.create({
// // data: {
// // user_id: user.id,
// // external_payroll_id,
// // company_code,
// // job_title,
// // first_work_day,
// // last_work_day,
// // is_supervisor,
// // },
// // });
// // });
// // }
// // findAll(): Promise<Employees[]> {
// // return this.prisma.employees.findMany({
// // include: { user: true },
// // });
// // }
// // async findOne(email: string): Promise<Employees> {
// // const emp = await this.prisma.employees.findFirst({
// // where: { user: { email } },
// // include: { user: true },
// // });
// // //add search for archived employees
// // if (!emp) {
// // throw new NotFoundException(`Employee with email: ${email} not found`);
// // }
// // return emp;
// // }
// // async update(
// // email: string,
// // dto: UpdateEmployeeDto,
// // ): Promise<Employees> {
// // const emp = await this.findOne(email);
// // const {
// // first_name,
// // last_name,
// // phone_number,
// // residence,
// // external_payroll_id,
// // company_code,
// // job_title,
// // first_work_day,
// // last_work_day,
// // is_supervisor,
// // email: new_email,
// // } = dto;
// // return this.prisma.$transaction(async (transaction) => {
// // if(
// // first_name !== undefined ||
// // last_name !== undefined ||
// // new_email !== undefined ||
// // phone_number !== undefined ||
// // residence !== undefined
// // ){
// // await transaction.users.update({
// // where: { id: emp.user_id },
// // data: {
// // ...(first_name !== undefined && { first_name }),
// // ...(last_name !== undefined && { last_name }),
// // ...(email !== undefined && { email }),
// // ...(phone_number !== undefined && { phone_number }),
// // ...(residence !== undefined && { residence }),
// // },
// // });
// // }
// // const updated = await transaction.employees.update({
// // where: { id: emp.id },
// // data: {
// // ...(external_payroll_id !== undefined && { external_payroll_id }),
// // ...(company_code !== undefined && { company_code }),
// // ...(first_work_day !== undefined && { first_work_day }),
// // ...(last_work_day !== undefined && { last_work_day }),
// // ...(job_title !== undefined && { job_title }),
// // ...(is_supervisor !== undefined && { is_supervisor }),
// // },
// // });
// // return updated;
// // });
// // }
// // async remove(email: string): Promise<Employees> {
// // const emp = await this.findOne(email);
// // return this.prisma.$transaction(async (transaction) => {
// // await transaction.employees.updateMany({
// // where: { supervisor_id: emp.id },
// // data: { supervisor_id: null },
// // });
// // const deleted_employee = await transaction.employees.delete({
// // where: {id: emp.id },
// // });
// // await transaction.users.delete({
// // where: { id: emp.user_id },
// // });
// // return deleted_employee;
// // });
// // }
// const {
// first_name,
// last_name,
// phone_number,
// residence,
// external_payroll_id,
// company_code,
// job_title,
// first_work_day,
// last_work_day,
// is_supervisor,
// email: new_email,
// } = dto;
// return this.prisma.$transaction(async (transaction) => {
// if(
// first_name !== undefined ||
// last_name !== undefined ||
// new_email !== undefined ||
// phone_number !== undefined ||
// residence !== undefined
// ){
// await transaction.users.update({
// where: { id: emp.user_id },
// data: {
// ...(first_name !== undefined && { first_name }),
// ...(last_name !== undefined && { last_name }),
// ...(email !== undefined && { email }),
// ...(phone_number !== undefined && { phone_number }),
// ...(residence !== undefined && { residence }),
// },
// });
// } // }
// const updated = await transaction.employees.update({
// where: { id: emp.id },
// data: {
// ...(external_payroll_id !== undefined && { external_payroll_id }),
// ...(company_code !== undefined && { company_code }),
// ...(first_work_day !== undefined && { first_work_day }),
// ...(last_work_day !== undefined && { last_work_day }),
// ...(job_title !== undefined && { job_title }),
// ...(is_supervisor !== undefined && { is_supervisor }),
// },
// });
// return updated;
// });
// }
// async remove(email: string): Promise<Employees> {
// const emp = await this.findOne(email);
// return this.prisma.$transaction(async (transaction) => {
// await transaction.employees.updateMany({
// where: { supervisor_id: emp.id },
// data: { supervisor_id: null },
// });
// const deleted_employee = await transaction.employees.delete({
// where: {id: emp.id },
// });
// await transaction.users.delete({
// where: { id: emp.user_id },
// });
// return deleted_employee;
// });
// }
}

18
src/identity-and-account/employees/utils/employee.utils.ts
View File

@ -1,9 +1,9 @@
// export function toDateOrNull(v?: string | null): Date | null { export function toDateOrNull(v?: string | null): Date | null {
// if (!v) return null; if (!v) return null;
// const day = new Date(v); const day = new Date(v);
// return isNaN(day.getTime()) ? null : day; return isNaN(day.getTime()) ? null : day;
// } }
// export function toDateOrUndefined(v?: string | null): Date | undefined { export function toDateOrUndefined(v?: string | null): Date | undefined {
// const day = toDateOrNull(v ?? undefined); const day = toDateOrNull(v ?? undefined);
// return day === null ? undefined : day; return day === null ? undefined : day;
// } }