Skip to content

Commit

Permalink
fix: ci and add new jest config, add coverage thershold, ignore inter…
Browse files Browse the repository at this point in the history
…faces files
  • Loading branch information
Murzbul committed Nov 27, 2022
1 parent 794a0b9 commit d483209
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 107 deletions.
49 changes: 0 additions & 49 deletions graph.svg

This file was deleted.

50 changes: 31 additions & 19 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,33 @@ module.exports = {
collectCoverageFrom: [
"src/**/*.{js,jsx,ts,tsx}",
"dist/src/**/*.{js,jsx,ts,tsx}",
"!<rootDir>/node_modules/"
"!<rootDir>/node_modules/",
"!dist/src/Shared/Presentation/Commands/*.{js,ts}",
"!dist/src/**/I*.{js,ts}",
"!dist/src/**/*Payload.{js,ts}",
"!dist/src/**/Commands/*.{js,ts}",
"!dist/src/Infrastructure/Notifications/*.{js,ts}",
"!dist/src/**/Infrastructure/Repositories/*TypeORMRepository.{js,ts}",
"!dist/src/**/Infrastructure/Schemas/*TypeORMRepository.{js,ts}",
"!dist/src/**/Infrastructure/Repositories/*MikroORMRepository.{js,ts}",
"!dist/src/**/Infrastructure/Schemas/*MikroORMRepository.{js,ts}",
"!dist/src/Shared/Infrastructure/Database/CreateMikroORMConnection.{js,ts}",
"!dist/src/Shared/Infrastructure/Database/CreateTypeORMConnection.{js,ts}",
"!dist/src/Shared/Infrastructure/Orm/MikroORMPaginator.{js,ts}",
"!dist/src/Shared/Infrastructure/Orm/TypeORMPaginator.{js,ts}",
"!dist/src/Shared/Infrastructure/Repositories/RedisCacheRepository.{js,ts}",
"!dist/src/Shared/Events/*.{js,ts}",
"!dist/src/**/*Express*.{js,ts}",
"!dist/src/Shared/Infrastructure/Filesystem/MinioStrategy.{js,ts}",
"!dist/src/Shared/Infrastructure/Crons/*.{js,ts}",
"!dist/src/Notification/**/*.{js,ts}",
"!dist/src/Shared/Factories/AxiosFactory.{js,ts}",
"!dist/src/crons.{js,ts}",
"!dist/src/command.{js,ts}",
"!dist/src/index.{js,ts}",
"!dist/src/initCommand.{js,ts}",
"!dist/src/Auth/Infrastructure/Repositories/TokenRedisRepository.{js,ts}",
"!dist/src/**/*Command*.{js,ts}",
],

// transform: tsjPreset.transform,
Expand All @@ -33,22 +59,8 @@ module.exports = {

// An array of regexp pattern strings used to skip coverage collection
coveragePathIgnorePatterns: [
".dist\/src\/.*\/I\w*\.js",
"<rootDir>/node_modules/",
"<rootDir>/.eslintrc.json",
"<rootDir>/src/command.{js,ts}",
"<rootDir>/src/Infrastructure/Notifications/*.{js,ts}",
"<rootDir>/src/Auth/Presentation/Commands/*.{js,ts}",
"<rootDir>/src/FileVersion/Infrastructure/Repositories/FileVersionTypeORMRepository.{js,ts}",
"<rootDir>/src/File/Infrastructure/Repositories/FileTypeORMRepository.{js,ts}",
"<rootDir>/src/Auth/Infrastructure/Repositories/UserTypeORMRepository.{js,ts}",
"<rootDir>/src/Auth/Infrastructure/Repositories/RoleTypeORMRepository.{js,ts}",
"<rootDir>/src/Auth/Infrastructure/Repositories/TokenRedisRepository.{js,ts}",
"<rootDir>/src/Item/Infrastructure/Repositories/ItemTypeORMRepository.{js,ts}",
"<rootDir>/src/Shared/Infrastructure/Database/CreateMikroORMConnection.{js,ts}",
"<rootDir>/src/Shared/Infrastructure/Database/CreateTypeORMConnection.{js,ts}",
"<rootDir>/src/Shared/Infrastructure/Orm/MikroORMPaginator.{js,ts}",
"<rootDir>/src/Shared/Events/*.{js,ts}",
],

// Indicates which provider should be used to instrument code for coverage
Expand All @@ -64,10 +76,10 @@ module.exports = {
// An object that configures minimum threshold enforcement for coverage results
coverageThreshold: {
global: {
branches: '40',
functions: '40',
lines: '40',
statements: '40'
statements: '75',
branches: '50',
functions: '55',
lines: '75',
}
},

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"compression": "^1.7.4",
"config": "^3.3.8",
"cors": "^2.8.5",
"cpy": "^9.0.1",
"cwebp": "^2.0.5",
"dayjs": "^1.11.5",
"dotenv": "^16.0.2",
Expand Down Expand Up @@ -125,11 +124,12 @@
"@types/web-push": "^3.3.2",
"@typescript-eslint/eslint-plugin": "^5.39.0",
"@typescript-eslint/parser": "^5.39.0",
"cpy": "^9.0.1",
"esbuild": "^0.15.14",
"esbuild-node-externals": "^1.4.1",
"esbuild-node-tsc": "^2.0.4",
"eslint": "^8.27.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prefer-arrow": "^1.2.3",
"husky": "^7.0.4",
"jest": "^28.1.3",
Expand Down
38 changes: 19 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions src/Auth/Domain/Payloads/User/UserAssignRoleBySlug.ts

This file was deleted.

8 changes: 8 additions & 0 deletions src/Auth/Domain/Payloads/User/UserAssignRoleBySlugPayload.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import UserActivePayload from './UserActivePayload';

interface UserAssignRoleBySlugPayload extends UserActivePayload
{
slugRole: string;
}

export default UserAssignRoleBySlugPayload;
4 changes: 2 additions & 2 deletions src/Auth/Domain/UseCases/User/AssignRoleBySlugUseCase.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import UserAssignRoleBySlug from '../../Payloads/User/UserAssignRoleBySlug';
import UserAssignRoleBySlugPayload from '../../Payloads/User/UserAssignRoleBySlugPayload';
import IUserDomain from '../../Entities/IUserDomain';
import { REPOSITORIES } from '../../../../Config/Injects';
import IUserRepository from '../../../Infrastructure/Repositories/IUserRepository';
Expand All @@ -17,7 +17,7 @@ class AssignRoleBySlugUseCase
this.roleRepository = container.resolve<IRoleRepository>(REPOSITORIES.IRoleRepository);
}

async handle(payload: UserAssignRoleBySlug): Promise<IUserDomain>
async handle(payload: UserAssignRoleBySlugPayload): Promise<IUserDomain>
{
const { email, slugRole } = payload;

Expand Down
4 changes: 2 additions & 2 deletions src/Auth/Presentation/Commands/AssingRoleToUserCommand.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import commander from 'commander';
import UserAssignRoleByCommandRequest from '../Requests/User/UserAssignRoleByCommandRequest';
import UserAssignRoleBySlug from '../../Domain/Payloads/User/UserAssignRoleBySlug';
import UserAssignRoleBySlugPayload from '../../Domain/Payloads/User/UserAssignRoleBySlugPayload';
import AssignRoleBySlugUseCase from '../../Domain/UseCases/User/AssignRoleBySlugUseCase';
import Logger from '../../../Shared/Application/Logger/Logger';

Expand All @@ -15,7 +15,7 @@ AssignRoleToUserCommand
{
const assignRoleBySlugUseCase = new AssignRoleBySlugUseCase();

const request: UserAssignRoleBySlug = new UserAssignRoleByCommandRequest(env);
const request: UserAssignRoleBySlugPayload = new UserAssignRoleByCommandRequest(env);
const user = await assignRoleBySlugUseCase.handle(request);

if (user)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IsString } from 'class-validator';
import UserAssignRoleBySlug from '../../../Domain/Payloads/User/UserAssignRoleBySlug';
import UserAssignRoleBySlugPayload from '../../../Domain/Payloads/User/UserAssignRoleBySlugPayload';

class UserAssignRoleByCommandRequest implements UserAssignRoleBySlug
class UserAssignRoleByCommandRequest implements UserAssignRoleBySlugPayload
{
private readonly _slug: string;
private readonly _email: string;
Expand Down
8 changes: 4 additions & 4 deletions src/Shared/Infrastructure/Crons/Cron.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ abstract class Cron
});
}

start(): ScheduledTask
start(): void
{
return this.scheduledTask.start();
this.scheduledTask.start();
}

stop(): ScheduledTask
stop(): void
{
return this.scheduledTask.stop();
this.scheduledTask.stop();
}

abstract time(): string;
Expand Down

0 comments on commit d483209

Please sign in to comment.