Merge branch 'dev/matthieu/refactor' of git.targo.ca:Targo/targo_backend into dev/matthieu/refactor

src/Time_And_Attendance/modules/pay-period/pay-periods.module.ts

@@ -2,10 +2,10 @@ import { PrismaModule } from "src/prisma/prisma.module";
 import { PayPeriodsController } from "./controllers/pay-periods.controller";
 import { Module } from "@nestjs/common";
 import { PayPeriodsQueryService } from "./services/pay-periods-query.service";
-import { TimesheetsModule } from "../timesheets/timesheets.module";
+import { TimesheetsModule } from "../time-tracker/timesheets/timesheets.module";
 import { SharedModule } from "../shared/shared.module";
 import { PrismaService } from "src/prisma/prisma.service";
-import { BusinessLogicsModule } from "../business-logics/business-logics.module";
+import { BusinessLogicsModule } from "../../../modules/business-logics/business-logics.module";
 
 @Module({
     imports: [PrismaModule, TimesheetsModule, SharedModule, BusinessLogicsModule],

src/Time_And_Attendance/modules/shared/utils/resolve-timesheet.utils.ts

@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException } from "@nestjs/common";
 import { Prisma, PrismaClient } from "@prisma/client";
-import { weekStartSunday } from "src/modules/shifts/helpers/shifts-date-time-helpers";
+import { weekStartSunday } from "src/Time_And_Attendance/modules/time-tracker/shifts/helpers/shifts-date-time-helpers";
 import { PrismaService } from "src/prisma/prisma.service";
 import { EmailToIdResolver } from "./resolve-email-id.utils";
 

src/Time_And_Attendance/modules/time-tracker/schedule-presets/controller/schedule-presets.controller.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, Body, Controller, Get, NotFoundException, Param, Post, Put, Query } from "@nestjs/common";
 import { SchedulePresetsDto } from "../dtos/create-schedule-presets.dto";
 import { SchedulePresetsCommandService } from "../services/schedule-presets-command.service";
-import { UpsertAction } from "src/modules/shared/types/upsert-actions.types";
+import { UpsertAction } from "src/Time_And_Attendance/modules/shared/types/upsert-actions.types";
 import { SchedulePresetsQueryService } from "../services/schedule-presets-query.service";
 
 @Controller('schedule-presets')

src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-apply.service.ts

@@ -1,5 +1,5 @@
 import { BadRequestException, ConflictException, Injectable, NotFoundException } from "@nestjs/common";
-import { EmailToIdResolver } from "src/modules/shared/utils/resolve-email-id.utils";
+import { EmailToIdResolver } from "src/Time_And_Attendance/modules/shared/utils/resolve-email-id.utils";
 import { PrismaService } from "src/prisma/prisma.service";
 import { ApplyResult } from "../types/schedule-presets.types";
 import { Prisma, Weekday } from "@prisma/client";

src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-command.service.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, ConflictException, Injectable, NotFoundException } from "@nestjs/common";
-import { BankCodesResolver }       from "src/modules/shared/utils/resolve-bank-type-id.utils";
-import { EmailToIdResolver } from "src/modules/shared/utils/resolve-email-id.utils";
-import { UpsertAction }            from "src/modules/shared/types/upsert-actions.types";
+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 { UpsertAction }            from "src/Time_And_Attendance/modules/shared/types/upsert-actions.types";
 import { PrismaService }      from "src/prisma/prisma.service";
 import { SchedulePresetsDto } from "../dtos/create-schedule-presets.dto";
 import { Prisma, Weekday }    from "@prisma/client";

src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-query.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, NotFoundException } from "@nestjs/common";
-import { EmailToIdResolver } from "src/modules/shared/utils/resolve-email-id.utils";
+import { EmailToIdResolver } from "src/Time_And_Attendance/modules/shared/utils/resolve-email-id.utils";
 import { PrismaService } from "src/prisma/prisma.service";
 import { PresetResponse, ShiftResponse } from "../types/schedule-presets.types";
 import { Prisma } from "@prisma/client";

src/Time_And_Attendance/modules/time-tracker/shifts/shifts.module.ts

@@ -1,10 +1,10 @@
 import { ShiftsArchivalService } from './services/shifts-archival.service';
 import { BusinessLogicsModule } from 'src/modules/business-logics/business-logics.module';
-import { NotificationsModule } from '../notifications/notifications.module';
+import { NotificationsModule } from '../../../../modules/notifications/notifications.module';
 import { ShiftsUpsertService } from './services/shifts-upsert.service';
 import { ShiftsGetService } from './services/shifts-get.service';
 import { ShiftController } from './controllers/shift.controller';
-import { SharedModule } from '../shared/shared.module';
+import { SharedModule } from '../../shared/shared.module';
 import { Module } from '@nestjs/common';
 
 @Module({

src/Time_And_Attendance/modules/time-tracker/timesheets/controllers/timesheet.controller.ts

@@ -1,4 +1,4 @@
-import { EmailToIdResolver } from "src/modules/shared/utils/resolve-email-id.utils";
+import { EmailToIdResolver } from "src/Time_And_Attendance/modules/shared/utils/resolve-email-id.utils";
 import { GetTimesheetsOverviewService } from "../services/timesheet-get-overview.service";
 import { BadRequestException, Controller, Get, Query} from "@nestjs/common";
 

src/Time_And_Attendance/modules/time-tracker/timesheets/timesheets.module.ts

@@ -0,0 +1,23 @@
+import { GetTimesheetsOverviewService } from './services/timesheet-get-overview.service';
+import { TimesheetArchiveService } from './services/timesheet-archive.service';
+import { BusinessLogicsModule } from 'src/modules/business-logics/business-logics.module';
+import { TimesheetController } from './controllers/timesheet.controller';
+import { SharedModule } from '../../shared/shared.module';
+import { ShiftsModule } from '../shifts/shifts.module';
+import { Module } from '@nestjs/common';
+
+@Module({
+	imports: [
+		BusinessLogicsModule, 
+		SharedModule,
+		ShiftsModule,
+	],
+	controllers: [TimesheetController],
+	providers: [ 
+		TimesheetArchiveService,
+		GetTimesheetsOverviewService,
+		SharedModule,
+	],
+	exports: [],
+})
+export class TimesheetsModule {}

src/app.module.ts

@@ -18,15 +18,15 @@ import { OvertimeService }  from './modules/business-logics/services/overtime.se
 import { PreferencesModule } from './modules/preferences/preferences.module';
 import { PrismaModule }     from './prisma/prisma.module';
 import { ScheduleModule }   from '@nestjs/schedule';
-import { ShiftsModule }     from './modules/shifts/shifts.module';
-import { TimesheetsModule } from './modules/timesheets/timesheets.module';
+import { ShiftsModule }     from './Time_And_Attendance/modules/time-tracker/shifts/shifts.module';
+import { TimesheetsModule } from './Time_And_Attendance/modules/time-tracker/timesheets/timesheets.module';
 import { UsersModule }      from './modules/users-management/users.module';
 import { ConfigModule }     from '@nestjs/config';
 import { APP_FILTER, APP_PIPE } from '@nestjs/core';
 import { HttpExceptionFilter }  from './common/filters/http-exception.filter';
 import { ValidationError }      from 'class-validator';
 import { SchedulePresetsModule } from './modules/schedule-presets/schedule-presets.module';
-import { PayperiodsModule } from './modules/pay-periods/pay-periods.module';
+import { PayperiodsModule } from './Time_And_Attendance/modules/pay-period/pay-periods.module';
 
 @Module({
   imports: [

src/modules/archival/controllers/shifts-archive.controller.ts

@@ -2,7 +2,7 @@ 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 { ShiftsArchivalService } from "src/modules/shifts/services/shifts-archival.service";
+import { ShiftsArchivalService } from "src/Time_And_Attendance/modules/time-tracker/shifts/services/shifts-archival.service";
 
 @ApiTags('Shift Archives')
 // @UseGuards()

src/modules/archival/controllers/timesheets-archive.controller.ts

@@ -2,7 +2,7 @@ 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 { TimesheetArchiveService } from "src/modules/timesheets/services/timesheet-archive.service";
+import { TimesheetArchiveService } from "src/Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-archive.service";
 
 @ApiTags('Timesheet Archives')
 // @UseGuards()

src/modules/archival/services/archival.service.ts

@@ -1,8 +1,8 @@
 import { Injectable, Logger } from "@nestjs/common";
 import { Cron } from "@nestjs/schedule";
 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";
+import { ShiftsArchivalService } from "src/Time_And_Attendance/modules/time-tracker/shifts/services/shifts-archival.service";
+import { TimesheetArchiveService } from "src/Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-archive.service";
 
 @Injectable()
 export class ArchivalService {

src/modules/employees/employees.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { EmployeesController } from './controllers/employees.controller';
 import { EmployeesService } from './services/employees.service';
 import { EmployeesArchivalService } from './services/employees-archival.service';
-import { SharedModule } from '../shared/shared.module';
+import { SharedModule } from '../../Time_And_Attendance/modules/shared/shared.module';
 
 @Module({
   imports: [SharedModule],

src/modules/exports/csv-exports.module.ts

@@ -1,7 +1,7 @@
 import { Module } from "@nestjs/common";
 import { CsvExportController } from "./controllers/csv-exports.controller";
 import { CsvExportService } from "./services/csv-exports.service";
-import { SharedModule } from "../shared/shared.module";
+import { SharedModule } from "../../Time_And_Attendance/modules/shared/shared.module";
 
 @Module({
     providers:[CsvExportService, SharedModule],

src/modules/preferences/preferences.module.ts

@@ -1,7 +1,7 @@
 import { Module } from "@nestjs/common";
 import { PreferencesController } from "./controllers/preferences.controller";
 import { PreferencesService } from "./services/preferences.service";
-import { SharedModule } from "../shared/shared.module";
+import { SharedModule } from "../../Time_And_Attendance/modules/shared/shared.module";
 
 @Module({
     imports: [SharedModule],

src/modules/preferences/services/preferences.service.ts

@@ -2,7 +2,7 @@ import { Injectable }     from "@nestjs/common";
 import { Preferences }    from "@prisma/client";
 import { PrismaService }  from "src/prisma/prisma.service";
 import { PreferencesDto } from "../dtos/preferences.dto";
-import { EmailToIdResolver } from "src/modules/shared/utils/resolve-email-id.utils";
+import { EmailToIdResolver } from "src/Time_And_Attendance/modules/shared/utils/resolve-email-id.utils";
 
 @Injectable()
 export class PreferencesService {