Merge pull request #129 from odavibatista/merge/main/refactor/project-architecture

`[MAIN][REFACTOR]` - Atualização da arquitetura do projeto

Author: odavibatista

package-lock.json

@@ -52,6 +52,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@faker-js/faker": "^8.4.1",
     "@nestjs/cli": "^10.0.0",
     "@nestjs/schematics": "^10.0.0",
     "@nestjs/testing": "^10.0.0",

package.json

@@ -1,11 +1,11 @@
 import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import { DatabaseModule } from '../database/database.module';
-import { UserModule } from '../modules/user/user.module';
-import { UserScoreModule } from '../modules/user-score/user-score.module';
-import { CourseModule } from '../modules/course/course.module';
-import { UserActivitiesAnsweredModule } from '../modules/user-activities-answered/user-activities-answered.module';
-import { UserCoursesConcludedModule } from '../modules/user-courses-concluded/user-courses-concluded.module';
-import { ActivityModule } from '../modules/activity/activity.module';
+import { UserModule } from '../modules/user/infra/modules/user.module';
+import { UserScoreModule } from '../modules/user-score/infra/modules/user-score.module';
+import { CourseModule } from '../modules/course/infra/modules/course.module';
+import { UserActivitiesAnsweredModule } from '../modules/user-activities-answered/infra/modules/user-activities-answered.module';
+import { UserCoursesConcludedModule } from '../modules/user-courses-concluded/infra/modules/user-courses-concluded.module';
+import { ActivityModule } from '../modules/activity/infra/modules/activity.module';
 
 @Module({
   imports: [

src/app/app.module.ts

@@ -1,9 +1,9 @@
 import { DataSource } from 'typeorm';
 import { Seeder, SeederFactoryManager, runSeeder } from 'typeorm-extension';
-import CourseSeeder from './course/seeders/course.seeder';
-import ActivitySeeder from './activity/seeders/activity.seeder';
-import UserSeeder from './user/seeders/user.seeder';
-import UserScoreSeeder from './user-score/seeders/user-score.seeder';
+import CourseSeeder from './course/infra/db/seeders/course.seeder';
+import ActivitySeeder from './activity/infra/db/seeders/activity.seeder';
+import UserSeeder from './user/infra/db/seeders/user.seeder';
+import UserScoreSeeder from './user-score/infra/db/seeders/user-score.seeder';
 
 export class MainSeeder implements Seeder {
   async run(

src/modules/Main.seeder.ts

@@ -0,0 +1,21 @@
+import { FindOptionsOrder } from "typeorm";
+import { Activity } from "../../../infra/db/entity/activity.entity";
+import { FindActivitiesCollectionResponseDTO } from "../requests/FindActivitiesCollection.request.dto";
+
+export interface ActivityRepositoryInterface {
+    findById(id: number): Promise<Activity | null>;
+
+    findByCourseId(
+        course_id: number,
+        order?: FindOptionsOrder<Activity>,
+    ): Promise<Activity[]>;
+    
+    countByCourseId(course_id: number): Promise<number>;
+    
+    softDeleteById(id: number): Promise<true>;
+    
+    bringActivitiesCollection(
+        activity_ids: number[],
+        order?: FindOptionsOrder<Activity>,
+    ): Promise<FindActivitiesCollectionResponseDTO>;
+}

src/modules/activity/domain/errors/ActivityNotFound.exception.ts renamed to src/modules/activity/domain/dtos/errors/ActivityNotFound.exception.ts

@@ -1,5 +1,5 @@
-import { Course } from '../../../modules/course/entity/course.entity';
-import { User } from '../../../modules/user/entity/user.entity';
+import { Course } from '../../../../course/infra/db/entity/course.entity';
+import { User } from '../../../../user/infra/db/entity/user.entity';
 import {
   Column,
   CreateDateColumn,

src/modules/activity/domain/dtos/repositories/activity.repository.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { DataSource } from 'typeorm';
 import { ActivityRepository } from './activity.repository';
-import { Activity } from '../entity/activity.entity';
+import { Activity } from '../infra/db/entity/activity.entity';
 
 describe('Activity Repository Test Suites', () => {
     let activityRepository: ActivityRepository;

src/modules/activity/domain/requests/CreateActivity.request.dto.ts renamed to src/modules/activity/domain/dtos/requests/CreateActivity.request.dto.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { DataSource, FindOptionsOrder, In, Repository } from 'typeorm';
 import { Activity } from '../entity/activity.entity';
-import { FindActivitiesCollectionResponseDTO } from '../domain/requests/FindActivitiesCollection.request.dto';
+import { FindActivitiesCollectionResponseDTO } from '../../../domain/dtos/requests/FindActivitiesCollection.request.dto';
 
 @Injectable()
 export class ActivityRepository extends Repository<Activity> {

src/modules/activity/domain/requests/EditActivity.request.dto.ts renamed to src/modules/activity/domain/dtos/requests/EditActivity.request.dto.ts

@@ -10,24 +10,24 @@ import {
   Req,
   Res,
 } from '@nestjs/common';
-import { ActivityService } from '../services/activity.service';
+import { ActivityService } from '../../services/activity.service';
 import { ApiBearerAuth, ApiResponse, ApiTags } from '@nestjs/swagger';
 import {
   CreateActivityRequestDTO,
   CreateActivityResponseDTO,
-} from '../domain/requests/CreateActivity.request.dto';
-import { NotAuthenticatedException } from '../../../shared/domain/errors/NotAuthenticated.exception';
-import { CourseNotFoundException } from '../../course/domain/errors/CourseNotFound.exception';
-import { CommonException } from '../../../shared/domain/errors/Common.exception';
+} from '../../../domain/dtos/requests/CreateActivity.request.dto';
+import { NotAuthenticatedException } from '../../../../../shared/domain/errors/NotAuthenticated.exception';
+import { CourseNotFoundException } from '../../../../course/domain/dtos/errors/CourseNotFound.exception';
+import { CommonException } from '../../../../../shared/domain/errors/Common.exception';
 import { Request, Response } from 'express';
-import { AllExceptionsFilterDTO } from '../../../shared/domain/dtos/errors/AllException.filter.dto';
-import { NoPermisionException } from '../../../shared/domain/errors/NoPermission.exception';
+import { AllExceptionsFilterDTO } from '../../../../../shared/domain/dtos/errors/AllException.filter.dto';
+import { NoPermisionException } from '../../../../../shared/domain/errors/NoPermission.exception';
 import {
   EditActivityRequestDTO,
   EditActivityResponseDTO,
-} from '../domain/requests/EditActivity.request.dto';
-import { ActivityNotFoundException } from '../domain/errors/ActivityNotFound.exception';
-import { GetActivityResponseDTO } from '../domain/requests/GetActivity.request.dto';
+} from '../../../domain/dtos/requests/EditActivity.request.dto';
+import { ActivityNotFoundException } from '../../../domain/dtos/errors/ActivityNotFound.exception';
+import { GetActivityResponseDTO } from '../../../domain/dtos/requests/GetActivity.request.dto';
 
 @Controller('activity')
 @ApiTags('Atividades do Curso')

src/modules/activity/domain/requests/FindActivitiesCollection.request.dto.ts renamed to src/modules/activity/domain/dtos/requests/FindActivitiesCollection.request.dto.ts

@@ -4,16 +4,16 @@ import {
   NestModule,
   RequestMethod,
 } from '@nestjs/common';
-import { ActivityService } from './services/activity.service';
-import { ActivityController } from './controller/activity.controller';
-import { DatabaseModule } from '../../database/database.module';
+import { ActivityService } from '../services/activity.service';
+import { ActivityController } from '../http/controllers/activity.controller';
+import { DatabaseModule } from '../../../../database/database.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { Course } from '../course/entity/course.entity';
-import { User } from '../user/entity/user.entity';
-import { ActivityRepository } from './repository/activity.repository';
-import { CourseRepository } from '../course/repository/course.repository';
-import { AuthenticationMiddleware } from '../user/middlewares/auth.middleware';
-import { JWTProvider } from '../user/providers/jwt.provider';
+import { Course } from '../../../course/infra/db/entity/course.entity';
+import { User } from '../../../user/infra/db/entity/user.entity';
+import { ActivityRepository } from '../db/repositories/activity.repository';
+import { CourseRepository } from '../../../course/infra/db/repositories/course.repository';
+import { AuthenticationMiddleware } from '../../../user/infra/http/middlewares/auth.middleware';
+import { JWTProvider } from '../../../user/infra/providers/jwt.provider';
 
 @Module({
   imports: [DatabaseModule, TypeOrmModule.forFeature([User, Course])],

src/modules/activity/domain/requests/GetActivity.request.dto.ts renamed to src/modules/activity/domain/dtos/requests/GetActivity.request.dto.ts

@@ -1,21 +1,21 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ActivityService } from './activity.service';
-import { DatabaseModule } from '../../../database/database.module';
+import { DatabaseModule } from '../../../../database/database.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { Activity } from '../entity/activity.entity';
-import { UserCourseConcluded } from '../../user-courses-concluded/entity/user-courses-concluded.entity';
+import { Activity } from '../db/entity/activity.entity';
+import { UserCourseConcluded } from '../../../user-courses-concluded/entity/user-courses-concluded.entity';
 import { User } from '../../user/entity/user.entity';
-import { CourseService } from '../../course/services/course.service';
-import { CourseRepository } from '../../course/repository/course.repository';
-import { ActivityRepository } from '../repository/activity.repository';
-import { UserCourseConcludedRepository } from '../../user-courses-concluded/repository/user-courses-concluded.repository';
-import { UserActivityAnsweredRepository } from '../../user-activities-answered/repository/user-activities-answered.repository';
+import { CourseService } from '../../../course/infra/services/course.service';
+import { CourseRepository } from '../../course/repositories/course.repository';
+import { ActivityRepository } from '../repositories/activity.repository';
+import { UserCourseConcludedRepository } from '../../../user-courses-concluded/repositories/user-courses-concluded.repository';
+import { UserActivityAnsweredRepository } from '../../../user-activities-answered/repositories/user-activities-answered.repository';
 import { JWTProvider } from '../../user/providers/jwt.provider';
-import { CourseNotFoundException } from '../../course/domain/errors/CourseNotFound.exception';
-import { UnprocessableDataException } from '../../../shared/domain/errors/UnprocessableData.exception';
-import { ActivityNotFoundException } from '../domain/errors/ActivityNotFound.exception';
-import { UserRepository } from '../../user/repository/user.repository';
-import { TestHelper } from '../../../../test/helpers/dbInstanceHelper';
+import { CourseNotFoundException } from '../../../course/domain/dtos/errors/CourseNotFound.exception';
+import { UnprocessableDataException } from '../../../../shared/domain/errors/UnprocessableData.exception';
+import { ActivityNotFoundException } from '../../domain/dtos/errors/ActivityNotFound.exception';
+import { UserRepository } from '../../user/repositories/user.repository';
+import { TestHelper } from '../../../../../test/helpers/dbInstanceHelper';
 
 describe('Activity Service Tests Suite', () => {
   let activityService: ActivityService;

src/modules/activity/dto/activity.dto.spec.ts

@@ -1,18 +1,18 @@
 import { Injectable } from '@nestjs/common';
-import { ActivityRepository } from '../repository/activity.repository';
-import { Activity } from '../entity/activity.entity';
-import { CourseNotFoundException } from '../../course/domain/errors/CourseNotFound.exception';
-import { CourseRepository } from '../../course/repository/course.repository';
+import { ActivityRepository } from '../db/repositories/activity.repository';
+import { Activity } from '../db/entity/activity.entity';
+import { CourseNotFoundException } from '../../../course/domain/dtos/errors/CourseNotFound.exception';
+import { CourseRepository } from '../../../course/infra/db/repositories/course.repository';
 import {
   CreateActivityRequestDTO,
   CreateActivityResponseDTO,
-} from '../domain/requests/CreateActivity.request.dto';
+} from '../../domain/dtos/requests/CreateActivity.request.dto';
 import {
   EditActivityRequestDTO,
   EditActivityResponseDTO,
-} from '../domain/requests/EditActivity.request.dto';
-import { ActivityNotFoundException } from '../domain/errors/ActivityNotFound.exception';
-import { UnprocessableDataException } from '../../../shared/domain/errors/UnprocessableData.exception';
+} from '../../domain/dtos/requests/EditActivity.request.dto';
+import { ActivityNotFoundException } from '../../domain/dtos/errors/ActivityNotFound.exception';
+import { UnprocessableDataException } from '../../../../shared/domain/errors/UnprocessableData.exception';
 
 @Injectable()
 export class ActivityService {

src/modules/activity/dto/activity.dto.ts

@@ -0,0 +1,18 @@
+import { FindOptionsOrder } from "typeorm";
+import { Course } from "../../../infra/db/entity/course.entity";
+import { FindMultipleCoursesResponseDTO } from "../requests/FindMultipleCourses.request.dto";
+
+export interface CourseRepositoryInterface {
+    findById(id: number): Promise<Course | null>;
+    
+    findByName(course_name: string, id?: number): Promise<Course | null>;
+    
+    countById(id: number): Promise<number>;
+    
+    softDeleteById(id: number): Promise<true>;
+    
+    bringCoursesCollection(
+        course_ids: number[],
+        order?: FindOptionsOrder<Course>,
+    ): Promise<FindMultipleCoursesResponseDTO>;
+}

src/modules/activity/entity/activity.entity.spec.ts renamed to src/modules/activity/infra/db/entity/activity.entity.spec.ts

@@ -1,4 +1,4 @@
-import { User } from '../../../modules/user/entity/user.entity';
+import { User } from "../../../../user/infra/db/entity/user.entity";
 import {
   Column,
   CreateDateColumn,

src/modules/activity/entity/activity.entity.ts renamed to src/modules/activity/infra/db/entity/activity.entity.ts

@@ -1,10 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { DataSource, FindOptionsOrder, In, Repository } from 'typeorm';
 import { Course } from '../entity/course.entity';
-import { FindMultipleCoursesResponseDTO } from '../domain/requests/FindMultipleCourses.request.dto';
+import { FindMultipleCoursesResponseDTO } from '../../../domain/dtos/requests/FindMultipleCourses.request.dto';
+import { CourseRepositoryInterface } from '../../../domain/dtos/repositories/course.repository';
 
 @Injectable()
-export class CourseRepository extends Repository<Course> {
+export class CourseRepository extends Repository<Course> implements CourseRepositoryInterface {
   constructor(private dataSource: DataSource) {
     super(Course, dataSource.createEntityManager());
   }

src/modules/activity/repository/activity.repository.spec.ts renamed to src/modules/activity/infra/db/repositories/activity.repository.spec.ts

@@ -11,28 +11,28 @@ import {
   Req,
   Res,
 } from '@nestjs/common';
-import { CourseService } from '../services/course.service';
+import { CourseService } from '../../services/course.service';
 import {
   FindCoursesResponseDTO,
   FindIndividualCourseResponseDTO,
-} from '../domain/requests/FindCourses.request.dto';
+} from '../../../domain/dtos/requests/FindCourses.request.dto';
 import { ApiBearerAuth, ApiResponse, ApiTags } from '@nestjs/swagger';
-import { NotAuthenticatedException } from '../../../shared/domain/errors/NotAuthenticated.exception';
-import { AllExceptionsFilterDTO } from '../../../shared/domain/dtos/errors/AllException.filter.dto';
-import { CommonException } from '../../../shared/domain/errors/Common.exception';
+import { NotAuthenticatedException } from '../../../../../shared/domain/errors/NotAuthenticated.exception';
+import { AllExceptionsFilterDTO } from '../../../../../shared/domain/dtos/errors/AllException.filter.dto';
+import { CommonException } from '../../../../../shared/domain/errors/Common.exception';
 import { Request, Response } from 'express';
-import { CourseNotFoundException } from '../domain/errors/CourseNotFound.exception';
-import { PaginationDto } from '../../../shared/domain/dtos/providers/Pagination.dto';
+import { CourseNotFoundException } from '../../../domain/dtos/errors/CourseNotFound.exception';
+import { PaginationDto } from '../../../../../shared/domain/dtos/providers/Pagination.dto';
 import {
   CreateCourseRequestDTO,
   CreateCourseResponseDTO,
-} from '../domain/requests/CreateCourse.request.dto';
-import { NoPermisionException } from '../../../shared/domain/errors/NoPermission.exception';
+} from '../../../domain/dtos/requests/CreateCourse.request.dto';
+import { NoPermisionException } from '../../../../../shared/domain/errors/NoPermission.exception';
 import {
   EditCourseRequestDTO,
   EditCourseResponseDTO,
-} from '../domain/requests/EditCourse.request.dto';
-import { UnprocessableDataException } from '../../../shared/domain/errors/UnprocessableData.exception';
+} from '../../../domain/dtos/requests/EditCourse.request.dto';
+import { UnprocessableDataException } from '../../../../../shared/domain/errors/UnprocessableData.exception';
 
 @Controller('courses')
 @ApiTags('Cursos')

src/modules/activity/repository/activity.repository.ts renamed to src/modules/activity/infra/db/repositories/activity.repository.ts

@@ -7,20 +7,20 @@ import {
 import {
   ConjunctCoursesController,
   IndividualCoursesController,
-} from './controller/course.controller';
-import { CourseService } from './services/course.service';
-import { DatabaseModule } from '../../database/database.module';
+} from '../http/controllers/course.controller';
+import { CourseService } from '../services/course.service';
+import { DatabaseModule } from '../../../../database/database.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { Activity } from '../activity/entity/activity.entity';
-import { User } from '../user/entity/user.entity';
-import { UserCourseConcludedRepository } from '../user-courses-concluded/repository/user-courses-concluded.repository';
-import { CourseRepository } from './repository/course.repository';
-import { ActivityRepository } from '../activity/repository/activity.repository';
-import { AuthenticationMiddleware } from '../user/middlewares/auth.middleware';
-import { UserCourseConcluded } from '../user-courses-concluded/entity/user-courses-concluded.entity';
-import { JWTProvider } from '../user/providers/jwt.provider';
-import { UserActivityAnsweredRepository } from '../user-activities-answered/repository/user-activities-answered.repository';
-import { UserRepository } from '../user/repository/user.repository';
+import { Activity } from '../../../activity/infra/db/entity/activity.entity';
+import { User } from '../../../user/infra/db/entity/user.entity';
+import { UserCourseConcludedRepository } from '../../../user-courses-concluded/infra/db/repositories/user-courses-concluded.repository';
+import { CourseRepository } from '../db/repositories/course.repository';
+import { ActivityRepository } from '../../../activity/infra/db/repositories/activity.repository';
+import { AuthenticationMiddleware } from '../../../user/infra/http/middlewares/auth.middleware';
+import { UserCourseConcluded } from '../../../user-courses-concluded/infra/db/entity/user-courses-concluded.entity';
+import { JWTProvider } from '../../../user/infra/providers/jwt.provider';
+import { UserActivityAnsweredRepository } from '../../../user-activities-answered/infra/db/repositories/user-activities-answered.repository';
+import { UserRepository } from '../../../user/infra/db/repositories/user.repository';
 
 @Module({
   imports: [