refactor(modules): clean up module.ts files to match new imports/controllers/providers
This commit is contained in:
parent
e7a50df5e5
commit
28f811e1fb
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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 {}
|
||||
|
|
@ -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 {}
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 {}
|
||||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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: [],
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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{};
|
||||
2
src/time-and-attendance/utils/regex.constants.ts
Normal file
2
src/time-and-attendance/utils/regex.constants.ts
Normal 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$/;
|
||||
|
|
@ -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}$/;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user