refactor(modules): clean up module.ts files to match new imports/controllers/providers

This commit is contained in:
Matthieu Haineault 2025-10-27 13:28:39 -04:00
parent e7a50df5e5
commit 28f811e1fb
10 changed files with 21 additions and 38 deletions

View File

@ -3,13 +3,11 @@ import { OvertimeService } from "./services/overtime.service";
import { VacationService } from "./services/vacation.service"; import { VacationService } from "./services/vacation.service";
import { HolidayService } from "./services/holiday.service"; import { HolidayService } from "./services/holiday.service";
import { MileageService } from "./services/mileage.service"; import { MileageService } from "./services/mileage.service";
import { PrismaService } from "src/prisma/prisma.service";
import { Module } from "@nestjs/common"; import { Module } from "@nestjs/common";
@Module({ @Module({
providers: [ providers: [
PrismaService,
HolidayService, HolidayService,
MileageService, MileageService,
OvertimeService, OvertimeService,

View File

@ -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 { 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 { ExpenseController } from "src/time-and-attendance/modules/expenses/controllers/expense.controller";
import { Module } from "@nestjs/common"; import { Module } from "@nestjs/common";
@Module({ @Module({
controllers: [ ExpenseController ], controllers: [ ExpenseController ],
providers: [ ExpenseUpsertService, ExpensesArchivalService ], providers: [ ExpenseUpsertService ],
}) })
export class ExpensesModule {} export class ExpensesModule {}

View File

@ -1,26 +1,19 @@
import { LeaveRequestController } from "src/time-and-attendance/modules/leave-requests/controllers/leave-requests.controller"; 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 { 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 { 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 { 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"; import { Module } from "@nestjs/common";
@Module({ @Module({
imports: [BusinessLogicsModule, ShiftsModule ], imports: [
controllers: [LeaveRequestController], BusinessLogicsModule,
providers: [ ShiftsModule,
VacationService, SharedModule
SickLeaveService,
HolidayService,
LeaveRequestsService,
PrismaService,
LeaveRequestsUtils,
], ],
controllers: [LeaveRequestController],
providers: [LeaveRequestsService],
}) })
export class LeaveRequestsModule {} export class LeaveRequestsModule {}

View File

@ -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 { 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 { 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 { 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 { 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 { 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 { EmailToIdResolver } from "src/time-and-attendance/modules/shared/utils/resolve-email-id.utils";

View File

@ -1,14 +1,10 @@
import { PayPeriodsQueryService } from "./services/pay-periods-query.service"; import { PayPeriodsQueryService } from "./services/pay-periods-query.service";
import { PayPeriodsController } from "./controllers/pay-periods.controller"; import { PayPeriodsController } from "./controllers/pay-periods.controller";
import { PrismaService } from "src/prisma/prisma.service";
import { Module } from "@nestjs/common"; import { Module } from "@nestjs/common";
@Module({ @Module({
providers: [
PayPeriodsQueryService,
PrismaService,
],
controllers: [PayPeriodsController], controllers: [PayPeriodsController],
providers: [PayPeriodsQueryService],
}) })
export class PayperiodsModule {} export class PayperiodsModule {}

View File

@ -2,7 +2,6 @@ import { Module } from "@nestjs/common";
import { SchedulePresetsCommandService } from "./services/schedule-presets-command.service"; import { SchedulePresetsCommandService } from "./services/schedule-presets-command.service";
import { SchedulePresetsQueryService } from "./services/schedule-presets-query.service"; import { SchedulePresetsQueryService } from "./services/schedule-presets-query.service";
import { SchedulePresetsController } from "./controller/schedule-presets.controller"; import { SchedulePresetsController } from "./controller/schedule-presets.controller";
import { PrismaService } from "src/prisma/prisma.service";
import { SchedulePresetsApplyService } from "./services/schedule-presets-apply.service"; import { SchedulePresetsApplyService } from "./services/schedule-presets-apply.service";
import { SharedModule } from "src/time-and-attendance/modules/shared/shared.module"; 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], imports: [SharedModule],
controllers: [SchedulePresetsController], controllers: [SchedulePresetsController],
providers: [ providers: [
PrismaService,
SchedulePresetsCommandService, SchedulePresetsCommandService,
SchedulePresetsQueryService, SchedulePresetsQueryService,
SchedulePresetsApplyService, SchedulePresetsApplyService,

View File

@ -5,12 +5,11 @@ import { SharedModule } from '../../shared/shared.module';
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
@Module({ @Module({
imports: [], imports: [SharedModule],
controllers: [TimesheetController], controllers: [TimesheetController],
providers: [ providers: [
TimesheetArchiveService, TimesheetArchiveService,
GetTimesheetsOverviewService, GetTimesheetsOverviewService,
SharedModule,
], ],
exports: [], exports: [],
}) })

View File

@ -1,39 +1,39 @@
import { SchedulePresetsCommandService } from "src/time-and-attendance/modules/time-tracker/schedule-presets/services/schedule-presets-command.service"; 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 { 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 { 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 { 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 { BusinessLogicsModule } from "src/time-and-attendance/domains/business-logics.module";
import { ExpenseUpsertService } from "src/time-and-attendance/modules/expenses/services/expense-upsert.service"; 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 { 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 { 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 { 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 { 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 { 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 { 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"; import { Module } from "@nestjs/common";
@Module({ @Module({
imports: [BusinessLogicsModule, PayperiodsModule], imports: [
BusinessLogicsModule,
PayperiodsModule,
SharedModule,
],
controllers: [ controllers: [
TimesheetController, TimesheetController,
ShiftController, ShiftController,
SchedulePresetsController, SchedulePresetsController,
ExpenseController, ExpenseController,
], ],
providers: [ providers: [
GetTimesheetsOverviewService, GetTimesheetsOverviewService,
ShiftsGetService, ShiftsGetService,
ShiftsUpsertService, ShiftsUpsertService,
ExpenseUpsertService, ExpenseUpsertService,
ExpensesArchivalService,
EmailToIdResolver,
SchedulePresetsCommandService, SchedulePresetsCommandService,
BankCodesResolver,
SchedulePresetsQueryService, SchedulePresetsQueryService,
SchedulePresetsApplyService,
], ],
exports: [], exports: [],
}) export class TimeAndAttendanceModule{}; }) export class TimeAndAttendanceModule{};

View File

@ -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$/;

View File

@ -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}$/;