From 2cfda9ca450f485b20931c0aba2e8f55051e98db Mon Sep 17 00:00:00 2001 From: realrafi Date: Tue, 28 Jul 2026 20:17:25 +0330 Subject: [PATCH] refactor: changed the project structure --- src/app.module.ts | 12 ++++++------ src/common/decorators/auth-guard.decorator.ts | 2 +- src/common/decorators/user.decorator.ts | 4 ++-- src/config/sms.config.ts | 2 +- .../attachment/attachment.controller.ts | 0 src/{ => modules}/attachment/attachment.module.ts | 0 src/{ => modules}/attachment/attachment.service.ts | 0 .../attachment/dto/create-attachment.dto.ts | 0 .../attachment/dto/update-attachment.dto.ts | 0 .../attachment/entities/attachment.entity.ts | 4 ++-- .../attachment/enums/attachment-type.enum.ts | 0 .../attachment/repositories/attachment.repository.ts | 0 src/{ => modules}/auth/DTO/login-credential.dto.ts | 0 src/{ => modules}/auth/DTO/send-otp.dto.ts | 0 src/{ => modules}/auth/DTO/verify-otp.dto.ts | 0 src/{ => modules}/auth/auth.controller.ts | 0 src/{ => modules}/auth/auth.module.ts | 7 ++----- src/{ => modules}/auth/auth.service.ts | 6 +++--- src/{ => modules}/auth/entities/otp.entity.ts | 0 src/{ => modules}/auth/enums/otp-status.enum.ts | 0 src/{ => modules}/auth/guards/jwt-auth.guard.ts | 0 src/{ => modules}/auth/interfaces/IRequest.ts | 0 src/{ => modules}/auth/interfaces/IToken-payload.ts | 2 +- .../auth/interfaces/IUserIpAndHeader.ts | 0 .../auth/repositories/otp.repository.ts | 0 src/{ => modules}/auth/strategies/jwt.strategy.ts | 1 - src/{ => modules}/complaint/complaint.controller.ts | 0 src/{ => modules}/complaint/complaint.module.ts | 0 src/{ => modules}/complaint/complaint.service.ts | 0 .../complaint/dto/create-complaint.dto.ts | 0 .../complaint/dto/update-complaint.dto.ts | 0 .../entities/complaint-attachment.entity.ts | 2 +- .../complaint/entities/complaint.entity.ts | 6 +++--- src/{ => modules}/complaint/enums/complaint.enum.ts | 0 .../complaint/repositories/complaint.repository.ts | 0 src/{ => modules}/organ/dto/create-organ.dto.ts | 0 src/{ => modules}/organ/dto/update-organ.dto.ts | 0 src/{ => modules}/organ/entities/organ.entity.ts | 2 +- src/{ => modules}/organ/organ.controller.ts | 0 src/{ => modules}/organ/organ.module.ts | 0 src/{ => modules}/organ/organ.service.ts | 0 .../organ/repositories/organ.repository.ts | 0 src/{ => modules}/reply/dto/create-reply.dto.ts | 0 src/{ => modules}/reply/dto/update-reply.dto.ts | 0 .../reply/entities/reply-attachment.entity.ts | 2 +- src/{ => modules}/reply/entities/reply.entity.ts | 6 +++--- src/{ => modules}/reply/reply.controller.ts | 0 src/{ => modules}/reply/reply.module.ts | 0 src/{ => modules}/reply/reply.service.ts | 0 .../repositories/reply-attachment.repository.ts | 0 .../reply/repositories/reply.repository.ts | 0 src/{ => modules}/users/DTO/create-user-role.dto.ts | 0 src/{ => modules}/users/DTO/create-user.dto.ts | 0 src/{ => modules}/users/entities/user-role.entity.ts | 0 src/{ => modules}/users/entities/user.entity.ts | 2 +- src/{ => modules}/users/enums/user-role.enum.ts | 0 .../users/repositories/user-role.repository.ts | 0 .../users/repositories/user.repository.ts | 0 src/{ => modules}/users/users.controller.ts | 0 src/{ => modules}/users/users.module.ts | 0 src/{ => modules}/users/users.service.ts | 0 src/{ => modules}/utils/constants.ts | 0 src/{ => modules}/utils/interfaces/ISms.ts | 0 src/{ => modules}/utils/providers/sms.service.ts | 0 src/{ => modules}/utils/utils.module.ts | 0 65 files changed, 28 insertions(+), 32 deletions(-) rename src/{ => modules}/attachment/attachment.controller.ts (100%) rename src/{ => modules}/attachment/attachment.module.ts (100%) rename src/{ => modules}/attachment/attachment.service.ts (100%) rename src/{ => modules}/attachment/dto/create-attachment.dto.ts (100%) rename src/{ => modules}/attachment/dto/update-attachment.dto.ts (100%) rename src/{ => modules}/attachment/entities/attachment.entity.ts (78%) rename src/{ => modules}/attachment/enums/attachment-type.enum.ts (100%) rename src/{ => modules}/attachment/repositories/attachment.repository.ts (100%) rename src/{ => modules}/auth/DTO/login-credential.dto.ts (100%) rename src/{ => modules}/auth/DTO/send-otp.dto.ts (100%) rename src/{ => modules}/auth/DTO/verify-otp.dto.ts (100%) rename src/{ => modules}/auth/auth.controller.ts (100%) rename src/{ => modules}/auth/auth.module.ts (73%) rename src/{ => modules}/auth/auth.service.ts (96%) rename src/{ => modules}/auth/entities/otp.entity.ts (100%) rename src/{ => modules}/auth/enums/otp-status.enum.ts (100%) rename src/{ => modules}/auth/guards/jwt-auth.guard.ts (100%) rename src/{ => modules}/auth/interfaces/IRequest.ts (100%) rename src/{ => modules}/auth/interfaces/IToken-payload.ts (58%) rename src/{ => modules}/auth/interfaces/IUserIpAndHeader.ts (100%) rename src/{ => modules}/auth/repositories/otp.repository.ts (100%) rename src/{ => modules}/auth/strategies/jwt.strategy.ts (93%) rename src/{ => modules}/complaint/complaint.controller.ts (100%) rename src/{ => modules}/complaint/complaint.module.ts (100%) rename src/{ => modules}/complaint/complaint.service.ts (100%) rename src/{ => modules}/complaint/dto/create-complaint.dto.ts (100%) rename src/{ => modules}/complaint/dto/update-complaint.dto.ts (100%) rename src/{ => modules}/complaint/entities/complaint-attachment.entity.ts (87%) rename src/{ => modules}/complaint/entities/complaint.entity.ts (85%) rename src/{ => modules}/complaint/enums/complaint.enum.ts (100%) rename src/{ => modules}/complaint/repositories/complaint.repository.ts (100%) rename src/{ => modules}/organ/dto/create-organ.dto.ts (100%) rename src/{ => modules}/organ/dto/update-organ.dto.ts (100%) rename src/{ => modules}/organ/entities/organ.entity.ts (83%) rename src/{ => modules}/organ/organ.controller.ts (100%) rename src/{ => modules}/organ/organ.module.ts (100%) rename src/{ => modules}/organ/organ.service.ts (100%) rename src/{ => modules}/organ/repositories/organ.repository.ts (100%) rename src/{ => modules}/reply/dto/create-reply.dto.ts (100%) rename src/{ => modules}/reply/dto/update-reply.dto.ts (100%) rename src/{ => modules}/reply/entities/reply-attachment.entity.ts (86%) rename src/{ => modules}/reply/entities/reply.entity.ts (73%) rename src/{ => modules}/reply/reply.controller.ts (100%) rename src/{ => modules}/reply/reply.module.ts (100%) rename src/{ => modules}/reply/reply.service.ts (100%) rename src/{ => modules}/reply/repositories/reply-attachment.repository.ts (100%) rename src/{ => modules}/reply/repositories/reply.repository.ts (100%) rename src/{ => modules}/users/DTO/create-user-role.dto.ts (100%) rename src/{ => modules}/users/DTO/create-user.dto.ts (100%) rename src/{ => modules}/users/entities/user-role.entity.ts (100%) rename src/{ => modules}/users/entities/user.entity.ts (92%) rename src/{ => modules}/users/enums/user-role.enum.ts (100%) rename src/{ => modules}/users/repositories/user-role.repository.ts (100%) rename src/{ => modules}/users/repositories/user.repository.ts (100%) rename src/{ => modules}/users/users.controller.ts (100%) rename src/{ => modules}/users/users.module.ts (100%) rename src/{ => modules}/users/users.service.ts (100%) rename src/{ => modules}/utils/constants.ts (100%) rename src/{ => modules}/utils/interfaces/ISms.ts (100%) rename src/{ => modules}/utils/providers/sms.service.ts (100%) rename src/{ => modules}/utils/utils.module.ts (100%) diff --git a/src/app.module.ts b/src/app.module.ts index ef756a0..0fcf029 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -2,14 +2,14 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ConfigModule, ConfigService } from '@nestjs/config'; import { validationSchema } from './config/config.validation'; -import { UsersModule } from './users/users.module'; +import { UsersModule } from './modules/users/users.module'; import { databaseConfig } from './config/typeorm.config'; import { HttpModule } from '@nestjs/axios'; -import { AuthModule } from './auth/auth.module'; -import { OrganModule } from './organ/organ.module'; -import { ComplaintModule } from './complaint/complaint.module'; -import { AttachmentModule } from './attachment/attachment.module'; -import { ReplyModule } from './reply/reply.module'; +import { AuthModule } from './modules/auth/auth.module'; +import { OrganModule } from './modules/organ/organ.module'; +import { ComplaintModule } from './modules/complaint/complaint.module'; +import { AttachmentModule } from './modules/attachment/attachment.module'; +import { ReplyModule } from './modules/reply/reply.module'; @Module({ imports: [ diff --git a/src/common/decorators/auth-guard.decorator.ts b/src/common/decorators/auth-guard.decorator.ts index 47df060..adcd01a 100644 --- a/src/common/decorators/auth-guard.decorator.ts +++ b/src/common/decorators/auth-guard.decorator.ts @@ -1,6 +1,6 @@ import { applyDecorators, UseGuards } from "@nestjs/common"; import { ApiBearerAuth } from "@nestjs/swagger"; -import { JwtAuthGuard } from "src/auth/guards/jwt-auth.guard"; +import { JwtAuthGuard } from "src/modules/auth/guards/jwt-auth.guard"; export function AuthGuard() { return applyDecorators( diff --git a/src/common/decorators/user.decorator.ts b/src/common/decorators/user.decorator.ts index 871bc82..c9eb631 100644 --- a/src/common/decorators/user.decorator.ts +++ b/src/common/decorators/user.decorator.ts @@ -1,6 +1,6 @@ import { createParamDecorator, ExecutionContext } from '@nestjs/common'; -import { IRequest } from 'src/auth/interfaces/IRequest'; -import { ITokenPayload } from 'src/auth/interfaces/IToken-payload'; +import { IRequest } from 'src/modules/auth/interfaces/IRequest'; +import { ITokenPayload } from 'src/modules/auth/interfaces/IToken-payload'; export const UserDec = createParamDecorator( (data: keyof ITokenPayload | undefined, ctx: ExecutionContext) => { diff --git a/src/config/sms.config.ts b/src/config/sms.config.ts index c168687..0a4fd52 100644 --- a/src/config/sms.config.ts +++ b/src/config/sms.config.ts @@ -1,7 +1,7 @@ import { FactoryProvider } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; -import { SMS_CONFIG } from "src/utils/constants"; +import { SMS_CONFIG } from "src/modules/utils/constants"; export const smsConfigsProvider: FactoryProvider = { provide: SMS_CONFIG, diff --git a/src/attachment/attachment.controller.ts b/src/modules/attachment/attachment.controller.ts similarity index 100% rename from src/attachment/attachment.controller.ts rename to src/modules/attachment/attachment.controller.ts diff --git a/src/attachment/attachment.module.ts b/src/modules/attachment/attachment.module.ts similarity index 100% rename from src/attachment/attachment.module.ts rename to src/modules/attachment/attachment.module.ts diff --git a/src/attachment/attachment.service.ts b/src/modules/attachment/attachment.service.ts similarity index 100% rename from src/attachment/attachment.service.ts rename to src/modules/attachment/attachment.service.ts diff --git a/src/attachment/dto/create-attachment.dto.ts b/src/modules/attachment/dto/create-attachment.dto.ts similarity index 100% rename from src/attachment/dto/create-attachment.dto.ts rename to src/modules/attachment/dto/create-attachment.dto.ts diff --git a/src/attachment/dto/update-attachment.dto.ts b/src/modules/attachment/dto/update-attachment.dto.ts similarity index 100% rename from src/attachment/dto/update-attachment.dto.ts rename to src/modules/attachment/dto/update-attachment.dto.ts diff --git a/src/attachment/entities/attachment.entity.ts b/src/modules/attachment/entities/attachment.entity.ts similarity index 78% rename from src/attachment/entities/attachment.entity.ts rename to src/modules/attachment/entities/attachment.entity.ts index 5120678..f215658 100644 --- a/src/attachment/entities/attachment.entity.ts +++ b/src/modules/attachment/entities/attachment.entity.ts @@ -1,8 +1,8 @@ import { BaseEntity } from "src/common/entities/base.entity"; import { Column, Entity, OneToOne } from "typeorm"; import { AttachmentType } from "../enums/attachment-type.enum"; -import { ComplaintAttachment } from "src/complaint/entities/complaint-attachment.entity"; -import { ReplyAttachment } from "src/reply/entities/reply-attachment.entity"; +import { ComplaintAttachment } from "src/modules/complaint/entities/complaint-attachment.entity"; +import { ReplyAttachment } from "src/modules/reply/entities/reply-attachment.entity"; @Entity('attachments') export class Attachment extends BaseEntity{ diff --git a/src/attachment/enums/attachment-type.enum.ts b/src/modules/attachment/enums/attachment-type.enum.ts similarity index 100% rename from src/attachment/enums/attachment-type.enum.ts rename to src/modules/attachment/enums/attachment-type.enum.ts diff --git a/src/attachment/repositories/attachment.repository.ts b/src/modules/attachment/repositories/attachment.repository.ts similarity index 100% rename from src/attachment/repositories/attachment.repository.ts rename to src/modules/attachment/repositories/attachment.repository.ts diff --git a/src/auth/DTO/login-credential.dto.ts b/src/modules/auth/DTO/login-credential.dto.ts similarity index 100% rename from src/auth/DTO/login-credential.dto.ts rename to src/modules/auth/DTO/login-credential.dto.ts diff --git a/src/auth/DTO/send-otp.dto.ts b/src/modules/auth/DTO/send-otp.dto.ts similarity index 100% rename from src/auth/DTO/send-otp.dto.ts rename to src/modules/auth/DTO/send-otp.dto.ts diff --git a/src/auth/DTO/verify-otp.dto.ts b/src/modules/auth/DTO/verify-otp.dto.ts similarity index 100% rename from src/auth/DTO/verify-otp.dto.ts rename to src/modules/auth/DTO/verify-otp.dto.ts diff --git a/src/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts similarity index 100% rename from src/auth/auth.controller.ts rename to src/modules/auth/auth.controller.ts diff --git a/src/auth/auth.module.ts b/src/modules/auth/auth.module.ts similarity index 73% rename from src/auth/auth.module.ts rename to src/modules/auth/auth.module.ts index 578e6b7..1e21ec5 100644 --- a/src/auth/auth.module.ts +++ b/src/modules/auth/auth.module.ts @@ -2,14 +2,11 @@ import { Module } from '@nestjs/common'; import { JwtModule } from '@nestjs/jwt'; import { AuthController } from './auth.controller'; import { AuthService } from './auth.service'; -import { UtilsModule } from 'src/utils/utils.module'; +import { UtilsModule } from '../utils/utils.module'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { User } from 'src/users/entities/user.entity'; import { OTP } from './entities/otp.entity'; import { OtpRepository } from './repositories/otp.repository'; -import { UsersModule } from 'src/users/users.module'; -import { ConfigService } from '@nestjs/config'; -import { UserRole } from 'src/users/entities/user-role.entity'; +import { UsersModule } from 'src/modules/users/users.module'; import { PassportModule } from '@nestjs/passport'; import { JwtStrategy } from './strategies/jwt.strategy'; diff --git a/src/auth/auth.service.ts b/src/modules/auth/auth.service.ts similarity index 96% rename from src/auth/auth.service.ts rename to src/modules/auth/auth.service.ts index b687bd0..4509f32 100644 --- a/src/auth/auth.service.ts +++ b/src/modules/auth/auth.service.ts @@ -1,14 +1,14 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import type { ISmsConfigs } from 'src/config/sms.config'; -import { SMS_CONFIG } from 'src/utils/constants'; -import { SmsService } from 'src/utils/providers/sms.service'; +import { SMS_CONFIG } from '../utils/constants'; +import { SmsService } from '../utils/providers/sms.service'; import { OtpRepository } from './repositories/otp.repository'; import { OtpStatus } from './enums/otp-status.enum'; import { VerifyOtpDto } from './DTO/verify-otp.dto'; import { OTPMessages, UserMessages } from 'src/common/enums/messages.enum'; import { LoginCredentialDto } from './DTO/login-credential.dto'; -import { UsersService } from 'src/users/users.service'; +import { UsersService } from 'src/modules/users/users.service'; import * as bcrypt from 'bcrypt'; import { JwtService } from '@nestjs/jwt'; import ms from 'ms'; diff --git a/src/auth/entities/otp.entity.ts b/src/modules/auth/entities/otp.entity.ts similarity index 100% rename from src/auth/entities/otp.entity.ts rename to src/modules/auth/entities/otp.entity.ts diff --git a/src/auth/enums/otp-status.enum.ts b/src/modules/auth/enums/otp-status.enum.ts similarity index 100% rename from src/auth/enums/otp-status.enum.ts rename to src/modules/auth/enums/otp-status.enum.ts diff --git a/src/auth/guards/jwt-auth.guard.ts b/src/modules/auth/guards/jwt-auth.guard.ts similarity index 100% rename from src/auth/guards/jwt-auth.guard.ts rename to src/modules/auth/guards/jwt-auth.guard.ts diff --git a/src/auth/interfaces/IRequest.ts b/src/modules/auth/interfaces/IRequest.ts similarity index 100% rename from src/auth/interfaces/IRequest.ts rename to src/modules/auth/interfaces/IRequest.ts diff --git a/src/auth/interfaces/IToken-payload.ts b/src/modules/auth/interfaces/IToken-payload.ts similarity index 58% rename from src/auth/interfaces/IToken-payload.ts rename to src/modules/auth/interfaces/IToken-payload.ts index 88cc53e..678ac95 100644 --- a/src/auth/interfaces/IToken-payload.ts +++ b/src/modules/auth/interfaces/IToken-payload.ts @@ -1,4 +1,4 @@ -import { RoleType } from "src/users/enums/user-role.enum"; +import { RoleType } from "src/modules/users/enums/user-role.enum"; export interface ITokenPayload { id: string; diff --git a/src/auth/interfaces/IUserIpAndHeader.ts b/src/modules/auth/interfaces/IUserIpAndHeader.ts similarity index 100% rename from src/auth/interfaces/IUserIpAndHeader.ts rename to src/modules/auth/interfaces/IUserIpAndHeader.ts diff --git a/src/auth/repositories/otp.repository.ts b/src/modules/auth/repositories/otp.repository.ts similarity index 100% rename from src/auth/repositories/otp.repository.ts rename to src/modules/auth/repositories/otp.repository.ts diff --git a/src/auth/strategies/jwt.strategy.ts b/src/modules/auth/strategies/jwt.strategy.ts similarity index 93% rename from src/auth/strategies/jwt.strategy.ts rename to src/modules/auth/strategies/jwt.strategy.ts index 6ddf711..2c390df 100644 --- a/src/auth/strategies/jwt.strategy.ts +++ b/src/modules/auth/strategies/jwt.strategy.ts @@ -1,5 +1,4 @@ import { Injectable } from '@nestjs/common'; -import { RoleType } from 'src/users/enums/user-role.enum'; import { PassportStrategy } from '@nestjs/passport'; import { Strategy, ExtractJwt } from 'passport-jwt'; import { ConfigService } from '@nestjs/config'; diff --git a/src/complaint/complaint.controller.ts b/src/modules/complaint/complaint.controller.ts similarity index 100% rename from src/complaint/complaint.controller.ts rename to src/modules/complaint/complaint.controller.ts diff --git a/src/complaint/complaint.module.ts b/src/modules/complaint/complaint.module.ts similarity index 100% rename from src/complaint/complaint.module.ts rename to src/modules/complaint/complaint.module.ts diff --git a/src/complaint/complaint.service.ts b/src/modules/complaint/complaint.service.ts similarity index 100% rename from src/complaint/complaint.service.ts rename to src/modules/complaint/complaint.service.ts diff --git a/src/complaint/dto/create-complaint.dto.ts b/src/modules/complaint/dto/create-complaint.dto.ts similarity index 100% rename from src/complaint/dto/create-complaint.dto.ts rename to src/modules/complaint/dto/create-complaint.dto.ts diff --git a/src/complaint/dto/update-complaint.dto.ts b/src/modules/complaint/dto/update-complaint.dto.ts similarity index 100% rename from src/complaint/dto/update-complaint.dto.ts rename to src/modules/complaint/dto/update-complaint.dto.ts diff --git a/src/complaint/entities/complaint-attachment.entity.ts b/src/modules/complaint/entities/complaint-attachment.entity.ts similarity index 87% rename from src/complaint/entities/complaint-attachment.entity.ts rename to src/modules/complaint/entities/complaint-attachment.entity.ts index 603dfc5..006cce2 100644 --- a/src/complaint/entities/complaint-attachment.entity.ts +++ b/src/modules/complaint/entities/complaint-attachment.entity.ts @@ -1,7 +1,7 @@ import { BaseEntity } from "src/common/entities/base.entity"; import { Entity, JoinColumn, ManyToOne, OneToOne, Unique } from "typeorm"; import { Complaint } from "./complaint.entity"; -import { Attachment } from "src/attachment/entities/attachment.entity"; +import { Attachment } from "src/modules/attachment/entities/attachment.entity"; @Entity('complaint_attachments') @Unique(['attachment']) diff --git a/src/complaint/entities/complaint.entity.ts b/src/modules/complaint/entities/complaint.entity.ts similarity index 85% rename from src/complaint/entities/complaint.entity.ts rename to src/modules/complaint/entities/complaint.entity.ts index 228c3fd..e51d567 100644 --- a/src/complaint/entities/complaint.entity.ts +++ b/src/modules/complaint/entities/complaint.entity.ts @@ -1,10 +1,10 @@ import { Column, Entity, JoinColumn, ManyToOne, OneToMany, OneToOne } from 'typeorm'; import { ComplaintStatus } from '../enums/complaint.enum'; -import { User } from 'src/users/entities/user.entity'; -import { Organ } from 'src/organ/entities/organ.entity'; +import { User } from 'src/modules/users/entities/user.entity'; +import { Organ } from 'src/modules/organ/entities/organ.entity'; import { BaseEntity } from 'src/common/entities/base.entity'; import { ComplaintAttachment } from './complaint-attachment.entity'; -import { Reply } from 'src/reply/entities/reply.entity'; +import { Reply } from 'src/modules/reply/entities/reply.entity'; @Entity('complaints') export class Complaint extends BaseEntity { diff --git a/src/complaint/enums/complaint.enum.ts b/src/modules/complaint/enums/complaint.enum.ts similarity index 100% rename from src/complaint/enums/complaint.enum.ts rename to src/modules/complaint/enums/complaint.enum.ts diff --git a/src/complaint/repositories/complaint.repository.ts b/src/modules/complaint/repositories/complaint.repository.ts similarity index 100% rename from src/complaint/repositories/complaint.repository.ts rename to src/modules/complaint/repositories/complaint.repository.ts diff --git a/src/organ/dto/create-organ.dto.ts b/src/modules/organ/dto/create-organ.dto.ts similarity index 100% rename from src/organ/dto/create-organ.dto.ts rename to src/modules/organ/dto/create-organ.dto.ts diff --git a/src/organ/dto/update-organ.dto.ts b/src/modules/organ/dto/update-organ.dto.ts similarity index 100% rename from src/organ/dto/update-organ.dto.ts rename to src/modules/organ/dto/update-organ.dto.ts diff --git a/src/organ/entities/organ.entity.ts b/src/modules/organ/entities/organ.entity.ts similarity index 83% rename from src/organ/entities/organ.entity.ts rename to src/modules/organ/entities/organ.entity.ts index d8d06f0..6551589 100644 --- a/src/organ/entities/organ.entity.ts +++ b/src/modules/organ/entities/organ.entity.ts @@ -1,5 +1,5 @@ import { BaseEntity } from 'src/common/entities/base.entity'; -import { Complaint } from 'src/complaint/entities/complaint.entity'; +import { Complaint } from 'src/modules/complaint/entities/complaint.entity'; import { Column, Entity, OneToMany } from 'typeorm'; @Entity('organs') diff --git a/src/organ/organ.controller.ts b/src/modules/organ/organ.controller.ts similarity index 100% rename from src/organ/organ.controller.ts rename to src/modules/organ/organ.controller.ts diff --git a/src/organ/organ.module.ts b/src/modules/organ/organ.module.ts similarity index 100% rename from src/organ/organ.module.ts rename to src/modules/organ/organ.module.ts diff --git a/src/organ/organ.service.ts b/src/modules/organ/organ.service.ts similarity index 100% rename from src/organ/organ.service.ts rename to src/modules/organ/organ.service.ts diff --git a/src/organ/repositories/organ.repository.ts b/src/modules/organ/repositories/organ.repository.ts similarity index 100% rename from src/organ/repositories/organ.repository.ts rename to src/modules/organ/repositories/organ.repository.ts diff --git a/src/reply/dto/create-reply.dto.ts b/src/modules/reply/dto/create-reply.dto.ts similarity index 100% rename from src/reply/dto/create-reply.dto.ts rename to src/modules/reply/dto/create-reply.dto.ts diff --git a/src/reply/dto/update-reply.dto.ts b/src/modules/reply/dto/update-reply.dto.ts similarity index 100% rename from src/reply/dto/update-reply.dto.ts rename to src/modules/reply/dto/update-reply.dto.ts diff --git a/src/reply/entities/reply-attachment.entity.ts b/src/modules/reply/entities/reply-attachment.entity.ts similarity index 86% rename from src/reply/entities/reply-attachment.entity.ts rename to src/modules/reply/entities/reply-attachment.entity.ts index 43a9b91..bb0a1a2 100644 --- a/src/reply/entities/reply-attachment.entity.ts +++ b/src/modules/reply/entities/reply-attachment.entity.ts @@ -1,7 +1,7 @@ import { BaseEntity } from "src/common/entities/base.entity"; import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from "typeorm"; import { Reply } from "./reply.entity"; -import { Attachment } from "src/attachment/entities/attachment.entity"; +import { Attachment } from "src/modules/attachment/entities/attachment.entity"; @Entity('reply_attachments') export class ReplyAttachment extends BaseEntity { diff --git a/src/reply/entities/reply.entity.ts b/src/modules/reply/entities/reply.entity.ts similarity index 73% rename from src/reply/entities/reply.entity.ts rename to src/modules/reply/entities/reply.entity.ts index 9c362ce..2192238 100644 --- a/src/reply/entities/reply.entity.ts +++ b/src/modules/reply/entities/reply.entity.ts @@ -1,7 +1,7 @@ -import { Attachment } from "src/attachment/entities/attachment.entity"; +import { Attachment } from "src/modules/attachment/entities/attachment.entity"; import { BaseEntity } from "src/common/entities/base.entity"; -import { Complaint } from "src/complaint/entities/complaint.entity"; -import { User } from "src/users/entities/user.entity"; +import { Complaint } from "src/modules/complaint/entities/complaint.entity"; +import { User } from "src/modules/users/entities/user.entity"; import { Column, Entity, ManyToOne, OneToMany } from "typeorm"; import { ReplyAttachment } from "./reply-attachment.entity"; diff --git a/src/reply/reply.controller.ts b/src/modules/reply/reply.controller.ts similarity index 100% rename from src/reply/reply.controller.ts rename to src/modules/reply/reply.controller.ts diff --git a/src/reply/reply.module.ts b/src/modules/reply/reply.module.ts similarity index 100% rename from src/reply/reply.module.ts rename to src/modules/reply/reply.module.ts diff --git a/src/reply/reply.service.ts b/src/modules/reply/reply.service.ts similarity index 100% rename from src/reply/reply.service.ts rename to src/modules/reply/reply.service.ts diff --git a/src/reply/repositories/reply-attachment.repository.ts b/src/modules/reply/repositories/reply-attachment.repository.ts similarity index 100% rename from src/reply/repositories/reply-attachment.repository.ts rename to src/modules/reply/repositories/reply-attachment.repository.ts diff --git a/src/reply/repositories/reply.repository.ts b/src/modules/reply/repositories/reply.repository.ts similarity index 100% rename from src/reply/repositories/reply.repository.ts rename to src/modules/reply/repositories/reply.repository.ts diff --git a/src/users/DTO/create-user-role.dto.ts b/src/modules/users/DTO/create-user-role.dto.ts similarity index 100% rename from src/users/DTO/create-user-role.dto.ts rename to src/modules/users/DTO/create-user-role.dto.ts diff --git a/src/users/DTO/create-user.dto.ts b/src/modules/users/DTO/create-user.dto.ts similarity index 100% rename from src/users/DTO/create-user.dto.ts rename to src/modules/users/DTO/create-user.dto.ts diff --git a/src/users/entities/user-role.entity.ts b/src/modules/users/entities/user-role.entity.ts similarity index 100% rename from src/users/entities/user-role.entity.ts rename to src/modules/users/entities/user-role.entity.ts diff --git a/src/users/entities/user.entity.ts b/src/modules/users/entities/user.entity.ts similarity index 92% rename from src/users/entities/user.entity.ts rename to src/modules/users/entities/user.entity.ts index e3fec40..67d48f4 100644 --- a/src/users/entities/user.entity.ts +++ b/src/modules/users/entities/user.entity.ts @@ -2,7 +2,7 @@ import { Entity, Column, ManyToMany, JoinTable, OneToMany } from 'typeorm'; import { BaseEntity } from 'src/common/entities/base.entity'; import { Exclude } from 'class-transformer'; import { UserRole } from './user-role.entity'; -import { Complaint } from 'src/complaint/entities/complaint.entity'; +import { Complaint } from 'src/modules/complaint/entities/complaint.entity'; @Entity('users') export class User extends BaseEntity { diff --git a/src/users/enums/user-role.enum.ts b/src/modules/users/enums/user-role.enum.ts similarity index 100% rename from src/users/enums/user-role.enum.ts rename to src/modules/users/enums/user-role.enum.ts diff --git a/src/users/repositories/user-role.repository.ts b/src/modules/users/repositories/user-role.repository.ts similarity index 100% rename from src/users/repositories/user-role.repository.ts rename to src/modules/users/repositories/user-role.repository.ts diff --git a/src/users/repositories/user.repository.ts b/src/modules/users/repositories/user.repository.ts similarity index 100% rename from src/users/repositories/user.repository.ts rename to src/modules/users/repositories/user.repository.ts diff --git a/src/users/users.controller.ts b/src/modules/users/users.controller.ts similarity index 100% rename from src/users/users.controller.ts rename to src/modules/users/users.controller.ts diff --git a/src/users/users.module.ts b/src/modules/users/users.module.ts similarity index 100% rename from src/users/users.module.ts rename to src/modules/users/users.module.ts diff --git a/src/users/users.service.ts b/src/modules/users/users.service.ts similarity index 100% rename from src/users/users.service.ts rename to src/modules/users/users.service.ts diff --git a/src/utils/constants.ts b/src/modules/utils/constants.ts similarity index 100% rename from src/utils/constants.ts rename to src/modules/utils/constants.ts diff --git a/src/utils/interfaces/ISms.ts b/src/modules/utils/interfaces/ISms.ts similarity index 100% rename from src/utils/interfaces/ISms.ts rename to src/modules/utils/interfaces/ISms.ts diff --git a/src/utils/providers/sms.service.ts b/src/modules/utils/providers/sms.service.ts similarity index 100% rename from src/utils/providers/sms.service.ts rename to src/modules/utils/providers/sms.service.ts diff --git a/src/utils/utils.module.ts b/src/modules/utils/utils.module.ts similarity index 100% rename from src/utils/utils.module.ts rename to src/modules/utils/utils.module.ts