From 36be6fb2f139988c909993a317dea6359c77ef11 Mon Sep 17 00:00:00 2001 From: Matthieu Haineault Date: Fri, 1 Aug 2025 16:17:58 -0400 Subject: [PATCH] fix(modules): small ajustment to the structure --- src/app.module.ts | 4 ++-- src/{ => modules}/business-logics/business-logics.module.ts | 0 .../business-logics/services/after-hours.service.ts | 2 +- .../business-logics/services/holiday.service.ts | 2 +- .../business-logics/services/mileage.service.ts | 2 +- .../business-logics/services/overtime.service.ts | 2 +- .../business-logics/services/sick-leave.service.ts | 2 +- .../business-logics/services/vacation.service.ts | 2 +- src/modules/expenses/expenses.module.ts | 2 +- src/modules/expenses/services/expenses.service.ts | 2 +- src/modules/exports/controllers/exports.controller.ts | 0 src/modules/exports/exports.module.ts | 0 src/modules/exports/services/exports.service.ts | 0 src/modules/exports/templates/summary.csv.hbs | 0 src/modules/leave-requests/leave-requests.module.ts | 2 +- .../leave-requests/services/leave-requests.service.ts | 6 +++--- src/modules/shifts/shifts.module.ts | 2 +- src/modules/timesheets/services/timesheets.service.ts | 2 +- src/modules/timesheets/timesheets.module.ts | 2 +- 19 files changed, 17 insertions(+), 17 deletions(-) rename src/{ => modules}/business-logics/business-logics.module.ts (100%) rename src/{ => modules}/business-logics/services/after-hours.service.ts (97%) rename src/{ => modules}/business-logics/services/holiday.service.ts (97%) rename src/{ => modules}/business-logics/services/mileage.service.ts (95%) rename src/{ => modules}/business-logics/services/overtime.service.ts (98%) rename src/{ => modules}/business-logics/services/sick-leave.service.ts (97%) rename src/{ => modules}/business-logics/services/vacation.service.ts (98%) create mode 100644 src/modules/exports/controllers/exports.controller.ts create mode 100644 src/modules/exports/exports.module.ts create mode 100644 src/modules/exports/services/exports.service.ts create mode 100644 src/modules/exports/templates/summary.csv.hbs diff --git a/src/app.module.ts b/src/app.module.ts index bb77024..5f49b87 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -17,8 +17,8 @@ import { PayperiodsModule } from './modules/pay-periods/pay-periods.module'; import { ScheduleModule } from '@nestjs/schedule'; import { ArchivalModule } from './modules/archival/archival.module'; import { BankCodesModule } from './modules/bank-codes/bank-codes.module'; -import { OvertimeService } from './business-logics/services/overtime.service'; -import { BusinessLogicsModule } from './business-logics/business-logics.module'; +import { OvertimeService } from './modules/business-logics/services/overtime.service'; +import { BusinessLogicsModule } from './modules/business-logics/business-logics.module'; @Module({ imports: [ diff --git a/src/business-logics/business-logics.module.ts b/src/modules/business-logics/business-logics.module.ts similarity index 100% rename from src/business-logics/business-logics.module.ts rename to src/modules/business-logics/business-logics.module.ts diff --git a/src/business-logics/services/after-hours.service.ts b/src/modules/business-logics/services/after-hours.service.ts similarity index 97% rename from src/business-logics/services/after-hours.service.ts rename to src/modules/business-logics/services/after-hours.service.ts index d9aeadf..0f857fd 100644 --- a/src/business-logics/services/after-hours.service.ts +++ b/src/modules/business-logics/services/after-hours.service.ts @@ -1,5 +1,5 @@ import { BadRequestException, Injectable, Logger } from "@nestjs/common"; -import { PrismaService } from "../../prisma/prisma.service"; +import { PrismaService } from "../../../prisma/prisma.service"; //THIS SERVICE IS NOT USED RULES TO BE DETERMINED WITH MIKE/HR/ACCOUNTING diff --git a/src/business-logics/services/holiday.service.ts b/src/modules/business-logics/services/holiday.service.ts similarity index 97% rename from src/business-logics/services/holiday.service.ts rename to src/modules/business-logics/services/holiday.service.ts index dece70c..cf898ad 100644 --- a/src/business-logics/services/holiday.service.ts +++ b/src/modules/business-logics/services/holiday.service.ts @@ -1,5 +1,5 @@ import { Injectable, Logger } from "@nestjs/common"; -import { PrismaService } from "../../prisma/prisma.service"; +import { PrismaService } from "../../../prisma/prisma.service"; @Injectable() export class HolidayService { diff --git a/src/business-logics/services/mileage.service.ts b/src/modules/business-logics/services/mileage.service.ts similarity index 95% rename from src/business-logics/services/mileage.service.ts rename to src/modules/business-logics/services/mileage.service.ts index b233812..bf0590c 100644 --- a/src/business-logics/services/mileage.service.ts +++ b/src/modules/business-logics/services/mileage.service.ts @@ -1,5 +1,5 @@ import { BadRequestException, Injectable, Logger } from "@nestjs/common"; -import { PrismaService } from "../../prisma/prisma.service"; +import { PrismaService } from "../../../prisma/prisma.service"; import { Decimal } from "@prisma/client/runtime/library"; @Injectable() diff --git a/src/business-logics/services/overtime.service.ts b/src/modules/business-logics/services/overtime.service.ts similarity index 98% rename from src/business-logics/services/overtime.service.ts rename to src/modules/business-logics/services/overtime.service.ts index 5d685a5..8107c11 100644 --- a/src/business-logics/services/overtime.service.ts +++ b/src/modules/business-logics/services/overtime.service.ts @@ -1,5 +1,5 @@ import { Injectable, Logger } from '@nestjs/common'; -import { PrismaService } from '../../prisma/prisma.service'; +import { PrismaService } from '../../../prisma/prisma.service'; @Injectable() export class OvertimeService { diff --git a/src/business-logics/services/sick-leave.service.ts b/src/modules/business-logics/services/sick-leave.service.ts similarity index 97% rename from src/business-logics/services/sick-leave.service.ts rename to src/modules/business-logics/services/sick-leave.service.ts index fcbe5e8..a36bf29 100644 --- a/src/business-logics/services/sick-leave.service.ts +++ b/src/modules/business-logics/services/sick-leave.service.ts @@ -1,5 +1,5 @@ import { Injectable, Logger } from "@nestjs/common"; -import { PrismaService } from "../../prisma/prisma.service"; +import { PrismaService } from "../../../prisma/prisma.service"; @Injectable() export class SickLeaveService { diff --git a/src/business-logics/services/vacation.service.ts b/src/modules/business-logics/services/vacation.service.ts similarity index 98% rename from src/business-logics/services/vacation.service.ts rename to src/modules/business-logics/services/vacation.service.ts index f726b6e..759a0d6 100644 --- a/src/business-logics/services/vacation.service.ts +++ b/src/modules/business-logics/services/vacation.service.ts @@ -1,5 +1,5 @@ import { Injectable, Logger, NotFoundException } from "@nestjs/common"; -import { PrismaService } from "../../prisma/prisma.service"; +import { PrismaService } from "../../../prisma/prisma.service"; @Injectable() export class VacationService { diff --git a/src/modules/expenses/expenses.module.ts b/src/modules/expenses/expenses.module.ts index 0171a3e..527d783 100644 --- a/src/modules/expenses/expenses.module.ts +++ b/src/modules/expenses/expenses.module.ts @@ -2,7 +2,7 @@ import { PrismaService } from "src/prisma/prisma.service"; import { ExpensesController } from "./controllers/expenses.controller"; import { Module } from "@nestjs/common"; import { ExpensesService } from "./services/expenses.service"; -import { BusinessLogicsModule } from "src/business-logics/business-logics.module"; +import { BusinessLogicsModule } from "src/modules/business-logics/business-logics.module"; @Module({ imports: [BusinessLogicsModule], diff --git a/src/modules/expenses/services/expenses.service.ts b/src/modules/expenses/services/expenses.service.ts index 6b803ca..48b05b3 100644 --- a/src/modules/expenses/services/expenses.service.ts +++ b/src/modules/expenses/services/expenses.service.ts @@ -3,7 +3,7 @@ import { PrismaService } from "src/prisma/prisma.service"; import { CreateExpenseDto } from "../dtos/create-expense"; import { Expenses, ExpensesArchive } from "@prisma/client"; import { UpdateExpenseDto } from "../dtos/update-expense"; -import { MileageService } from "src/business-logics/services/mileage.service"; +import { MileageService } from "src/modules/business-logics/services/mileage.service"; @Injectable() export class ExpensesService { diff --git a/src/modules/exports/controllers/exports.controller.ts b/src/modules/exports/controllers/exports.controller.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/modules/exports/exports.module.ts b/src/modules/exports/exports.module.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/modules/exports/services/exports.service.ts b/src/modules/exports/services/exports.service.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/modules/exports/templates/summary.csv.hbs b/src/modules/exports/templates/summary.csv.hbs new file mode 100644 index 0000000..e69de29 diff --git a/src/modules/leave-requests/leave-requests.module.ts b/src/modules/leave-requests/leave-requests.module.ts index df86084..7762846 100644 --- a/src/modules/leave-requests/leave-requests.module.ts +++ b/src/modules/leave-requests/leave-requests.module.ts @@ -1,7 +1,7 @@ import { LeaveRequestController } from "./controllers/leave-requests.controller"; import { LeaveRequestsService } from "./services/leave-requests.service"; import { Module } from "@nestjs/common"; -import { BusinessLogicsModule } from "src/business-logics/business-logics.module"; +import { BusinessLogicsModule } from "src/modules/business-logics/business-logics.module"; @Module({ imports: [BusinessLogicsModule], diff --git a/src/modules/leave-requests/services/leave-requests.service.ts b/src/modules/leave-requests/services/leave-requests.service.ts index 3abcbe0..2cd2bed 100644 --- a/src/modules/leave-requests/services/leave-requests.service.ts +++ b/src/modules/leave-requests/services/leave-requests.service.ts @@ -3,9 +3,9 @@ import { PrismaService } from "src/prisma/prisma.service"; import { CreateLeaveRequestsDto } from "../dtos/create-leave-requests.dto"; import { LeaveRequests, LeaveRequestsArchive } from "@prisma/client"; import { UpdateLeaveRequestsDto } from "../dtos/update-leave-requests.dto"; -import { HolidayService } from "src/business-logics/services/holiday.service"; -import { SickLeaveService } from "src/business-logics/services/sick-leave.service"; -import { VacationService } from "src/business-logics/services/vacation.service"; +import { HolidayService } from "src/modules/business-logics/services/holiday.service"; +import { SickLeaveService } from "src/modules/business-logics/services/sick-leave.service"; +import { VacationService } from "src/modules/business-logics/services/vacation.service"; @Injectable() export class LeaveRequestsService { diff --git a/src/modules/shifts/shifts.module.ts b/src/modules/shifts/shifts.module.ts index bec2737..09d63a1 100644 --- a/src/modules/shifts/shifts.module.ts +++ b/src/modules/shifts/shifts.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { ShiftsController } from './controllers/shifts.controller'; import { ShiftsService } from './services/shifts.service'; -import { BusinessLogicsModule } from 'src/business-logics/business-logics.module'; +import { BusinessLogicsModule } from 'src/modules/business-logics/business-logics.module'; @Module({ imports: [BusinessLogicsModule], diff --git a/src/modules/timesheets/services/timesheets.service.ts b/src/modules/timesheets/services/timesheets.service.ts index 4beea6b..48b5703 100644 --- a/src/modules/timesheets/services/timesheets.service.ts +++ b/src/modules/timesheets/services/timesheets.service.ts @@ -3,7 +3,7 @@ import { PrismaService } from 'src/prisma/prisma.service'; import { CreateTimesheetDto } from '../dtos/create-timesheet.dto'; import { Timesheets, TimesheetsArchive } from '@prisma/client'; import { UpdateTimesheetDto } from '../dtos/update-timesheet.dto'; -import { OvertimeService } from 'src/business-logics/services/overtime.service'; +import { OvertimeService } from 'src/modules/business-logics/services/overtime.service'; @Injectable() export class TimesheetsService { diff --git a/src/modules/timesheets/timesheets.module.ts b/src/modules/timesheets/timesheets.module.ts index 1ab62dd..debf169 100644 --- a/src/modules/timesheets/timesheets.module.ts +++ b/src/modules/timesheets/timesheets.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { TimesheetsController } from './controllers/timesheets.controller'; import { TimesheetsService } from './services/timesheets.service'; -import { BusinessLogicsModule } from 'src/business-logics/business-logics.module'; +import { BusinessLogicsModule } from 'src/modules/business-logics/business-logics.module'; @Module({ imports: [BusinessLogicsModule],