Skip to content
This repository was archived by the owner on Sep 18, 2024. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {
'node_modules',
'coverage',
'src/database/migrations',
'src/exported/api/@types/i18n.d.ts',
'src/types/i18n.d.ts',
],
settings: {
'import/resolver': {
Expand Down
23 changes: 12 additions & 11 deletions jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,19 @@ const config: JestConfigWithTsJest = {
detectOpenHandles: true,
maxConcurrency: 1,
moduleNameMapper: {
'@env': '<rootDir>/src/env.ts',
'@mikro-orm.config': '<rootDir>/src/mikro-orm.config.ts',
'@app.module': '<rootDir>/src/app.module.ts',
'@main': '<rootDir>/src/main.ts',
'~/env': '<rootDir>/src/env.ts',
'~/mikro-orm.config': '<rootDir>/src/mikro-orm.config.ts',
'~/app.module': '<rootDir>/src/app.module.ts',
'~/main': '<rootDir>/src/main.ts',
'^src/(.*)$': '<rootDir>/src/$1',
'^@database/(.*)$': '<rootDir>/src/database/$1',
'^@exported/(.*)$': '<rootDir>/src/exported/$1',
'^@i18n': '<rootDir>/src/i18n/index.ts',
'^@modules/(.*)$': '<rootDir>/src/modules/$1',
'^@templates/(.*)$': '<rootDir>/src/templates/$1',
'^@types/(.*)$': '<rootDir>/src/types/$1',
'^@utils/(.*)$': '<rootDir>/src/utils/$1',
'^~/database/(.*)$': '<rootDir>/src/database/$1',
'^~/i18n': '<rootDir>/src/i18n/index.ts',
'^~/modules/(.*)$': '<rootDir>/src/modules/$1',
'^~/templates/(.*)$': '<rootDir>/src/templates/$1',
'^~/types/(.*)$': '<rootDir>/src/types/$1',
'^~/utils/(.*)$': '<rootDir>/src/utils/$1',
'^~/constants/(.*)$': '<rootDir>/src/types/exported/constants/$1',
'^~/utils': '<rootDir>/src/utils/index.ts',
},
modulePathIgnorePatterns: ['<rootDir>/dist', '<rootDir>/node_modules'],
preset: 'ts-jest',
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"prepare": "husky install"
},
"dependencies": {
"@ae_utbm/typings": "file:src/exported",
"@mikro-orm/cli": "^5.9.1",
"@mikro-orm/core": "^5.9.1",
"@mikro-orm/migrations": "^5.9.1",
Expand Down
20 changes: 10 additions & 10 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import { APP_INTERCEPTOR } from '@nestjs/core';
import { ScheduleModule } from '@nestjs/schedule';
import { AcceptLanguageResolver, I18nModule } from 'nestjs-i18n';

import { AuthModule } from '@modules/auth/auth.module';
import { EmailsModule } from '@modules/emails/emails.module';
import { FilesModule } from '@modules/files/files.module';
import { LoggingInterceptor } from '@modules/logs/interceptor/logging.interceptor';
import { LogsModule } from '@modules/logs/logs.module';
import { PermissionsModule } from '@modules/permissions/permissions.module';
import { PromotionsModule } from '@modules/promotions/promotions.module';
import { RolesModule } from '@modules/roles/roles.module';
import { UsersModule } from '@modules/users/users.module';
import { AuthModule } from '~/modules/auth/auth.module';
import { EmailsModule } from '~/modules/emails/emails.module';
import { FilesModule } from '~/modules/files/files.module';
import { LoggingInterceptor } from '~/modules/logs/interceptor/logging.interceptor';
import { LogsModule } from '~/modules/logs/logs.module';
import { PermissionsModule } from '~/modules/permissions/permissions.module';
import { PromotionsModule } from '~/modules/promotions/promotions.module';
import { RolesModule } from '~/modules/roles/roles.module';
import { UsersModule } from '~/modules/users/users.module';

@Module({
imports: [
Expand All @@ -28,7 +28,7 @@ import { UsersModule } from '@modules/users/users.module';
watch: true,
},
resolvers: [AcceptLanguageResolver],
typesOutputPath: join(__dirname, '../src/exported/api/@types/i18n.d.ts').replace(`${sep}dist`, ''),
typesOutputPath: join(__dirname, '../src/types/i18n.d.ts').replace(`${sep}dist`, ''),
}),
LogsModule,
MikroOrmModule.forRoot(),
Expand Down
10 changes: 5 additions & 5 deletions src/database/seeders/database.seeder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import type { EntityManager } from '@mikro-orm/core';
import { Seeder } from '@mikro-orm/seeder';
import { hashSync } from 'bcrypt';

import { FileVisibilityGroup } from '@modules/files/entities/file-visibility.entity';
import { Permission } from '@modules/permissions/entities/permission.entity';
import { Promotion } from '@modules/promotions/entities/promotion.entity';
import { UserVisibility } from '@modules/users/entities/user-visibility.entity';
import { User } from '@modules/users/entities/user.entity';
import { FileVisibilityGroup } from '~/modules/files/entities/file-visibility.entity';
import { Permission } from '~/modules/permissions/entities/permission.entity';
import { Promotion } from '~/modules/promotions/entities/promotion.entity';
import { UserVisibility } from '~/modules/users/entities/user-visibility.entity';
import { User } from '~/modules/users/entities/user.entity';

/**
* This class is used to populate the database with some base data
Expand Down
12 changes: 6 additions & 6 deletions src/database/seeders/tests.seeder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { EntityManager } from '@mikro-orm/core';
import { Seeder } from '@mikro-orm/seeder';
import { hashSync } from 'bcrypt';

import { FileVisibilityGroup } from '@modules/files/entities/file-visibility.entity';
import { Permission } from '@modules/permissions/entities/permission.entity';
import { RoleExpiration } from '@modules/roles/entities/role-expiration.entity';
import { Role } from '@modules/roles/entities/role.entity';
import { UserVisibility } from '@modules/users/entities/user-visibility.entity';
import { User } from '@modules/users/entities/user.entity';
import { FileVisibilityGroup } from '~/modules/files/entities/file-visibility.entity';
import { Permission } from '~/modules/permissions/entities/permission.entity';
import { RoleExpiration } from '~/modules/roles/entities/role-expiration.entity';
import { Role } from '~/modules/roles/entities/role.entity';
import { UserVisibility } from '~/modules/users/entities/user-visibility.entity';
import { User } from '~/modules/users/entities/user.entity';

import { DatabaseSeeder } from './database.seeder';

Expand Down
1 change: 0 additions & 1 deletion src/exported
Submodule exported deleted from e2ed2d
6 changes: 3 additions & 3 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { NestExpressApplication } from '@nestjs/platform-express';
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
import { I18nValidationExceptionFilter, I18nValidationPipe } from 'nestjs-i18n';

import { VALIDATION_PIPE_OPTIONS, env } from '@env';
import { I18nHttpExceptionFilter } from '@modules/base/http-errors';
import '@exported/global/utils';
import { VALIDATION_PIPE_OPTIONS, env } from '~/env';
import { I18nHttpExceptionFilter } from '~/modules/base/http-errors';
import '~/utils';

import { AppModule } from './app.module';
import pkg from '../package.json';
Expand Down
2 changes: 1 addition & 1 deletion src/mikro-orm.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { TsMorphMetadataProvider } from '@mikro-orm/reflection';
import { SqlHighlighter } from '@mikro-orm/sql-highlighter';
import { Logger } from '@nestjs/common';

import { env } from '@env';
import { env } from '~/env';

const logger = new Logger('MikroORM');

Expand Down
6 changes: 3 additions & 3 deletions src/modules/auth/auth.controller.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Controller, Post, Body, Param, Get } from '@nestjs/common';
import { ApiOkResponse, ApiOperation, ApiParam, ApiTags } from '@nestjs/swagger';

import { ApiNotOkResponses } from '@modules/base/decorators/api-not-ok.decorator';
import { OutputCreatedDTO, OutputMessageDTO } from '@modules/base/dto/output.dto';
import { UsersDataService } from '@modules/users/services/users-data.service';
import { ApiNotOkResponses } from '~/modules/base/decorators/api-not-ok.decorator';
import { OutputCreatedDTO, OutputMessageDTO } from '~/modules/base/dto/output.dto';
import { UsersDataService } from '~/modules/users/services/users-data.service';

import { AuthService } from './auth.service';
import { InputEmailParamsDTO, InputRegisterUserDTO, InputSignInDTO } from './dto/input.dto';
Expand Down
4 changes: 2 additions & 2 deletions src/modules/auth/auth.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Module } from '@nestjs/common';
import { JwtModule } from '@nestjs/jwt';
import { PassportModule } from '@nestjs/passport';

import { env } from '@env';
import { UsersModule } from '@modules/users/users.module';
import { env } from '~/env';
import { UsersModule } from '~/modules/users/users.module';

import { AuthController } from './auth.controller';
import { AuthService } from './auth.service';
Expand Down
9 changes: 4 additions & 5 deletions src/modules/auth/auth.service.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import type { email as Email } from '#types';
import type { JWTPayload } from '#types/api';
import type { email as Email, JWTPayload } from '~/types';

import { CreateRequestContext, MikroORM } from '@mikro-orm/core';
import { Injectable } from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { compareSync } from 'bcrypt';

import { env } from '@env';
import { i18nForbiddenException, i18nNotFoundException, i18nUnauthorizedException } from '@modules/base/http-errors';
import { User } from '@modules/users/entities/user.entity';
import { env } from '~/env';
import { i18nForbiddenException, i18nNotFoundException, i18nUnauthorizedException } from '~/modules/base/http-errors';
import { User } from '~/modules/users/entities/user.entity';

import { OutputTokenDTO } from './dto/output.dto';

Expand Down
2 changes: 1 addition & 1 deletion src/modules/auth/decorators/permissions.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { PERMISSION_NAMES } from '#types/api';
import type { PERMISSION_NAMES } from '~/types';

import { SetMetadata, applyDecorators } from '@nestjs/common';
import { ApiForbiddenResponse, ApiUnauthorizedResponse } from '@nestjs/swagger';
Expand Down
2 changes: 1 addition & 1 deletion src/modules/auth/decorators/self-or-perms.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { PERMISSION_NAMES } from '#types/api';
import type { PERMISSION_NAMES } from '~/types';

import { applyDecorators } from '@nestjs/common';

Expand Down
6 changes: 3 additions & 3 deletions src/modules/auth/dto/input.dto.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import type { email } from '#types';
import type {
email,
InputSignInDto,
InputRegisterUserAdminDto,
InputRegisterUserDto,
I18nTranslations,
InputRegisterUsersAdminDto,
} from '#types/api';
} from '~/types';

import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer';
import { ArrayNotEmpty, ArrayUnique, ValidateNested } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

import { I18nIsId, I18nIsEmail, I18nIsDate, I18nIsString, I18nIsStrongPassword } from '@modules/base/decorators';
import { I18nIsId, I18nIsEmail, I18nIsDate, I18nIsString, I18nIsStrongPassword } from '~/modules/base/decorators';

export class InputRegisterUserAdminDTO implements InputRegisterUserAdminDto {
@ApiProperty({ example: 'example@domain.com' })
Expand Down
2 changes: 1 addition & 1 deletion src/modules/auth/dto/output.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { OutputTokenDto } from '#types/api';
import type { OutputTokenDto } from '~/types';

import { ApiProperty } from '@nestjs/swagger';

Expand Down
4 changes: 2 additions & 2 deletions src/modules/auth/guards/permission.guard.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { PERMISSION_NAMES } from '#types/api';
import type { Request } from 'express';
import type { PERMISSION_NAMES } from '~/types';

import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
import { Reflector } from '@nestjs/core';
import { JwtService } from '@nestjs/jwt';

import { UsersDataService } from '@modules/users/services/users-data.service';
import { UsersDataService } from '~/modules/users/services/users-data.service';

import { AuthService } from '../auth.service';

Expand Down
2 changes: 1 addition & 1 deletion src/modules/auth/guards/self-or-perms.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
import { Reflector } from '@nestjs/core';
import { JwtService } from '@nestjs/jwt';

import { UsersDataService } from '@modules/users/services/users-data.service';
import { UsersDataService } from '~/modules/users/services/users-data.service';

import { PermissionGuard } from './permission.guard';
import { SelfGuard } from './self.guard';
Expand Down
2 changes: 1 addition & 1 deletion src/modules/auth/guards/self.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Injectable, CanActivate, ExecutionContext } from '@nestjs/common';
import { Reflector } from '@nestjs/core';
import { z } from 'zod';

import { i18nBadRequestException } from '@modules/base/http-errors';
import { i18nBadRequestException } from '~/modules/base/http-errors';

import { AuthService } from '../auth.service';

Expand Down
4 changes: 2 additions & 2 deletions src/modules/auth/strategies/jwt.strategy.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { JWTPayload } from '#types/api';
import type { JWTPayload } from '~/types';

import { Injectable } from '@nestjs/common';
import { PassportStrategy } from '@nestjs/passport';
import { ExtractJwt, Strategy } from 'passport-jwt';
import { z } from 'zod';

import { env } from '@env';
import { env } from '~/env';

import { AuthService } from '../auth.service';

Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/decorators/is-boolean.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { I18nTranslations } from '#types/api';
import type { I18nTranslations } from '~/types';

import { applyDecorators } from '@nestjs/common';
import { IsBoolean } from 'class-validator';
Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/decorators/is-date.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { I18nTranslations } from '#types/api';
import type { I18nTranslations } from '~/types';

import { applyDecorators } from '@nestjs/common';
import { IsDateString } from 'class-validator';
Expand Down
5 changes: 2 additions & 3 deletions src/modules/base/decorators/is-email.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import type { email } from '#types';
import type { I18nTranslations } from '#types/api';
import type { email, I18nTranslations } from '~/types';

import { applyDecorators } from '@nestjs/common';
import { IsEmail, ValidationOptions, registerDecorator } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

import { EmailsService } from '@modules/emails/emails.service';
import { EmailsService } from '~/modules/emails/emails.service';

/**
* Custom class validator to check if the email can be used or not.
Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/decorators/is-id.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { I18nTranslations } from '#types/api';
import type { I18nTranslations } from '~/types';

import { applyDecorators } from '@nestjs/common';
import { ValidationOptions, isNumber, isNumberString, registerDecorator } from 'class-validator';
Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/decorators/is-phone.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { I18nTranslations } from '#types/api';
import type { I18nTranslations } from '~/types';

import { applyDecorators } from '@nestjs/common';
import { IsPhoneNumber } from 'class-validator';
Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/decorators/is-string.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { I18nTranslations } from '#types/api';
import type { I18nTranslations } from '~/types';

import { applyDecorators } from '@nestjs/common';
import { IsString } from 'class-validator';
Expand Down
6 changes: 3 additions & 3 deletions src/modules/base/decorators/is-strong-pass.decorator.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { I18nTranslations } from '#types/api';
import type { I18nTranslations } from '~/types';

import { applyDecorators } from '@nestjs/common';
import { ValidationOptions, registerDecorator } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';

import { env } from '@env';
import { randomInt } from '@exported/global/utils';
import { env } from '~/env';
import { randomInt } from '~/utils';

const SYMBOL_CHARS = '!@#$%^&*()';
const LOWERCASE_CHARS = 'abcdefghijklmnopqrstuvwxyz';
Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/dto/input.dto.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ApiProperty } from '@nestjs/swagger';

import { I18nIsId } from '@modules/base/decorators';
import { I18nIsId } from '~/modules/base/decorators';

export class InputIdParamDTO {
@ApiProperty({ minimum: 1 })
Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/dto/output.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
OutputResponseDto,
HttpStatusNames,
I18nTranslations,
} from '#types/api';
} from '~/types';

import { PathImpl2 } from '@nestjs/config';
import { ApiProperty } from '@nestjs/swagger';
Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/entities/base.entity.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { OutputBaseDto } from '#types/api';
import type { OutputBaseDto } from '~/types';

import { BaseEntity as BE, Entity, PrimaryKey, Property } from '@mikro-orm/core';

Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/http-errors/bad-request.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { HttpStatusNames } from '#types/api';
import type { HttpStatusNames } from '~/types';

import { I18nHttpException } from './http-exception';

Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/http-errors/forbidden.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { HttpStatusNames } from '#types/api';
import type { HttpStatusNames } from '~/types';

import { I18nHttpException } from './http-exception';

Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/http-errors/http-exception.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { I18nTranslations, OutputErrorResponseDto } from '#types/api';
import type { I18nTranslations, OutputErrorResponseDto } from '~/types';

import { ArgumentsHost, Catch, ExceptionFilter } from '@nestjs/common';
import { Response } from 'express';
Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/http-errors/not-found.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { HttpStatusNames } from '#types/api';
import type { HttpStatusNames } from '~/types';

import { I18nHttpException } from './http-exception';

Expand Down
2 changes: 1 addition & 1 deletion src/modules/base/http-errors/unauthorized.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { HttpStatusNames } from '#types/api';
import type { HttpStatusNames } from '~/types';

import { I18nHttpException } from './http-exception';

Expand Down
6 changes: 3 additions & 3 deletions src/modules/emails/emails.service.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* istanbul ignore file */
// TODO: (KEY: 3) Find a way to test emails (sending / receiving)

import type { email } from '#types';
import type { email } from '~/types';

import { Injectable } from '@nestjs/common';
import { Transporter, createTransport } from 'nodemailer';

import { env } from '@env';
import { i18nBadRequestException } from '@modules/base/http-errors';
import { env } from '~/env';
import { i18nBadRequestException } from '~/modules/base/http-errors';

interface EmailOptions {
to: string[];
Expand Down
Loading