feat/refactor modules

src/comments/comments.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { CommentsController } from './controller/comments/comments.controller';
-import { CommentsService } from './services/comments/comments.service';
+import { CommentsController } from './controller/comments.controller';
+import { CommentsService } from './services/comments.service';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/comments/controller/comments/comments.controller.spec.ts → src/comments/controller/comments.controller.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { CommentsController } from './comments.controller';
-import { CommentsService } from 'src/comments/services/comments/comments.service';
+import { CommentsController } from '../comments.controller';
+import { CommentsService } from 'src/comments/services/comments.service';
 
 describe('CommentsController', () => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars

src/comments/controller/comments/comments.controller.ts → src/comments/controller/comments.controller.ts

@@ -19,7 +19,7 @@ import {
 
 import { Response } from 'express';
 import { CommentDTO } from 'src/comments/dto/comments.dto';
-import { CommentsService } from 'src/comments/services/comments/comments.service';
+import { CommentsService } from 'src/comments/services/comments.service';
 import { i18n } from 'src/i18n';
 
 @ApiTags('Comments')

src/comments/services/comments/comments.service.spec.ts → src/comments/services/comments.service.spec.ts

@@ -1,8 +1,8 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { CommentsService } from './comments.service';
-import { UserService } from 'src/user/services/user/user.service';
+import { CommentsService } from '../comments.service';
+import { UserService } from 'src/user/services/user.service';
 import { PrismaService } from 'src/database/prisma.service';
-import { HashService } from 'src/hash/service/hash/hash.service';
+import { HashService } from 'src/hash/service/hash.service';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
 import { LoggerService } from 'src/logger/logger.service';
 import { Comment } from 'src/comments/types/comments';

src/comments/services/comments/comments.service.ts → src/comments/services/comments.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { Comment } from 'src/comments/types/comments';
 import { PrismaService } from 'src/database/prisma.service';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
 import { Comments } from '@prisma/client';
 import { LoggerService } from 'src/logger/logger.service';

src/decisions/controller/decisions/decisions.controller.spec.ts → src/decisions/controller/decisions.controller.spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { DecisionsController } from './decisions.controller';
+import { DecisionsController } from '../decisions.controller';
 
 describe('DecisionsController', () => {
   let controller: DecisionsController;

src/decisions/controller/decisions/decisions.controller.ts → src/decisions/controller/decisions.controller.ts

@@ -16,7 +16,7 @@ import {
 } from '@nestjs/swagger';
 import { Response } from 'express';
 import { DecisionDTO } from 'src/decisions/dto/decisions.dto';
-import { DecisionsService } from 'src/decisions/services/decisions/decisions.service';
+import { DecisionsService } from 'src/decisions/services/decisions.service';
 import { i18n } from 'src/i18n';
 
 @ApiTags('Decisions')

src/decisions/decisions.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { DecisionsController } from './controller/decisions/decisions.controller';
-import { DecisionsService } from './services/decisions/decisions.service';
+import { DecisionsController } from './controller/decisions.controller';
+import { DecisionsService } from './services/decisions.service';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/decisions/services/decisions/decisions.service.spec.ts → src/decisions/services/decisions.service.spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { DecisionsService } from './decisions.service';
+import { DecisionsService } from '../decisions.service';
 
 describe('DecisionsService', () => {
   let service: DecisionsService;

src/decisions/services/decisions/decisions.service.ts → src/decisions/services/decisions.service.ts

@@ -2,7 +2,7 @@ import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from 'src/database/prisma.service';
 import { Decision } from 'src/decisions/types/decision';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { Decisions } from '@prisma/client';
 import { LoggerService } from 'src/logger/logger.service';
 import { i18n } from 'src/i18n';

src/follow-project/controller/follow-project/follow-project.controller.ts → src/follow-project/controller/follow-project.controller.ts

@@ -7,7 +7,7 @@ import {
   Post,
   Res,
 } from '@nestjs/common';
-import { FollowProjectService } from 'src/follow-project/service/follow-project/follow-project.service';
+import { FollowProjectService } from 'src/follow-project/service/follow-project.service';
 import { Response } from 'express';
 import {
   ApiBadRequestResponse,

src/follow-project/follow-project.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { FollowProjectService } from './service/follow-project/follow-project.service';
-import { FollowProjectController } from './controller/follow-project/follow-project.controller';
+import { FollowProjectService } from './service/follow-project.service';
+import { FollowProjectController } from './controller/follow-project.controller';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/follow-project/service/follow-project/follow-project.service.spec.ts → src/follow-project/service/follow-project.service.spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { FollowProjectService } from './follow-project.service';
+import { FollowProjectService } from '../follow-project.service';
 
 describe('FollowProjectService', () => {
   let service: FollowProjectService;

src/follow-project/service/follow-project/follow-project.service.ts → src/follow-project/service/follow-project.service.ts

@@ -4,7 +4,7 @@ import { Data } from 'src/follow-project/types/follow';
 import { i18n } from 'src/i18n';
 import { LoggerService } from 'src/logger/logger.service';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 
 @Injectable()
 export class FollowProjectService {

src/goals/controller/goals/goals.controller.ts → src/goals/controller/goals.controller.ts

@@ -8,7 +8,7 @@ import {
   Post,
   Put,
 } from '@nestjs/common';
-import { GoalsService } from 'src/goals/services/goals/goals.service';
+import { GoalsService } from 'src/goals/services/goals.service';
 import { Response } from 'express';
 import { GoalDTO } from 'src/goals/dto/goal.dto';
 import {

src/goals/goals.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { GoalsController } from './controller/goals/goals.controller';
-import { GoalsService } from './services/goals/goals.service';
+import { GoalsController } from './controller/goals.controller';
+import { GoalsService } from './services/goals.service';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/goals/services/goals/goals.service.ts → src/goals/services/goals.service.ts

@@ -1,8 +1,8 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from 'src/database/prisma.service';
-import { TGoals } from 'src/goals/types/gaols';
+import { TGoals } from 'src/goals/types/goals';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { Goals } from '@prisma/client';
 import { LoggerService } from 'src/logger/logger.service';
 import { i18n } from 'src/i18n';

src/hash/hash.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { HashService } from './service/hash/hash.service';
+import { HashService } from './service/hash.service';
 
 @Module({
   providers: [HashService],

src/profile/controller/profile/profile.controller.ts → src/profile/controller/profile.controller.ts

@@ -8,7 +8,7 @@ import {
 import { Response } from 'express';
 import { i18n } from 'src/i18n';
 import { CreateProfileDTO } from 'src/profile/dto/create-profile.dto';
-import { ProfileService } from 'src/profile/services/profile/profile.service';
+import { ProfileService } from 'src/profile/services/profile.service';
 
 @ApiTags('Profile')
 @Controller('profile')

src/profile/profile.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { ProfileController } from './controller/profile/profile.controller';
-import { ProfileService } from './services/profile/profile.service';
+import { ProfileController } from './controller/profile.controller';
+import { ProfileService } from './services/profile.service';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/profile/services/profile/profile.service.ts → src/profile/services/profile.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from 'src/database/prisma.service';
 import { TProfile } from 'src/profile/types/profile';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { Profile } from '@prisma/client';
 import { LoggerService } from 'src/logger/logger.service';
 import { i18n } from 'src/i18n';

src/project-idea/services/project-idea.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from 'src/database/prisma.service';
 import { ProjectIdea } from '../types/projectIdea';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { LoggerService } from 'src/logger/logger.service';
 import { i18n } from 'src/i18n';
 

src/projects/projects.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
-import { ProjectsController } from './controller/projects/projects.controller';
-import { ProjectsService } from './services/projects/projects.service';
+import { ProjectsController } from './controller/projects.controller';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
+import { ProjectsService } from './services/projects.service';
 
 @Module({
   imports: [SharedServicesModule],

src/projects/services/projects/projects.service.ts → src/projects/services/projects.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from 'src/database/prisma.service';
 import { Project } from 'src/projects/types';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { Projects } from '@prisma/client';
 import { LoggerService } from 'src/logger/logger.service';
 import { i18n } from '../../../i18n/index';

src/questions/controller/questions/questions.controller.ts → src/questions/controller/questions.controller.ts

@@ -18,7 +18,7 @@ import { Response } from 'express';
 import { i18n } from '../../../i18n';
 
 import { QuestionsDTO } from 'src/questions/dto/questions.dto';
-import { QuestionsService } from 'src/questions/services/questions/questions.service';
+import { QuestionsService } from 'src/questions/services/questions.service';
 
 @ApiTags('Questions')
 @Controller('questions')

src/questions/questions.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { QuestionsController } from './controller/questions/questions.controller';
-import { QuestionsService } from './services/questions/questions.service';
+import { QuestionsService } from './services/questions.service';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/questions/services/questions/questions.service.ts → src/questions/services/questions.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from 'src/database/prisma.service';
 import { TQuestion } from 'src/questions/types/question';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { Questions } from '@prisma/client';
 import { LoggerService } from 'src/logger/logger.service';
 import { i18n } from 'src/i18n';

src/send-email/controller/email/email.controller.ts → src/send-email/controller/email.controller.ts

@@ -6,7 +6,7 @@ import {
   ApiTags,
 } from '@nestjs/swagger';
 import { Response } from 'express';
-import { SendEmailService } from 'src/send-email/service/send-email/send-email.service';
+import { SendEmailService } from 'src/send-email/service/send-email.service';
 
 @ApiTags('confirm-account')
 @Controller('email')

src/send-email/email.module.ts

@@ -1,7 +1,7 @@
 import { Global, Module } from '@nestjs/common';
-import { SendEmailService } from './service/send-email/send-email.service';
+import { SendEmailService } from './service/send-email.service';
 import { MailerModule } from '@nestjs-modules/mailer';
-import { EmailController } from './controller/email/email.controller';
+import { EmailController } from './controller/email.controller';
 import { JwtService } from '@nestjs/jwt';
 import { PrismaService } from 'src/database/prisma.service';
 

src/shared/shared-services.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
-import { HashService } from 'src/hash/service/hash/hash.service';
+import { HashService } from 'src/hash/service/hash.service';
 import { AuthService } from 'src/jwt/services/jwt.service';
 
 @Module({

src/task-list-project/controller/task-list-project/task-list-project.controller.ts → src/task-list-project/controller/task-list-project.controller.ts

@@ -8,7 +8,7 @@ import {
   Put,
   Res,
 } from '@nestjs/common';
-import { TaskListProjectService } from 'src/task-list-project/service/task-list-project/task-list-project.service';
+import { TaskListProjectService } from 'src/task-list-project/service/task-list-project.service';
 import { Response } from 'express';
 import { i18n } from 'src/i18n';
 import {

src/task-list-project/service/task-list-project/task-list-project.service.ts → src/task-list-project/service/task-list-project.service.ts

@@ -4,7 +4,7 @@ import { i18n } from 'src/i18n';
 import { LoggerService } from 'src/logger/logger.service';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
 import { TaskListProject } from 'src/task-list-project/types';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 
 @Injectable()
 export class TaskListProjectService {

src/task-list-project/task-list-project.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { TaskListProjectController } from './controller/task-list-project/task-list-project.controller';
-import { TaskListProjectService } from './service/task-list-project/task-list-project.service';
+import { TaskListProjectController } from './controller/task-list-project.controller';
+import { TaskListProjectService } from './service/task-list-project.service';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/team/controller/team/team.controller.ts → src/team/controller/team.controller.ts

@@ -12,7 +12,7 @@ import { ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
 import { i18n } from 'src/i18n';
 import { TeamDTO } from 'src/team/dto/team.dto';
-import { TeamService } from 'src/team/services/team/team.service';
+import { TeamService } from 'src/team/services/team.service';
 
 @ApiTags('Team')
 @Controller('team')

src/team/services/team/team.service.ts → src/team/services/team.service.ts

@@ -4,7 +4,7 @@ import { PrismaService } from 'src/database/prisma.service';
 import { i18n } from 'src/i18n';
 import { LoggerService } from 'src/logger/logger.service';
 import { TTeam } from 'src/team/types/team';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 
 @Injectable()
 export class TeamService {

src/team/team.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { TeamController } from './controller/team/team.controller';
-import { TeamService } from './services/team/team.service';
+import { TeamController } from './controller/team.controller';
+import { TeamService } from './services/team.service';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/updates/controller/updates/updates.controller.ts → src/updates/controller/updates.controller.ts

@@ -17,7 +17,7 @@ import {
 import { Response } from 'express';
 import { i18n } from 'src/i18n';
 import { UpdateDTO } from 'src/updates/dto/update.dto';
-import { UpdatesService } from 'src/updates/services/updates/updates.service';
+import { UpdatesService } from 'src/updates/services/updates.service';
 
 @ApiTags('Updates')
 @Controller('updates')

src/updates/services/updates/updates.service.ts → src/updates/services/updates.service.ts

@@ -2,7 +2,7 @@ import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from 'src/database/prisma.service';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
 import { TUpdate } from 'src/updates/types/updates';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 import { Updates } from '@prisma/client';
 import { LoggerService } from 'src/logger/logger.service';
 import { i18n } from 'src/i18n';

src/updates/updates.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { UpdatesController } from './controller/updates/updates.controller';
-import { UpdatesService } from './services/updates/updates.service';
+import { UpdatesController } from './controller/updates.controller';
+import { UpdatesService } from './services/updates.service';
 import { SharedServicesModule } from 'src/shared/shared-services.module';
 
 @Module({

src/user/controller/user/user.controller.ts → src/user/controller/user.controller.ts

@@ -17,7 +17,7 @@ import {
 import { Response } from 'express';
 import { i18n } from 'src/i18n';
 import { UserDto } from 'src/user/dto/user.dto';
-import { UserService } from 'src/user/services/user/user.service';
+import { UserService } from 'src/user/services/user.service';
 
 @ApiTags('User')
 @Controller('/user')

src/user/services/user/user.service.ts → src/user/services/user.service.ts

@@ -6,8 +6,8 @@ import {
 import { PrismaService } from 'src/database/prisma.service';
 import { TUser } from 'src/user/ultils/types';
 import { User } from '@prisma/client';
-import { SendEmailService } from 'src/send-email/service/send-email/send-email.service';
-import { HashService } from 'src/hash/service/hash/hash.service';
+import { SendEmailService } from 'src/send-email/service/send-email.service';
+import { HashService } from 'src/hash/service/hash.service';
 import { LoggerService } from 'src/logger/logger.service';
 
 import { i18n } from 'src/i18n';

src/user/user.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { UserController } from './controller/user/user.controller';
-import { UserService } from './services/user/user.service';
+import { UserController } from './controller/user.controller';
+import { UserService } from './services/user.service';
 import { JwtModule } from '@nestjs/jwt';
 import { SharedServicesModule } from 'src/shared/shared-services.module';