From 9821b81afdf4c21fe12f5d53b2789f7a176dc5be Mon Sep 17 00:00:00 2001 From: Matthieu Haineault Date: Tue, 7 Oct 2025 09:55:44 -0400 Subject: [PATCH] fizx(archive): fix import services --- .../controllers/employees-archive.controller.ts | 8 ++++---- .../controllers/expenses-archive.controller.ts | 4 ++-- .../controllers/shifts-archive.controller.ts | 4 ++-- .../controllers/timesheets-archive.controller.ts | 4 ++-- src/modules/archival/services/archival.service.ts | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/modules/archival/controllers/employees-archive.controller.ts b/src/modules/archival/controllers/employees-archive.controller.ts index fa9e911..375a351 100644 --- a/src/modules/archival/controllers/employees-archive.controller.ts +++ b/src/modules/archival/controllers/employees-archive.controller.ts @@ -2,20 +2,20 @@ import { Controller, Get, NotFoundException, Param, ParseIntPipe, UseGuards } fr import { ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger"; import { RolesAllowed } from "src/common/decorators/roles.decorators"; import { EmployeesArchive, Roles as RoleEnum } from '@prisma/client'; -import { EmployeesService } from "src/modules/employees/services/employees.service"; +import { EmployeesArchivalService } from "src/modules/employees/services/employees-archival.service"; @ApiTags('Employee Archives') // @UseGuards() @Controller('archives/employees') export class EmployeesArchiveController { - constructor(private readonly employeesService: EmployeesService) {} + constructor(private readonly employeesArchiveService: EmployeesArchivalService) {} @Get() //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR) @ApiOperation({ summary: 'List of archived employees'}) @ApiResponse({ status: 200, description: 'List of archived employees', isArray: true }) async findAllArchived(): Promise { - return this.employeesService.findAllArchived(); + return this.employeesArchiveService.findAllArchived(); } @Get() @@ -24,7 +24,7 @@ export class EmployeesArchiveController { @ApiResponse({ status: 200, description: 'Archived employee found'}) async findOneArchived(@Param('id', ParseIntPipe) id: number ): Promise { try{ - return await this.employeesService.findOneArchived(id); + return await this.employeesArchiveService.findOneArchived(id); }catch { throw new NotFoundException(`Archived employee #${id} not found`); } diff --git a/src/modules/archival/controllers/expenses-archive.controller.ts b/src/modules/archival/controllers/expenses-archive.controller.ts index 7c270fe..e6bd935 100644 --- a/src/modules/archival/controllers/expenses-archive.controller.ts +++ b/src/modules/archival/controllers/expenses-archive.controller.ts @@ -2,13 +2,13 @@ import { UseGuards, Controller, Get, Param, ParseIntPipe, NotFoundException } fr import { ApiTags, ApiOperation, ApiResponse } from "@nestjs/swagger"; import { ExpensesArchive,Roles as RoleEnum } from "@prisma/client"; import { RolesAllowed } from "src/common/decorators/roles.decorators"; -import { ExpensesQueryService } from "src/modules/expenses/services/expenses-query.service"; +import { ExpensesArchivalService } from "src/modules/expenses/services/expenses-archival.service"; @ApiTags('Expense Archives') // @UseGuards() @Controller('archives/expenses') export class ExpensesArchiveController { - constructor(private readonly expensesService: ExpensesQueryService) {} + constructor(private readonly expensesService: ExpensesArchivalService) {} @Get() //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR) diff --git a/src/modules/archival/controllers/shifts-archive.controller.ts b/src/modules/archival/controllers/shifts-archive.controller.ts index fb7204b..e8f92f2 100644 --- a/src/modules/archival/controllers/shifts-archive.controller.ts +++ b/src/modules/archival/controllers/shifts-archive.controller.ts @@ -2,13 +2,13 @@ import { Get, Param, ParseIntPipe, NotFoundException, Controller, UseGuards } fr import { ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger"; import { ShiftsArchive, Roles as RoleEnum } from "@prisma/client"; import { RolesAllowed } from "src/common/decorators/roles.decorators"; -import { ShiftsQueryService } from "src/modules/shifts/services/shifts-query.service"; +import { ShiftsArchivalService } from "src/modules/shifts/services/shifts-archival.service"; @ApiTags('Shift Archives') // @UseGuards() @Controller('archives/shifts') export class ShiftsArchiveController { - constructor(private readonly shiftsService:ShiftsQueryService) {} + constructor(private readonly shiftsService: ShiftsArchivalService) {} @Get() //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR) diff --git a/src/modules/archival/controllers/timesheets-archive.controller.ts b/src/modules/archival/controllers/timesheets-archive.controller.ts index 0c9d607..7505b66 100644 --- a/src/modules/archival/controllers/timesheets-archive.controller.ts +++ b/src/modules/archival/controllers/timesheets-archive.controller.ts @@ -2,13 +2,13 @@ import { Controller, Get, NotFoundException, Param, ParseIntPipe, UseGuards } fr import { ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger"; import { RolesAllowed } from "src/common/decorators/roles.decorators"; import { TimesheetsArchive, Roles as RoleEnum } from '@prisma/client'; -import { TimesheetsQueryService } from "src/modules/timesheets/services/timesheets-query.service"; +import { TimesheetArchiveService } from "src/modules/timesheets/services/timesheet-archive.service"; @ApiTags('Timesheet Archives') // @UseGuards() @Controller('archives/timesheets') export class TimesheetsArchiveController { - constructor(private readonly timesheetsService: TimesheetsQueryService) {} + constructor(private readonly timesheetsService: TimesheetArchiveService) {} @Get() //@RolesAllowed(RoleEnum.ADMIN, RoleEnum.HR, RoleEnum.SUPERVISOR) diff --git a/src/modules/archival/services/archival.service.ts b/src/modules/archival/services/archival.service.ts index 7dbf567..66be2d0 100644 --- a/src/modules/archival/services/archival.service.ts +++ b/src/modules/archival/services/archival.service.ts @@ -1,17 +1,17 @@ import { Injectable, Logger } from "@nestjs/common"; import { Cron } from "@nestjs/schedule"; -import { ExpensesQueryService } from "src/modules/expenses/services/expenses-query.service"; -import { ShiftsQueryService } from "src/modules/shifts/services/shifts-query.service"; -import { TimesheetsQueryService } from "src/modules/timesheets/services/timesheets-query.service"; +import { ExpensesArchivalService } from "src/modules/expenses/services/expenses-archival.service"; +import { ShiftsArchivalService } from "src/modules/shifts/services/shifts-archival.service"; +import { TimesheetArchiveService } from "src/modules/timesheets/services/timesheet-archive.service"; @Injectable() export class ArchivalService { private readonly logger = new Logger(ArchivalService.name); constructor( - private readonly timesheetsService: TimesheetsQueryService, - private readonly expensesService: ExpensesQueryService, - private readonly shiftsService: ShiftsQueryService, + private readonly timesheetsService: TimesheetArchiveService, + private readonly expensesService: ExpensesArchivalService, + private readonly shiftsService: ShiftsArchivalService, ) {} @Cron('0 0 3 * * 1', {timeZone:'America/Toronto'}) // chaque premier lundi du mois à 03h00