moves roles.enum file from API domain to shared

Vizzuality · Oct 7, 2024 · edea0d2 · edea0d2
1 parent 55aed51
commit edea0d2
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/api/src/modules/admin/admin.controller.ts b/api/src/modules/admin/admin.controller.ts
@@ -6,7 +6,7 @@ import { tsRestHandler, TsRestHandler } from '@ts-rest/nest';
 import { ControllerResponse } from '@api/types/controller-response.type';
 import { adminContract } from '@shared/contracts/admin.contract';
 import { AuthenticationService } from '@api/modules/auth/authentication.service';
-import { ROLES } from '@api/modules/auth/roles.enum';
+import { ROLES } from '@shared/entities/users/roles.enum';
 
 @Controller()
 @UseGuards(JwtAuthGuard, RolesGuard)

diff --git a/api/src/modules/auth/decorators/roles.decorator.ts b/api/src/modules/auth/decorators/roles.decorator.ts
@@ -1,5 +1,5 @@
 import { SetMetadata } from '@nestjs/common';
-import { ROLES } from '@api/modules/auth/roles.enum';
+import { ROLES } from '@shared/entities/users/roles.enum';
 
 export const ROLES_KEY = 'roles';
 export const RequiredRoles = (...roles: ROLES[]) =>

diff --git a/api/src/modules/auth/guards/roles.guard.ts b/api/src/modules/auth/guards/roles.guard.ts
@@ -1,7 +1,7 @@
 import { Injectable, CanActivate, ExecutionContext } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { ROLES_KEY } from '@api/modules/auth/decorators/roles.decorator';
-import { ROLES } from '@api/modules/auth/roles.enum';
+import { ROLES } from '@shared/entities/users/roles.enum';
 
 @Injectable()
 export class RolesGuard implements CanActivate {

diff --git a/api/src/modules/import/import.controller.ts b/api/src/modules/import/import.controller.ts
@@ -3,9 +3,10 @@ import { FileInterceptor } from '@nestjs/platform-express';
 import { JwtAuthGuard } from '@api/modules/auth/guards/jwt-auth.guard';
 import { RolesGuard } from '@api/modules/auth/guards/roles.guard';
 import { RequiredRoles } from '@api/modules/auth/decorators/roles.decorator';
-import { ROLES } from '@api/modules/auth/roles.enum';
+import { ROLES } from '@shared/entities/users/roles.enum';
 import { UploadXlsm } from '@api/modules/import/decorators/xlsm-upload.decorator';
 import { ImportService } from '@api/modules/import/import.service';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Multer } from 'multer';
 
 @Controller()

diff --git a/api/test/integration/auth/create-user.spec.ts b/api/test/integration/auth/create-user.spec.ts
@@ -3,7 +3,7 @@ import { User } from '@shared/entities/users/user.entity';
 import { HttpStatus } from '@nestjs/common';
 import { MockEmailService } from '../../utils/mocks/mock-email.service';
 import { IEmailServiceToken } from '@api/modules/notifications/email/email-service.interface';
-import { ROLES } from '@api/modules/auth/roles.enum';
+import { ROLES } from '@shared/entities/users/roles.enum';
 
 //create-user.feature
 

diff --git a/api/test/integration/auth/sign-up.spec.ts b/api/test/integration/auth/sign-up.spec.ts
@@ -2,7 +2,7 @@ import { TestManager } from '../../utils/test-manager';
 import { HttpStatus } from '@nestjs/common';
 import { TOKEN_TYPE_ENUM } from '@shared/schemas/auth/token-type.schema';
 import { authContract } from '@shared/contracts/auth.contract';
-import { ROLES } from '@api/modules/auth/roles.enum';
+import { ROLES } from '@shared/entities/users/roles.enum';
 import { JwtManager } from '@api/modules/auth/services/jwt.manager';
 import { User } from '@shared/entities/users/user.entity';
 

diff --git a/api/test/utils/test-manager.ts b/api/test/utils/test-manager.ts
@@ -13,7 +13,7 @@ import { createUser } from './mocks/entity-mocks';
 import { User } from '@shared/entities/users/user.entity';
 import { IEmailServiceToken } from '@api/modules/notifications/email/email-service.interface';
 import { MockEmailService } from './mocks/mock-email.service';
-import { ROLES } from '@api/modules/auth/roles.enum';
+import { ROLES } from '@shared/entities/users/roles.enum';
 
 /**
  * @description: Abstraction for NestJS testing workflow. For now its a basic implementation to create a test app, but can be extended to encapsulate

diff --git a/client/tsconfig.json b/client/tsconfig.json
@@ -29,7 +29,6 @@
     "baseUrl": ".",
     "paths": {
       "@shared/*": ["../shared/*"],
-      "@api/*": ["../api/src/*"],
       "@/*": [
         "./src/*"
       ]

diff --git a/api/src/modules/auth/roles.enum.ts → shared/entities/users/roles.enum.ts b/api/src/modules/auth/roles.enum.ts → shared/entities/users/roles.enum.ts
diff --git a/shared/entities/users/user.entity.ts b/shared/entities/users/user.entity.ts
@@ -5,7 +5,7 @@ import {
   PrimaryGeneratedColumn,
 } from "typeorm";
 import { Exclude } from "class-transformer";
-import { ROLES } from "@api/modules/auth/roles.enum";
+import { ROLES } from "@shared/entities/users/roles.enum";
 
 @Entity({ name: "users" })
 export class User {