From 28f811e1fb1e270ff4690ada7dc472eda41119fc Mon Sep 17 00:00:00 2001 From: Matthieu Haineault Date: Mon, 27 Oct 2025 13:28:39 -0400 Subject: [PATCH] refactor(modules): clean up module.ts files to match new imports/controllers/providers --- .../domains/business-logics.module.ts | 2 -- .../modules/expenses/expenses.module.ts | 3 +-- .../leave-requests/leave-requests.module.ts | 21 +++++++------------ .../services/sick-leave-requests.service.ts | 1 - .../modules/pay-period/pay-periods.module.ts | 6 +----- .../schedule-presets.module.ts | 2 -- .../timesheets/timesheets.module.ts | 3 +-- .../time-and-attendance.module.ts | 16 +++++++------- .../utils/regex.constants.ts | 2 ++ src/~misc_deprecated-files/regex.constant.ts | 3 +-- 10 files changed, 21 insertions(+), 38 deletions(-) create mode 100644 src/time-and-attendance/utils/regex.constants.ts diff --git a/src/time-and-attendance/domains/business-logics.module.ts b/src/time-and-attendance/domains/business-logics.module.ts index 5b103b8..91774ec 100644 --- a/src/time-and-attendance/domains/business-logics.module.ts +++ b/src/time-and-attendance/domains/business-logics.module.ts @@ -3,13 +3,11 @@ import { OvertimeService } from "./services/overtime.service"; import { VacationService } from "./services/vacation.service"; import { HolidayService } from "./services/holiday.service"; import { MileageService } from "./services/mileage.service"; -import { PrismaService } from "src/prisma/prisma.service"; import { Module } from "@nestjs/common"; @Module({ providers: [ - PrismaService, HolidayService, MileageService, OvertimeService, diff --git a/src/time-and-attendance/modules/expenses/expenses.module.ts b/src/time-and-attendance/modules/expenses/expenses.module.ts index 17da55a..6ffff02 100644 --- a/src/time-and-attendance/modules/expenses/expenses.module.ts +++ b/src/time-and-attendance/modules/expenses/expenses.module.ts @@ -1,11 +1,10 @@ -import { ExpensesArchivalService } from "./services/expenses-archival.service"; import { ExpenseUpsertService } from "src/time-and-attendance/modules/expenses/services/expense-upsert.service"; import { ExpenseController } from "src/time-and-attendance/modules/expenses/controllers/expense.controller"; import { Module } from "@nestjs/common"; @Module({ controllers: [ ExpenseController ], - providers: [ ExpenseUpsertService, ExpensesArchivalService ], + providers: [ ExpenseUpsertService ], }) export class ExpensesModule {} \ No newline at end of file diff --git a/src/time-and-attendance/modules/leave-requests/leave-requests.module.ts b/src/time-and-attendance/modules/leave-requests/leave-requests.module.ts index 25fc768..21b9e23 100644 --- a/src/time-and-attendance/modules/leave-requests/leave-requests.module.ts +++ b/src/time-and-attendance/modules/leave-requests/leave-requests.module.ts @@ -1,26 +1,19 @@ import { LeaveRequestController } from "src/time-and-attendance/modules/leave-requests/controllers/leave-requests.controller"; import { LeaveRequestsService } from "src/time-and-attendance/modules/leave-requests/services/leave-request.service"; import { BusinessLogicsModule } from "src/time-and-attendance/domains/business-logics.module"; -import { LeaveRequestsUtils } from "src/time-and-attendance/modules/leave-requests/utils/leave-request.util"; -import { SickLeaveService } from "src/time-and-attendance/domains/services/sick-leave.service"; -import { VacationService } from "src/time-and-attendance/domains/services/vacation.service"; -import { HolidayService } from "src/time-and-attendance/domains/services/holiday.service"; -import { PrismaService } from "src/prisma/prisma.service"; import { ShiftsModule } from "src/time-and-attendance/modules/time-tracker/shifts/shifts.module"; +import { SharedModule } from "src/time-and-attendance/modules/shared/shared.module"; import { Module } from "@nestjs/common"; @Module({ - imports: [BusinessLogicsModule, ShiftsModule ], - controllers: [LeaveRequestController], - providers: [ - VacationService, - SickLeaveService, - HolidayService, - LeaveRequestsService, - PrismaService, - LeaveRequestsUtils, + imports: [ + BusinessLogicsModule, + ShiftsModule, + SharedModule ], + controllers: [LeaveRequestController], + providers: [LeaveRequestsService], }) export class LeaveRequestsModule {} \ No newline at end of file diff --git a/src/time-and-attendance/modules/leave-requests/services/sick-leave-requests.service.ts b/src/time-and-attendance/modules/leave-requests/services/sick-leave-requests.service.ts index 13783b2..969d8a5 100644 --- a/src/time-and-attendance/modules/leave-requests/services/sick-leave-requests.service.ts +++ b/src/time-and-attendance/modules/leave-requests/services/sick-leave-requests.service.ts @@ -6,7 +6,6 @@ import { SickLeaveService } from "src/time-and-attendance/domains/services/sick- import { LeaveRequestViewDto } from "src/time-and-attendance/modules/leave-requests/dtos/leave-request-view.dto"; import { UpsertLeaveRequestDto, UpsertResult } from "src/time-and-attendance/modules/leave-requests/dtos/upsert-leave-request.dto"; import { mapRowToView } from "src/time-and-attendance/modules/leave-requests/mappers/leave-requests.mapper"; -import { LeaveRequestsUtils } from "src/time-and-attendance/modules/leave-requests/utils/leave-request.util"; import { normalizeDates, toDateOnly } from "src/time-and-attendance/modules/shared/helpers/date-time.helpers"; import { BankCodesResolver } from "src/time-and-attendance/modules/shared/utils/resolve-bank-type-id.utils"; import { EmailToIdResolver } from "src/time-and-attendance/modules/shared/utils/resolve-email-id.utils"; diff --git a/src/time-and-attendance/modules/pay-period/pay-periods.module.ts b/src/time-and-attendance/modules/pay-period/pay-periods.module.ts index 2a26c5a..3670c72 100644 --- a/src/time-and-attendance/modules/pay-period/pay-periods.module.ts +++ b/src/time-and-attendance/modules/pay-period/pay-periods.module.ts @@ -1,14 +1,10 @@ import { PayPeriodsQueryService } from "./services/pay-periods-query.service"; import { PayPeriodsController } from "./controllers/pay-periods.controller"; -import { PrismaService } from "src/prisma/prisma.service"; import { Module } from "@nestjs/common"; @Module({ - providers: [ - PayPeriodsQueryService, - PrismaService, - ], controllers: [PayPeriodsController], + providers: [PayPeriodsQueryService], }) export class PayperiodsModule {} \ No newline at end of file diff --git a/src/time-and-attendance/modules/time-tracker/schedule-presets/schedule-presets.module.ts b/src/time-and-attendance/modules/time-tracker/schedule-presets/schedule-presets.module.ts index 8194655..70d34f5 100644 --- a/src/time-and-attendance/modules/time-tracker/schedule-presets/schedule-presets.module.ts +++ b/src/time-and-attendance/modules/time-tracker/schedule-presets/schedule-presets.module.ts @@ -2,7 +2,6 @@ import { Module } from "@nestjs/common"; import { SchedulePresetsCommandService } from "./services/schedule-presets-command.service"; import { SchedulePresetsQueryService } from "./services/schedule-presets-query.service"; import { SchedulePresetsController } from "./controller/schedule-presets.controller"; -import { PrismaService } from "src/prisma/prisma.service"; import { SchedulePresetsApplyService } from "./services/schedule-presets-apply.service"; import { SharedModule } from "src/time-and-attendance/modules/shared/shared.module"; @@ -10,7 +9,6 @@ import { SharedModule } from "src/time-and-attendance/modules/shared/shared.modu imports: [SharedModule], controllers: [SchedulePresetsController], providers: [ - PrismaService, SchedulePresetsCommandService, SchedulePresetsQueryService, SchedulePresetsApplyService, diff --git a/src/time-and-attendance/modules/time-tracker/timesheets/timesheets.module.ts b/src/time-and-attendance/modules/time-tracker/timesheets/timesheets.module.ts index 930c70f..d9375cf 100644 --- a/src/time-and-attendance/modules/time-tracker/timesheets/timesheets.module.ts +++ b/src/time-and-attendance/modules/time-tracker/timesheets/timesheets.module.ts @@ -5,12 +5,11 @@ import { SharedModule } from '../../shared/shared.module'; import { Module } from '@nestjs/common'; @Module({ - imports: [], + imports: [SharedModule], controllers: [TimesheetController], providers: [ TimesheetArchiveService, GetTimesheetsOverviewService, - SharedModule, ], exports: [], }) diff --git a/src/time-and-attendance/time-and-attendance.module.ts b/src/time-and-attendance/time-and-attendance.module.ts index cee8cc5..31155e9 100644 --- a/src/time-and-attendance/time-and-attendance.module.ts +++ b/src/time-and-attendance/time-and-attendance.module.ts @@ -1,39 +1,39 @@ import { SchedulePresetsCommandService } from "src/time-and-attendance/modules/time-tracker/schedule-presets/services/schedule-presets-command.service"; import { GetTimesheetsOverviewService } from "src/time-and-attendance/modules/time-tracker/timesheets/services/timesheet-get-overview.service"; import { SchedulePresetsQueryService } from "src/time-and-attendance/modules/time-tracker/schedule-presets/services/schedule-presets-query.service"; +import { SchedulePresetsApplyService } from "src/time-and-attendance/modules/time-tracker/schedule-presets/services/schedule-presets-apply.service"; import { SchedulePresetsController } from "src/time-and-attendance/modules/time-tracker/schedule-presets/controller/schedule-presets.controller"; -import { ExpensesArchivalService } from "src/time-and-attendance/modules/expenses/services/expenses-archival.service"; import { BusinessLogicsModule } from "src/time-and-attendance/domains/business-logics.module"; import { ExpenseUpsertService } from "src/time-and-attendance/modules/expenses/services/expense-upsert.service"; import { ShiftsUpsertService } from "src/time-and-attendance/modules/time-tracker/shifts/services/shifts-upsert.service"; import { TimesheetController } from "src/time-and-attendance/modules/time-tracker/timesheets/controllers/timesheet.controller"; import { ExpenseController } from "src/time-and-attendance/modules/expenses/controllers/expense.controller"; -import { BankCodesResolver } from "src/time-and-attendance/modules/shared/utils/resolve-bank-type-id.utils"; -import { EmailToIdResolver } from "src/time-and-attendance/modules/shared/utils/resolve-email-id.utils"; import { PayperiodsModule } from "src/time-and-attendance/modules/pay-period/pay-periods.module"; import { ShiftsGetService } from "src/time-and-attendance/modules/time-tracker/shifts/services/shifts-get.service"; import { ShiftController } from "src/time-and-attendance/modules/time-tracker/shifts/controllers/shift.controller"; +import { SharedModule } from "src/time-and-attendance/modules/shared/shared.module"; import { Module } from "@nestjs/common"; @Module({ - imports: [BusinessLogicsModule, PayperiodsModule], + imports: [ + BusinessLogicsModule, + PayperiodsModule, + SharedModule, + ], controllers: [ TimesheetController, ShiftController, SchedulePresetsController, ExpenseController, - ], providers: [ GetTimesheetsOverviewService, ShiftsGetService, ShiftsUpsertService, ExpenseUpsertService, - ExpensesArchivalService, - EmailToIdResolver, SchedulePresetsCommandService, - BankCodesResolver, SchedulePresetsQueryService, + SchedulePresetsApplyService, ], exports: [], }) export class TimeAndAttendanceModule{}; \ No newline at end of file diff --git a/src/time-and-attendance/utils/regex.constants.ts b/src/time-and-attendance/utils/regex.constants.ts new file mode 100644 index 0000000..d192d70 --- /dev/null +++ b/src/time-and-attendance/utils/regex.constants.ts @@ -0,0 +1,2 @@ +const DATE_ISO_FORMAT = /^\d{4}-\d{2}-\d{2}$/; +const HH_MM_REGEX = /^([01]\d|2[0-3]):[0-5]\d$/; \ No newline at end of file diff --git a/src/~misc_deprecated-files/regex.constant.ts b/src/~misc_deprecated-files/regex.constant.ts index 4dd4576..8b13789 100644 --- a/src/~misc_deprecated-files/regex.constant.ts +++ b/src/~misc_deprecated-files/regex.constant.ts @@ -1,2 +1 @@ -// const HH_MM_REGEX = /^([01]\d|2[0-3]):[0-5]\d$/; -// const DATE_ISO_FORMAT = /^\d{4}-\d{2}-\d{2}$/; \ No newline at end of file +