diff --git a/src/time-and-attendance/domains/services/holiday.service.ts b/src/time-and-attendance/domains/services/holiday.service.ts index 4bcb213..40ae1e7 100644 --- a/src/time-and-attendance/domains/services/holiday.service.ts +++ b/src/time-and-attendance/domains/services/holiday.service.ts @@ -1,7 +1,6 @@ import { Injectable } from "@nestjs/common"; import { computeHours, getWeekStart } from "src/common/utils/date-utils"; import { PrismaPostgresService } from "prisma/postgres/prisma-postgres.service"; -import { EmailToIdResolver } from "src/common/mappers/email-id.mapper"; import { MS_PER_WEEK } from "src/common/utils/constants.utils"; import { Result } from "src/common/errors/result-error.factory"; /* @@ -15,25 +14,39 @@ import { Result } from "src/common/errors/result-error.factory"; export class HolidayService { constructor( private readonly prisma: PrismaPostgresService, - private readonly emailResolver: EmailToIdResolver, ) { } - private async computeHoursPrevious4WeeksByEmail(email: string, holiday_date: Date): Promise> { - const employee_id = await this.emailResolver.findIdByEmail(email); - if (!employee_id.success) return { success: false, error: employee_id.error }; - return this.computeHoursPrevious4Weeks(employee_id.data, holiday_date); - } - - private async computeHoursPrevious4Weeks(employee_id: number, holiday_date: Date): Promise> { + /** + * Calculates the amount of hours to be paid for a given employee on the provided holiday date. + * + * @param employee_id id of the employee whom the holiday shift belongs to + * @param holiday_date date that the holiday was taken on + * + * @returns Average daily hours worked in the past four weeks as a `number`, to a maximum of `8` + */ + private async computeHoursPrevious4Weeks(external_payroll_id: number, company_code: number, holiday_date: Date): Promise> { try { + const valid_codes = ['G1', 'G43', 'G56', 'G104', 'G105', 'G305', 'G700', 'G720']; const holiday_week_start = getWeekStart(holiday_date); const window_start = new Date(holiday_week_start.getTime() - 4 * MS_PER_WEEK); const window_end = new Date(holiday_week_start.getTime() - 1); - const valid_codes = ['G1', 'G43', 'G56', 'G104', 'G105', 'G305', 'G700', 'G720']; + const employee = await this.prisma.employees.findFirst({ + where: { + external_payroll_id, + company_code, + }, + select: { + id: true, + } + }); + + if (!employee) + return {success: false, error: 'EMPLOYEE_NOT_FOUND'}; + const shifts = await this.prisma.shifts.findMany({ where: { - timesheet: { employee_id: employee_id }, + timesheet: { employee_id: employee.id }, date: { gte: window_start, lte: window_end }, bank_code: { bank_code: { in: valid_codes } }, }, @@ -43,7 +56,10 @@ export class HolidayService { const hours_by_week = new Map(); for (const shift of shifts) { const hours = computeHours(shift.start_time, shift.end_time); - if (hours <= 0) continue; + + if (hours <= 0) + continue; + const shift_week_start = getWeekStart(shift.date); const key = shift_week_start.getTime(); hours_by_week.set(key, (hours_by_week.get(key) ?? 0) + hours); @@ -64,11 +80,12 @@ export class HolidayService { } } - async calculateHolidayPay(email: string, holiday_date: Date, modifier: number): Promise> { - const average_daily_hours = await this.computeHoursPrevious4WeeksByEmail(email, holiday_date); + async calculateHolidayPay(employeePayrollID: number, companyCode: number, holiday_date: Date): Promise> { + const average_daily_hours = await this.computeHoursPrevious4Weeks(employeePayrollID, companyCode, holiday_date); + if (!average_daily_hours.success) return { success: false, error: average_daily_hours.error }; - const daily_rate = (Math.min(average_daily_hours.data, 8)) * modifier; + const daily_rate = (Math.min(average_daily_hours.data, 8)); return { success: true, data: daily_rate }; } } \ No newline at end of file diff --git a/src/time-and-attendance/exports/csv-exports.utils.ts b/src/time-and-attendance/exports/csv-exports.utils.ts index 1a7dbdd..3db50f9 100644 --- a/src/time-and-attendance/exports/csv-exports.utils.ts +++ b/src/time-and-attendance/exports/csv-exports.utils.ts @@ -2,14 +2,15 @@ import { HolidayService } from "src/time-and-attendance/domains/services/holiday import { OvertimeService } from "src/time-and-attendance/domains/services/overtime.service"; import { CsvRow, InternalCsvRow } from "src/time-and-attendance/exports/export-csv-options.dto"; -const REGULAR = 'G1'; -const OVERTIME = 'G43'; +// You made a helper to pull bank codes from the db, but omitted to use it here... curious. +const REGULAR = 1; +const OVERTIME = 43; -export const consolidateRowHoursAndAmountByType = (rows: InternalCsvRow[]): InternalCsvRow[] => { - const map = new Map(); +export const consolidateRowHoursAndAmountByType = (rows: CsvRow[]): CsvRow[] => { + const map = new Map(); for (const row of rows) { - const key = `${row.timesheet_id}|${row.bank_code}|${row.semaine_no}`; + const key = `${row.code}|${row.semaine_no}`; if (!map.has(key)) { map.set(key, { ...row }); } else { @@ -22,22 +23,25 @@ export const consolidateRowHoursAndAmountByType = (rows: InternalCsvRow[]): Inte } export const applyHolidayRequalifications = async ( - rows: InternalCsvRow[], + rows: CsvRow[], holiday_service: HolidayService, -): Promise => { - const result: InternalCsvRow[] = []; + holiday_bank_code: string, +): Promise => { + const result: CsvRow[] = []; + const HOLIDAY_BANK_CODE = Number(holiday_bank_code.slice(1,)); for (const row of rows) { - if (row.bank_code !== 'G104') { + if (row.code !== HOLIDAY_BANK_CODE) { result.push(row); continue; } - if (!row.holiday_date || !row.email) { + if (!row.premier_jour_absence || !row.dernier_jour_absence || !row.employee_matricule || !row.compagnie_no) { result.push(row); continue; } - const calculated = await holiday_service.calculateHolidayPay(row.email, new Date(row.holiday_date), 1); + const calculated = await holiday_service.calculateHolidayPay(row.employee_matricule, row.compagnie_no, new Date(row.premier_jour_absence)); + if (!calculated.success) { result.push({ ...row, quantite_hre: 0 }); continue; @@ -49,15 +53,15 @@ export const applyHolidayRequalifications = async ( } export const applyOvertimeRequalifications = async ( - consolidated_rows: InternalCsvRow[], + consolidated_rows: CsvRow[], overtime_service: OvertimeService, ): Promise => { - const result: InternalCsvRow[] = []; + const result: CsvRow[] = []; //grouped by timesheet and week number - const grouped_rows = new Map(); + const grouped_rows = new Map(); for (const row of consolidated_rows) { - const key = `${row.timesheet_id}|${row.semaine_no}`; + const key = `${row.compagnie_no}|${row.employee_matricule}|${row.semaine_no}`; if (!grouped_rows.has(key)) { grouped_rows.set(key, []); } @@ -75,7 +79,7 @@ export const applyOvertimeRequalifications = async ( const overtime_hours = summary.data.total_overtime; - const regular_hours = rows.find(r => r.bank_code === REGULAR); + const regular_hours = rows.find(r => r.code === REGULAR); if (!regular_hours || !regular_hours.quantite_hre) { result.push(...rows); continue; @@ -96,7 +100,7 @@ export const applyOvertimeRequalifications = async ( result.push({ ...regular_hours, - bank_code: OVERTIME, + code: OVERTIME, quantite_hre: deducted, }); } diff --git a/src/time-and-attendance/exports/export-csv-options.dto.ts b/src/time-and-attendance/exports/export-csv-options.dto.ts index a9c241d..a485cb4 100644 --- a/src/time-and-attendance/exports/export-csv-options.dto.ts +++ b/src/time-and-attendance/exports/export-csv-options.dto.ts @@ -49,20 +49,20 @@ export class ExportCsvOptionsDto { export interface CsvRow { compagnie_no: number; employee_matricule: number; - releve:number; - type_transaction:string; + releve: number; + type_transaction: string; code: number; - quantite_hre?: number; - taux_horaire?:string; - montant?: number; + quantite_hre: number | undefined; + taux_horaire: string | undefined; + montant: number | undefined; semaine_no: number; - division_no?: number; - service_no?: number; - departem_no?:number; - sous_departem_no?:number; + division_no: number | undefined; + service_no: number | undefined; + departem_no: number | undefined; + sous_departem_no: number | undefined; date_transaction: string; - premier_jour_absence?: string; - dernier_jour_absence?:string; + premier_jour_absence: string | undefined; + dernier_jour_absence: string | undefined; } export type InternalCsvRow = CsvRow & { timesheet_id: number; shift_date: Date; email: string; } diff --git a/src/time-and-attendance/exports/services/csv-exports.service.ts b/src/time-and-attendance/exports/services/csv-exports.service.ts index 43d8851..3c4696d 100644 --- a/src/time-and-attendance/exports/services/csv-exports.service.ts +++ b/src/time-and-attendance/exports/services/csv-exports.service.ts @@ -6,6 +6,9 @@ import { applyHolidayRequalifications, applyOvertimeRequalifications, computeWee import { OvertimeService } from "src/time-and-attendance/domains/services/overtime.service"; import { HolidayService } from "src/time-and-attendance/domains/services/holiday.service"; import { select_csv_expense_lines, select_csv_shift_lines } from "src/time-and-attendance/utils/selects.utils"; +import { BillableShiftType } from "src/time-and-attendance/shifts/shift.types"; +import { Prisma } from "prisma/postgres/generated/prisma/client/postgres/client"; +import { DefaultArgs } from "@prisma/client/runtime/client"; @Injectable() @@ -16,13 +19,38 @@ export class CsvExportService { private readonly holiday_service: HolidayService, ) { } - async collectTransaction( - year: number, - period_no: number, - filters: Filters, - // approved: boolean = true - ): Promise { - //fetch period + /** + * Gets all approved shifts and expenses within the year and period number provided, according + * to company and types specified in the filters. Any holiday shifts will be adjusted based on + * prior 4 weeks of work, where applicable. Vacation and Sick shifts will be split into separate + * lines if they are more than one day apart. + * + * ex: A pay period goes from January 10 to 24. An employee has vacation shifts from + * January 11 to + * 13 and one shift on Jan 23, then two separate lines will be generated; one from Jan 11 to 13 + * and one for Jan 23. + * + * @param year the year of the requested pay data + * @param period_no the period number of the requested pay data + * @param filters user-provided input that determines which company and types are exported + * @returns The desired filtered data in semi-colon-separated format, grouped and sorted by + * employee and by bank codes. + */ + async collectTransaction( year: number, period_no: number, filters: Filters ): Promise { + const BILLABLE_SHIFT_TYPES: BillableShiftType[] = [ + 'REGULAR', + 'EVENING', + 'EMERGENCY', + 'OVERTIME', + 'SICK', + 'HOLIDAY', + 'VACATION', + ]; + + const BILLABLE_SHIFT_CODES = await this.resolveShiftTypeCode(BILLABLE_SHIFT_TYPES); + const PTO_SHIFT_CODES = await this.resolveShiftTypeCode(['VACATION', 'SICK', 'HOLIDAY']); + const HOLIDAY_SHIFT_CODE = await this.resolveShiftTypeCode(['HOLIDAY'])[0]; + const period = await this.prisma.payPeriods.findFirst({ where: { pay_year: year, pay_period_no: period_no }, select: { period_start: true, period_end: true }, @@ -32,79 +60,38 @@ export class CsvExportService { const start = period.period_start; const end = period.period_end; - //fetch company codes const company_codes = resolveCompanyCodes(filters.companies); - if (company_codes.length === 0) throw new BadRequestException('No company selected'); + if (company_codes.length === 0) throw new BadRequestException('NO_COMPANY_SELECTED'); - //Flag types - const { shifts: want_shifts, expenses: want_expense, holiday: want_holiday, vacation: want_vacation } = filters.types; - if (!want_shifts && !want_expense && !want_holiday && !want_vacation) { - throw new BadRequestException(' No export type selected '); - } + if (Object.values(filters.types).every(type => type === false)) + throw new BadRequestException('NO_TYPE_SELECTED'); - const holiday_code = await this.resolveShiftTypeCode('HOLIDAY'); - const vacation_code = await this.resolveShiftTypeCode('VACATION'); - const regular_code = await this.resolveShiftTypeCode('REGULAR'); - const evening_code = await this.resolveShiftTypeCode('EVENING'); - const emergency_code = await this.resolveShiftTypeCode('EMERGENCY'); - const sick_code = await this.resolveShiftTypeCode('SICK'); - const shift_code_filter = [regular_code, evening_code, emergency_code, sick_code]; + const exportedShifts = await this.prisma.shifts.findMany({ + where: { + date: { gte: start, lte: end }, + is_approved: true, + timesheet: { employee: { company_code: { in: company_codes } } }, + bank_code: { bank_code: { in: BILLABLE_SHIFT_CODES } }, + }, + select: select_csv_shift_lines, + }); - //Prisma queries - const promises: Array> = []; + const exportedExpenses = await this.prisma.expenses.findMany({ + where: { + date: { gte: start, lte: end }, + is_approved: true, + timesheet: { employee: { company_code: { in: company_codes } } }, + }, + select: select_csv_expense_lines, + }); - if (want_shifts) { - promises.push(this.prisma.shifts.findMany({ - where: { - date: { gte: start, lte: end }, - is_approved: true, - timesheet: { employee: { company_code: { in: company_codes } } }, - bank_code: { bank_code: { in: shift_code_filter } }, - }, - select: select_csv_shift_lines, - })); - } else { - promises.push(Promise.resolve([])); - } - - if (want_holiday) { - promises.push(this.prisma.shifts.findMany({ - where: { - date: { gte: start, lte: end }, - is_approved: true, - timesheet: { employee: { company_code: { in: company_codes } } }, - bank_code: { bank_code: holiday_code }, - }, - select: select_csv_shift_lines, - })); - } else { - promises.push(Promise.resolve([])); - } - - if (want_vacation) { - promises.push(this.prisma.shifts.findMany({ - where: { - date: { gte: start, lte: end }, - is_approved: true, - bank_code: { bank_code: vacation_code }, - timesheet: { employee: { company_code: { in: company_codes } } }, - }, - select: select_csv_shift_lines, - })); - } else { - promises.push(Promise.resolve([])); - } - - //array of arrays - const [base_shifts, holiday_shifts, vacation_shifts, expenses] = await Promise.all(promises); - - const rows: CsvRow[] = []; - - const map_shifts = (shift: any, is_holiday: boolean): CsvRow => { + const rows: CsvRow[] = exportedShifts.map(shift => { const employee = shift!.timesheet.employee; const week = computeWeekNumber(start, shift!.date); const type_transaction = shift!.bank_code.bank_code.charAt(0); - const code = Number(shift!.bank_code.bank_code.slice(1,)) + const code = Number(shift!.bank_code.bank_code.slice(1,)); + const isPTO = PTO_SHIFT_CODES.includes(shift.bank_code.bank_code) + return { compagnie_no: employee.company_code, employee_matricule: employee.external_payroll_id, @@ -118,36 +105,19 @@ export class CsvExportService { division_no: undefined, service_no: undefined, departem_no: undefined, + sous_departem_no: undefined, date_transaction: formatDate(end), - premier_jour_absence: is_holiday ? formatDate(shift!.date) : '', - dernier_jour_absence: is_holiday ? formatDate(shift!.date) : '', + premier_jour_absence: isPTO ? formatDate(shift!.date) : '', + dernier_jour_absence: isPTO ? formatDate(shift!.date) : '', } - }; + }); - //final mapping of all shifts based filters - for (const shift of base_shifts) rows.push(map_shifts(shift, false)); - for (const shift of holiday_shifts) rows.push(map_shifts(shift, true)); - for (const shift of vacation_shifts) rows.push(map_shifts(shift, false)); - - - if (want_expense) { - promises.push(this.prisma.expenses.findMany({ - where: { - date: { gte: start, lte: end }, - is_approved: true, - timesheet: { employee: { company_code: { in: company_codes } } }, - }, - select: select_csv_expense_lines, - })); - } else { - promises.push(Promise.resolve([])); - } - - for (const expense of expenses) { + exportedExpenses.map(expense => { const employee = expense.timesheet.employee; const type_transaction = expense!.bank_code.bank_code.charAt(0); const code = Number(expense!.bank_code.bank_code.slice(1,)) const week = computeWeekNumber(start, expense.date); + rows.push({ compagnie_no: employee.company_code, employee_matricule: employee.external_payroll_id, @@ -161,28 +131,24 @@ export class CsvExportService { division_no: undefined, service_no: undefined, departem_no: undefined, + sous_departem_no: undefined, date_transaction: formatDate(end), premier_jour_absence: undefined, dernier_jour_absence: undefined, }); - } + }); - //Final mapping and sorts + // Sort shifts and expenses according to their bank codes rows.sort((a, b) => { - if (a.compagnie_no !== b.compagnie_no) { - return a.compagnie_no - b.compagnie_no; - } - const bank_code = String(a.bank_code).localeCompare(String(b.bank_code)); - if (bank_code !== 0) return bank_code; - if (a.bank_code !== b.bank_code) return a.bank_code.localeCompare(b.bank_code); + if (a.code !== b.code) + return a.code - b.code; + return 0; }); - //requalifies the real amount paid for holidays - const holiday_rows = await applyHolidayRequalifications(rows, this.holiday_service); + const holiday_rows = await applyHolidayRequalifications(rows, this.holiday_service, HOLIDAY_SHIFT_CODE); - //groups hours by bank_code const consolidated_rows = await consolidateRowHoursAndAmountByType(holiday_rows); //requalifies regular hours into overtime when needed @@ -191,9 +157,9 @@ export class CsvExportService { return requalified_rows; } - resolveShiftTypeCode = async (shift_type: string): Promise => { - const shift_code = await this.prisma.bankCodes.findFirst({ - where: { type: shift_type }, + resolveShiftTypeCode = async (shift_type: BillableShiftType[]): Promise => { + const billableBankCodes = await this.prisma.bankCodes.findMany({ + where: { type: { in: shift_type } }, select: { bank_code: true, shifts: { @@ -203,9 +169,12 @@ export class CsvExportService { }, }, }); - if (!shift_code) throw new BadRequestException('Missing Shift bank code'); + if (!billableBankCodes) throw new BadRequestException('Missing Shift bank code'); - return shift_code.bank_code; + const shiftCodes: string[] = []; + billableBankCodes.map(billableBankCode => shiftCodes.push(billableBankCode.bank_code)); + + return shiftCodes; } } diff --git a/src/time-and-attendance/shifts/shift.types.ts b/src/time-and-attendance/shifts/shift.types.ts new file mode 100644 index 0000000..744d6f9 --- /dev/null +++ b/src/time-and-attendance/shifts/shift.types.ts @@ -0,0 +1 @@ +export type BillableShiftType = 'REGULAR' | 'EVENING' | 'EMERGENCY' | 'VACATION' | 'HOLIDAY' | 'SICK' | 'OVERTIME'; \ No newline at end of file diff --git a/src/time-and-attendance/utils/selects.utils.ts b/src/time-and-attendance/utils/selects.utils.ts index 67671e2..1c4e5f3 100644 --- a/src/time-and-attendance/utils/selects.utils.ts +++ b/src/time-and-attendance/utils/selects.utils.ts @@ -94,6 +94,7 @@ export const select_csv_shift_lines = { id: true, employee: { select: { + id: true, company_code: true, external_payroll_id: true, },