diff --git a/src/modules/business-logics/business-logics.module.ts b/src/Time_And_Attendance/domains/business-logics.module.ts similarity index 100% rename from src/modules/business-logics/business-logics.module.ts rename to src/Time_And_Attendance/domains/business-logics.module.ts diff --git a/src/modules/business-logics/services/after-hours.service.ts b/src/Time_And_Attendance/domains/services/after-hours.service.ts similarity index 100% rename from src/modules/business-logics/services/after-hours.service.ts rename to src/Time_And_Attendance/domains/services/after-hours.service.ts diff --git a/src/modules/business-logics/services/holiday.service.ts b/src/Time_And_Attendance/domains/services/holiday.service.ts similarity index 100% rename from src/modules/business-logics/services/holiday.service.ts rename to src/Time_And_Attendance/domains/services/holiday.service.ts diff --git a/src/modules/business-logics/services/mileage.service.ts b/src/Time_And_Attendance/domains/services/mileage.service.ts similarity index 100% rename from src/modules/business-logics/services/mileage.service.ts rename to src/Time_And_Attendance/domains/services/mileage.service.ts diff --git a/src/modules/business-logics/services/overtime.service.ts b/src/Time_And_Attendance/domains/services/overtime.service.ts similarity index 100% rename from src/modules/business-logics/services/overtime.service.ts rename to src/Time_And_Attendance/domains/services/overtime.service.ts diff --git a/src/modules/business-logics/services/sick-leave.service.ts b/src/Time_And_Attendance/domains/services/sick-leave.service.ts similarity index 100% rename from src/modules/business-logics/services/sick-leave.service.ts rename to src/Time_And_Attendance/domains/services/sick-leave.service.ts diff --git a/src/modules/business-logics/services/vacation.service.ts b/src/Time_And_Attendance/domains/services/vacation.service.ts similarity index 100% rename from src/modules/business-logics/services/vacation.service.ts rename to src/Time_And_Attendance/domains/services/vacation.service.ts diff --git a/src/modules/leave-requests/controllers/leave-requests.controller.ts b/src/Time_And_Attendance/modules/leave-requests/controllers/leave-requests.controller.ts similarity index 100% rename from src/modules/leave-requests/controllers/leave-requests.controller.ts rename to src/Time_And_Attendance/modules/leave-requests/controllers/leave-requests.controller.ts diff --git a/src/modules/leave-requests/dtos/leave-request-view.dto.ts b/src/Time_And_Attendance/modules/leave-requests/dtos/leave-request-view.dto.ts similarity index 100% rename from src/modules/leave-requests/dtos/leave-request-view.dto.ts rename to src/Time_And_Attendance/modules/leave-requests/dtos/leave-request-view.dto.ts diff --git a/src/modules/leave-requests/dtos/upsert-leave-request.dto.ts b/src/Time_And_Attendance/modules/leave-requests/dtos/upsert-leave-request.dto.ts similarity index 100% rename from src/modules/leave-requests/dtos/upsert-leave-request.dto.ts rename to src/Time_And_Attendance/modules/leave-requests/dtos/upsert-leave-request.dto.ts diff --git a/src/modules/leave-requests/leave-requests.module.ts b/src/Time_And_Attendance/modules/leave-requests/leave-requests.module.ts similarity index 100% rename from src/modules/leave-requests/leave-requests.module.ts rename to src/Time_And_Attendance/modules/leave-requests/leave-requests.module.ts diff --git a/src/modules/leave-requests/mappers/leave-requests-archive.mapper.ts b/src/Time_And_Attendance/modules/leave-requests/mappers/leave-requests-archive.mapper.ts similarity index 100% rename from src/modules/leave-requests/mappers/leave-requests-archive.mapper.ts rename to src/Time_And_Attendance/modules/leave-requests/mappers/leave-requests-archive.mapper.ts diff --git a/src/modules/leave-requests/mappers/leave-requests.mapper.ts b/src/Time_And_Attendance/modules/leave-requests/mappers/leave-requests.mapper.ts similarity index 100% rename from src/modules/leave-requests/mappers/leave-requests.mapper.ts rename to src/Time_And_Attendance/modules/leave-requests/mappers/leave-requests.mapper.ts diff --git a/src/modules/leave-requests/services/holiday-leave-requests.service.ts b/src/Time_And_Attendance/modules/leave-requests/services/holiday-leave-requests.service.ts similarity index 100% rename from src/modules/leave-requests/services/holiday-leave-requests.service.ts rename to src/Time_And_Attendance/modules/leave-requests/services/holiday-leave-requests.service.ts diff --git a/src/modules/leave-requests/services/leave-request.service.ts b/src/Time_And_Attendance/modules/leave-requests/services/leave-request.service.ts similarity index 100% rename from src/modules/leave-requests/services/leave-request.service.ts rename to src/Time_And_Attendance/modules/leave-requests/services/leave-request.service.ts diff --git a/src/modules/leave-requests/services/sick-leave-requests.service.ts b/src/Time_And_Attendance/modules/leave-requests/services/sick-leave-requests.service.ts similarity index 100% rename from src/modules/leave-requests/services/sick-leave-requests.service.ts rename to src/Time_And_Attendance/modules/leave-requests/services/sick-leave-requests.service.ts diff --git a/src/modules/leave-requests/services/vacation-leave-requests.service.ts b/src/Time_And_Attendance/modules/leave-requests/services/vacation-leave-requests.service.ts similarity index 100% rename from src/modules/leave-requests/services/vacation-leave-requests.service.ts rename to src/Time_And_Attendance/modules/leave-requests/services/vacation-leave-requests.service.ts diff --git a/src/modules/leave-requests/utils/leave-request.transform.ts b/src/Time_And_Attendance/modules/leave-requests/utils/leave-request.transform.ts similarity index 100% rename from src/modules/leave-requests/utils/leave-request.transform.ts rename to src/Time_And_Attendance/modules/leave-requests/utils/leave-request.transform.ts diff --git a/src/modules/leave-requests/utils/leave-request.util.ts b/src/Time_And_Attendance/modules/leave-requests/utils/leave-request.util.ts similarity index 100% rename from src/modules/leave-requests/utils/leave-request.util.ts rename to src/Time_And_Attendance/modules/leave-requests/utils/leave-request.util.ts diff --git a/src/modules/leave-requests/utils/leave-requests-archive.select.ts b/src/Time_And_Attendance/modules/leave-requests/utils/leave-requests-archive.select.ts similarity index 100% rename from src/modules/leave-requests/utils/leave-requests-archive.select.ts rename to src/Time_And_Attendance/modules/leave-requests/utils/leave-requests-archive.select.ts diff --git a/src/modules/leave-requests/utils/leave-requests.select.ts b/src/Time_And_Attendance/modules/leave-requests/utils/leave-requests.select.ts similarity index 100% rename from src/modules/leave-requests/utils/leave-requests.select.ts rename to src/Time_And_Attendance/modules/leave-requests/utils/leave-requests.select.ts diff --git a/src/modules/pay-periods/controllers/pay-periods.controller.ts b/src/Time_And_Attendance/modules/pay-period/controllers/pay-periods.controller.ts similarity index 100% rename from src/modules/pay-periods/controllers/pay-periods.controller.ts rename to src/Time_And_Attendance/modules/pay-period/controllers/pay-periods.controller.ts diff --git a/src/modules/pay-periods/dtos/bulk-crew-approval.dto.ts b/src/Time_And_Attendance/modules/pay-period/dtos/bulk-crew-approval.dto.ts similarity index 100% rename from src/modules/pay-periods/dtos/bulk-crew-approval.dto.ts rename to src/Time_And_Attendance/modules/pay-period/dtos/bulk-crew-approval.dto.ts diff --git a/src/modules/pay-periods/dtos/bundle-pay-period.dto.ts b/src/Time_And_Attendance/modules/pay-period/dtos/bundle-pay-period.dto.ts similarity index 100% rename from src/modules/pay-periods/dtos/bundle-pay-period.dto.ts rename to src/Time_And_Attendance/modules/pay-period/dtos/bundle-pay-period.dto.ts diff --git a/src/modules/pay-periods/dtos/overview-employee-period.dto.ts b/src/Time_And_Attendance/modules/pay-period/dtos/overview-employee-period.dto.ts similarity index 100% rename from src/modules/pay-periods/dtos/overview-employee-period.dto.ts rename to src/Time_And_Attendance/modules/pay-period/dtos/overview-employee-period.dto.ts diff --git a/src/modules/pay-periods/dtos/overview-pay-period.dto.ts b/src/Time_And_Attendance/modules/pay-period/dtos/overview-pay-period.dto.ts similarity index 100% rename from src/modules/pay-periods/dtos/overview-pay-period.dto.ts rename to src/Time_And_Attendance/modules/pay-period/dtos/overview-pay-period.dto.ts diff --git a/src/modules/pay-periods/dtos/pay-period.dto.ts b/src/Time_And_Attendance/modules/pay-period/dtos/pay-period.dto.ts similarity index 100% rename from src/modules/pay-periods/dtos/pay-period.dto.ts rename to src/Time_And_Attendance/modules/pay-period/dtos/pay-period.dto.ts diff --git a/src/modules/pay-periods/mappers/pay-periods.mapper.ts b/src/Time_And_Attendance/modules/pay-period/mappers/pay-periods.mapper.ts similarity index 100% rename from src/modules/pay-periods/mappers/pay-periods.mapper.ts rename to src/Time_And_Attendance/modules/pay-period/mappers/pay-periods.mapper.ts diff --git a/src/modules/pay-periods/pay-periods.module.ts b/src/Time_And_Attendance/modules/pay-period/pay-periods.module.ts similarity index 78% rename from src/modules/pay-periods/pay-periods.module.ts rename to src/Time_And_Attendance/modules/pay-period/pay-periods.module.ts index c614179..fabd257 100644 --- a/src/modules/pay-periods/pay-periods.module.ts +++ b/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], diff --git a/src/modules/pay-periods/services/pay-periods-command.service.ts b/src/Time_And_Attendance/modules/pay-period/services/pay-periods-command.service.ts similarity index 100% rename from src/modules/pay-periods/services/pay-periods-command.service.ts rename to src/Time_And_Attendance/modules/pay-period/services/pay-periods-command.service.ts diff --git a/src/modules/pay-periods/services/pay-periods-query.service.ts b/src/Time_And_Attendance/modules/pay-period/services/pay-periods-query.service.ts similarity index 100% rename from src/modules/pay-periods/services/pay-periods-query.service.ts rename to src/Time_And_Attendance/modules/pay-period/services/pay-periods-query.service.ts diff --git a/src/modules/pay-periods/utils/pay-year.util.ts b/src/Time_And_Attendance/modules/pay-period/utils/pay-year.util.ts similarity index 100% rename from src/modules/pay-periods/utils/pay-year.util.ts rename to src/Time_And_Attendance/modules/pay-period/utils/pay-year.util.ts diff --git a/src/modules/shared/constants/date-time.constant.ts b/src/Time_And_Attendance/modules/shared/constants/date-time.constant.ts similarity index 100% rename from src/modules/shared/constants/date-time.constant.ts rename to src/Time_And_Attendance/modules/shared/constants/date-time.constant.ts diff --git a/src/modules/shared/constants/regex.constant.ts b/src/Time_And_Attendance/modules/shared/constants/regex.constant.ts similarity index 100% rename from src/modules/shared/constants/regex.constant.ts rename to src/Time_And_Attendance/modules/shared/constants/regex.constant.ts diff --git a/src/modules/shared/constants/utils.constant.ts b/src/Time_And_Attendance/modules/shared/constants/utils.constant.ts similarity index 100% rename from src/modules/shared/constants/utils.constant.ts rename to src/Time_And_Attendance/modules/shared/constants/utils.constant.ts diff --git a/src/modules/shared/helpers/date-time.helpers.ts b/src/Time_And_Attendance/modules/shared/helpers/date-time.helpers.ts similarity index 100% rename from src/modules/shared/helpers/date-time.helpers.ts rename to src/Time_And_Attendance/modules/shared/helpers/date-time.helpers.ts diff --git a/src/modules/shared/interfaces/shifts.interface.ts b/src/Time_And_Attendance/modules/shared/interfaces/shifts.interface.ts similarity index 100% rename from src/modules/shared/interfaces/shifts.interface.ts rename to src/Time_And_Attendance/modules/shared/interfaces/shifts.interface.ts diff --git a/src/modules/shared/selects/expenses.select.ts b/src/Time_And_Attendance/modules/shared/selects/expenses.select.ts similarity index 100% rename from src/modules/shared/selects/expenses.select.ts rename to src/Time_And_Attendance/modules/shared/selects/expenses.select.ts diff --git a/src/modules/shared/selects/pay-periods.select.ts b/src/Time_And_Attendance/modules/shared/selects/pay-periods.select.ts similarity index 100% rename from src/modules/shared/selects/pay-periods.select.ts rename to src/Time_And_Attendance/modules/shared/selects/pay-periods.select.ts diff --git a/src/modules/shared/selects/shifts.select.ts b/src/Time_And_Attendance/modules/shared/selects/shifts.select.ts similarity index 100% rename from src/modules/shared/selects/shifts.select.ts rename to src/Time_And_Attendance/modules/shared/selects/shifts.select.ts diff --git a/src/modules/shared/shared.module.ts b/src/Time_And_Attendance/modules/shared/shared.module.ts similarity index 100% rename from src/modules/shared/shared.module.ts rename to src/Time_And_Attendance/modules/shared/shared.module.ts diff --git a/src/modules/shared/types/upsert-actions.types.ts b/src/Time_And_Attendance/modules/shared/types/upsert-actions.types.ts similarity index 100% rename from src/modules/shared/types/upsert-actions.types.ts rename to src/Time_And_Attendance/modules/shared/types/upsert-actions.types.ts diff --git a/src/modules/shared/utils/resolve-bank-type-id.utils.ts b/src/Time_And_Attendance/modules/shared/utils/resolve-bank-type-id.utils.ts similarity index 100% rename from src/modules/shared/utils/resolve-bank-type-id.utils.ts rename to src/Time_And_Attendance/modules/shared/utils/resolve-bank-type-id.utils.ts diff --git a/src/modules/shared/utils/resolve-email-id.utils.ts b/src/Time_And_Attendance/modules/shared/utils/resolve-email-id.utils.ts similarity index 100% rename from src/modules/shared/utils/resolve-email-id.utils.ts rename to src/Time_And_Attendance/modules/shared/utils/resolve-email-id.utils.ts diff --git a/src/modules/shared/utils/resolve-full-name.utils.ts b/src/Time_And_Attendance/modules/shared/utils/resolve-full-name.utils.ts similarity index 100% rename from src/modules/shared/utils/resolve-full-name.utils.ts rename to src/Time_And_Attendance/modules/shared/utils/resolve-full-name.utils.ts diff --git a/src/modules/shared/utils/resolve-shifts-id.utils.ts b/src/Time_And_Attendance/modules/shared/utils/resolve-shifts-id.utils.ts similarity index 100% rename from src/modules/shared/utils/resolve-shifts-id.utils.ts rename to src/Time_And_Attendance/modules/shared/utils/resolve-shifts-id.utils.ts diff --git a/src/modules/shared/utils/resolve-timesheet.utils.ts b/src/Time_And_Attendance/modules/shared/utils/resolve-timesheet.utils.ts similarity index 89% rename from src/modules/shared/utils/resolve-timesheet.utils.ts rename to src/Time_And_Attendance/modules/shared/utils/resolve-timesheet.utils.ts index 61f4ce6..2c5e515 100644 --- a/src/modules/shared/utils/resolve-timesheet.utils.ts +++ b/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"; diff --git a/src/modules/schedule-presets/controller/schedule-presets.controller.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/controller/schedule-presets.controller.ts similarity index 94% rename from src/modules/schedule-presets/controller/schedule-presets.controller.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/controller/schedule-presets.controller.ts index b031c67..0efb934 100644 --- a/src/modules/schedule-presets/controller/schedule-presets.controller.ts +++ b/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') diff --git a/src/modules/schedule-presets/dtos/create-schedule-preset-shifts.dto.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/dtos/create-schedule-preset-shifts.dto.ts similarity index 100% rename from src/modules/schedule-presets/dtos/create-schedule-preset-shifts.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/dtos/create-schedule-preset-shifts.dto.ts diff --git a/src/modules/schedule-presets/dtos/create-schedule-presets.dto.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/dtos/create-schedule-presets.dto.ts similarity index 100% rename from src/modules/schedule-presets/dtos/create-schedule-presets.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/dtos/create-schedule-presets.dto.ts diff --git a/src/modules/schedule-presets/mappers/schedule-presets.mappers.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/mappers/schedule-presets.mappers.ts similarity index 100% rename from src/modules/schedule-presets/mappers/schedule-presets.mappers.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/mappers/schedule-presets.mappers.ts diff --git a/src/modules/schedule-presets/schedule-presets.module.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/schedule-presets.module.ts similarity index 100% rename from src/modules/schedule-presets/schedule-presets.module.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/schedule-presets.module.ts diff --git a/src/modules/schedule-presets/services/schedule-presets-apply.service.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-apply.service.ts similarity index 98% rename from src/modules/schedule-presets/services/schedule-presets-apply.service.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-apply.service.ts index fa2bce1..e2e8dbf 100644 --- a/src/modules/schedule-presets/services/schedule-presets-apply.service.ts +++ b/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"; diff --git a/src/modules/schedule-presets/services/schedule-presets-command.service.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-command.service.ts similarity index 96% rename from src/modules/schedule-presets/services/schedule-presets-command.service.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-command.service.ts index 0c2a8bb..5c1cb2c 100644 --- a/src/modules/schedule-presets/services/schedule-presets-command.service.ts +++ b/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"; diff --git a/src/modules/schedule-presets/services/schedule-presets-query.service.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-query.service.ts similarity index 95% rename from src/modules/schedule-presets/services/schedule-presets-query.service.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/services/schedule-presets-query.service.ts index 7ccb0f0..7b87cef 100644 --- a/src/modules/schedule-presets/services/schedule-presets-query.service.ts +++ b/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"; diff --git a/src/modules/schedule-presets/types/schedule-presets.types.ts b/src/Time_And_Attendance/modules/time-tracker/schedule-presets/types/schedule-presets.types.ts similarity index 100% rename from src/modules/schedule-presets/types/schedule-presets.types.ts rename to src/Time_And_Attendance/modules/time-tracker/schedule-presets/types/schedule-presets.types.ts diff --git a/src/modules/shifts/controllers/shift.controller.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/controllers/shift.controller.ts similarity index 100% rename from src/modules/shifts/controllers/shift.controller.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/controllers/shift.controller.ts diff --git a/src/modules/shifts/dtos/get-shift.dto.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/dtos/get-shift.dto.ts similarity index 100% rename from src/modules/shifts/dtos/get-shift.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/dtos/get-shift.dto.ts diff --git a/src/modules/shifts/dtos/shift.dto.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/dtos/shift.dto.ts similarity index 100% rename from src/modules/shifts/dtos/shift.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/dtos/shift.dto.ts diff --git a/src/modules/shifts/dtos/update-shift.dto.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/dtos/update-shift.dto.ts similarity index 100% rename from src/modules/shifts/dtos/update-shift.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/dtos/update-shift.dto.ts diff --git a/src/modules/shifts/helpers/shifts-date-time-helpers.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/helpers/shifts-date-time-helpers.ts similarity index 100% rename from src/modules/shifts/helpers/shifts-date-time-helpers.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/helpers/shifts-date-time-helpers.ts diff --git a/src/modules/shifts/services/shifts-archival.service.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/services/shifts-archival.service.ts similarity index 100% rename from src/modules/shifts/services/shifts-archival.service.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/services/shifts-archival.service.ts diff --git a/src/modules/shifts/services/shifts-get.service.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/services/shifts-get.service.ts similarity index 100% rename from src/modules/shifts/services/shifts-get.service.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/services/shifts-get.service.ts diff --git a/src/modules/shifts/services/shifts-upsert.service.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/services/shifts-upsert.service.ts similarity index 100% rename from src/modules/shifts/services/shifts-upsert.service.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/services/shifts-upsert.service.ts diff --git a/src/modules/shifts/shifts.module.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/shifts.module.ts similarity index 82% rename from src/modules/shifts/shifts.module.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/shifts.module.ts index 4c20e0d..5d33c35 100644 --- a/src/modules/shifts/shifts.module.ts +++ b/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({ diff --git a/src/modules/shifts/~misc_deprecated-files/get-shift-overview.dto.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/get-shift-overview.dto.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/get-shift-overview.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/get-shift-overview.dto.ts diff --git a/src/modules/shifts/~misc_deprecated-files/shifts-command.service.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts-command.service.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/shifts-command.service.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts-command.service.ts diff --git a/src/modules/shifts/~misc_deprecated-files/shifts-overview-row.interface.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts-overview-row.interface.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/shifts-overview-row.interface.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts-overview-row.interface.ts diff --git a/src/modules/shifts/~misc_deprecated-files/shifts-query.service.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts-query.service.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/shifts-query.service.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts-query.service.ts diff --git a/src/modules/shifts/~misc_deprecated-files/shifts-upsert.types.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts-upsert.types.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/shifts-upsert.types.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts-upsert.types.ts diff --git a/src/modules/shifts/~misc_deprecated-files/shifts.controller.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts.controller.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/shifts.controller.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts.controller.ts diff --git a/src/modules/shifts/~misc_deprecated-files/shifts.helpers.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts.helpers.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/shifts.helpers.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts.helpers.ts diff --git a/src/modules/shifts/~misc_deprecated-files/shifts.utils.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts.utils.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/shifts.utils.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/shifts.utils.ts diff --git a/src/modules/shifts/~misc_deprecated-files/upsert-shift.dto.ts b/src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/upsert-shift.dto.ts similarity index 100% rename from src/modules/shifts/~misc_deprecated-files/upsert-shift.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/shifts/~misc_deprecated-files/upsert-shift.dto.ts diff --git a/src/modules/timesheets/controllers/timesheet.controller.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/controllers/timesheet.controller.ts similarity index 91% rename from src/modules/timesheets/controllers/timesheet.controller.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/controllers/timesheet.controller.ts index 1efb2fe..61eef3a 100644 --- a/src/modules/timesheets/controllers/timesheet.controller.ts +++ b/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"; diff --git a/src/modules/timesheets/dtos/timesheet.dto.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/dtos/timesheet.dto.ts similarity index 100% rename from src/modules/timesheets/dtos/timesheet.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/dtos/timesheet.dto.ts diff --git a/src/modules/timesheets/helpers/timesheets-date-time-helpers.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/helpers/timesheets-date-time-helpers.ts similarity index 100% rename from src/modules/timesheets/helpers/timesheets-date-time-helpers.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/helpers/timesheets-date-time-helpers.ts diff --git a/src/modules/timesheets/services/timesheet-approval.service.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-approval.service.ts similarity index 100% rename from src/modules/timesheets/services/timesheet-approval.service.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-approval.service.ts diff --git a/src/modules/timesheets/services/timesheet-archive.service.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-archive.service.ts similarity index 100% rename from src/modules/timesheets/services/timesheet-archive.service.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-archive.service.ts diff --git a/src/modules/timesheets/services/timesheet-get-overview.service.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-get-overview.service.ts similarity index 100% rename from src/modules/timesheets/services/timesheet-get-overview.service.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-get-overview.service.ts 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 new file mode 100644 index 0000000..001fb19 --- /dev/null +++ b/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 {} diff --git a/src/modules/timesheets/~misc_deprecated-files/create-timesheet.dto.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/create-timesheet.dto.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/create-timesheet.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/create-timesheet.dto.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/search-timesheet.dto.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/search-timesheet.dto.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/search-timesheet.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/search-timesheet.dto.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheet-period.dto.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet-period.dto.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheet-period.dto.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet-period.dto.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheet.helpers.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.helpers.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheet.helpers.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.helpers.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheet.mappers.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.mappers.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheet.mappers.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.mappers.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheet.selectors.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.selectors.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheet.selectors.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.selectors.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheet.types.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.types.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheet.types.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.types.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheet.utils.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.utils.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheet.utils.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheet.utils.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheets-command.service.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheets-command.service.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheets-command.service.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheets-command.service.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheets-query.service.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheets-query.service.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheets-query.service.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheets-query.service.ts diff --git a/src/modules/timesheets/~misc_deprecated-files/timesheets.controller.ts b/src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheets.controller.ts similarity index 100% rename from src/modules/timesheets/~misc_deprecated-files/timesheets.controller.ts rename to src/Time_And_Attendance/modules/time-tracker/timesheets/~misc_deprecated-files/timesheets.controller.ts diff --git a/src/app.module.ts b/src/app.module.ts index 4179229..60c2767 100644 --- a/src/app.module.ts +++ b/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: [ diff --git a/src/modules/archival/controllers/shifts-archive.controller.ts b/src/modules/archival/controllers/shifts-archive.controller.ts index e8f92f2..463ea4a 100644 --- a/src/modules/archival/controllers/shifts-archive.controller.ts +++ b/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() diff --git a/src/modules/archival/controllers/timesheets-archive.controller.ts b/src/modules/archival/controllers/timesheets-archive.controller.ts index 7505b66..9be0116 100644 --- a/src/modules/archival/controllers/timesheets-archive.controller.ts +++ b/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() diff --git a/src/modules/archival/services/archival.service.ts b/src/modules/archival/services/archival.service.ts index 66be2d0..898ab51 100644 --- a/src/modules/archival/services/archival.service.ts +++ b/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 { diff --git a/src/modules/employees/employees.module.ts b/src/modules/employees/employees.module.ts index 0f0be93..2fd40ee 100644 --- a/src/modules/employees/employees.module.ts +++ b/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], diff --git a/src/modules/exports/csv-exports.module.ts b/src/modules/exports/csv-exports.module.ts index e034c9e..0c9f00b 100644 --- a/src/modules/exports/csv-exports.module.ts +++ b/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], diff --git a/src/modules/preferences/preferences.module.ts b/src/modules/preferences/preferences.module.ts index 4fe0227..59031ba 100644 --- a/src/modules/preferences/preferences.module.ts +++ b/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], diff --git a/src/modules/preferences/services/preferences.service.ts b/src/modules/preferences/services/preferences.service.ts index 6e4f169..2677573 100644 --- a/src/modules/preferences/services/preferences.service.ts +++ b/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 { diff --git a/src/modules/timesheets/timesheets.module.ts b/src/modules/timesheets/timesheets.module.ts index be44043..e1c997e 100644 --- a/src/modules/timesheets/timesheets.module.ts +++ b/src/modules/timesheets/timesheets.module.ts @@ -1,9 +1,9 @@ -import { GetTimesheetsOverviewService } from './services/timesheet-get-overview.service'; -import { TimesheetArchiveService } from './services/timesheet-archive.service'; +import { GetTimesheetsOverviewService } from '../../Time_And_Attendance/modules/time-tracker/timesheets/services/timesheet-get-overview.service'; +import { TimesheetArchiveService } from '../../Time_And_Attendance/modules/time-tracker/timesheets/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 { TimesheetController } from '../../Time_And_Attendance/modules/time-tracker/timesheets/controllers/timesheet.controller'; +import { SharedModule } from '../../Time_And_Attendance/modules/shared/shared.module'; +import { ShiftsModule } from '../../Time_And_Attendance/modules/time-tracker/shifts/shifts.module'; import { Module } from '@nestjs/common'; @Module({