refactor: change the role to roles and many to many

src/modules/tickets/providers/tickets.service.ts

@@ -3,7 +3,6 @@ import { DataSource, Not } from "typeorm";
 
 import { ParamDto } from "../../../common/DTO/param.dto";
 import { CommonMessage, TicketMessageEnum, UserMessage } from "../../../common/enums/message.enum";
-import { Role } from "../../users/entities/role.entity";
 import { User } from "../../users/entities/user.entity";
 import { RoleEnum } from "../../users/enums/role.enum";
 import { UsersService } from "../../users/providers/users.service";
@@ -182,16 +181,15 @@ export class TicketsService {
 
   //******************************** */
 
-  async createTicketMessage(ticketId: string, createDto: CreateTicketMessageDto, userId: string, role: Role) {
+  async createTicketMessage(ticketId: string, createDto: CreateTicketMessageDto, userId: string, roles: RoleEnum[]) {
     const queryRunner = this.dataSource.createQueryRunner();
     await queryRunner.connect();
     await queryRunner.startTransaction();
 
     try {
-      const userRole = role as unknown as RoleEnum;
       let ticket: null | Ticket = null;
 
-      if (userRole === RoleEnum.ADMIN) {
+      if (roles.includes(RoleEnum.ADMIN)) {
         ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId });
       } else {
         ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId, user: { id: userId } });
@@ -206,7 +204,7 @@ export class TicketsService {
 
       const ticketMessage = queryRunner.manager.create(TicketMessage, { ...createDto, author: user, ticket });
 
-      if (userRole === RoleEnum.ADMIN && ticket.status === TicketStatus.PENDING) {
+      if (roles.includes(RoleEnum.ADMIN) && ticket.status === TicketStatus.PENDING) {
         ticket.status = TicketStatus.ANSWERED;
       }
 
@@ -236,12 +234,11 @@ export class TicketsService {
 
   //******************************** */
 
-  async getTicketMessages(ticketId: string, userId: string, role: Role) {
-    const userRole = role as unknown as RoleEnum;
+  async getTicketMessages(ticketId: string, userId: string, roles: RoleEnum[]) {
     let ticket: null | Ticket = null;
 
     //
-    if (userRole === RoleEnum.ADMIN) {
+    if (roles.includes(RoleEnum.ADMIN)) {
       ticket = await this.ticketsRepository.findTicketById(ticketId);
     } else {
       ticket = await this.ticketsRepository.findTicketById(ticketId, userId);
@@ -257,11 +254,10 @@ export class TicketsService {
 
   //******************************** */
 
-  async closeTicketByUser(ticketId: string, userId: string, role: Role) {
-    const userRole = role as unknown as RoleEnum;
+  async closeTicketByUser(ticketId: string, userId: string, roles: RoleEnum[]) {
     let ticket: null | Ticket = null;
 
-    if (userRole === RoleEnum.ADMIN) {
+    if (roles.includes(RoleEnum.ADMIN)) {
       ticket = await this.ticketsRepository.findTicketById(ticketId);
     } else {
       ticket = await this.ticketsRepository.findTicketById(ticketId, userId);

src/modules/tickets/repositories/tickets-message.repository.ts

@@ -29,7 +29,7 @@ export class TicketMessagesRepository extends Repository<TicketMessage> {
           id: true,
           firstName: true,
           lastName: true,
-          role: {
+          roles: {
             id: true,
             name: false,
           },

src/modules/tickets/tickets.controller.ts

@@ -10,10 +10,12 @@ import { UpdateTicketCategoryDto } from "./DTO/update-ticket-category.dto";
 import { TicketsService } from "./providers/tickets.service";
 import { AuthGuards } from "../../common/decorators/auth-guard.decorator";
 import { Pagination } from "../../common/decorators/pagination.decorator";
+import { PermissionsDec } from "../../common/decorators/permission.decorator";
 import { Roles } from "../../common/decorators/roles.decorator";
 import { UserDec } from "../../common/decorators/user.decorator";
 import { ParamDto } from "../../common/DTO/param.dto";
 import { User } from "../users/entities/user.entity";
+import { PermissionEnum } from "../users/enums/permission.enum";
 import { RoleEnum } from "../users/enums/role.enum";
 
 @Controller("tickets")
@@ -26,6 +28,7 @@ export class TicketsController {
   @ApiOperation({ summary: "Create ticket category => admin route" })
   @AuthGuards()
   @Roles(RoleEnum.ADMIN)
+  @PermissionsDec(PermissionEnum.TICKETS)
   @Post("category")
   createTicketCategory(@Body() createDto: CreateTicketCategoryDto) {
     return this.ticketsService.createTicketCategory(createDto);
@@ -34,6 +37,7 @@ export class TicketsController {
   @ApiOperation({ summary: "Update ticket category => admin route" })
   @AuthGuards()
   @Roles(RoleEnum.ADMIN)
+  @PermissionsDec(PermissionEnum.TICKETS)
   @Patch("category/:id")
   updateCategory(@Param() paramDto: ParamDto, @Body() updateCategoryDto: UpdateTicketCategoryDto) {
     return this.ticketsService.updateCategory(paramDto, updateCategoryDto);
@@ -43,6 +47,7 @@ export class TicketsController {
   @AuthGuards()
   @Roles(RoleEnum.ADMIN, RoleEnum.USER)
   @Get("categories")
+  @PermissionsDec(PermissionEnum.TICKETS)
   getTicketCategories() {
     return this.ticketsService.getTicketCategories();
   }
@@ -98,7 +103,7 @@ export class TicketsController {
   @Roles(RoleEnum.USER, RoleEnum.ADMIN)
   @Post(":id/messages")
   createTicketMessage(@Param() paramDto: ParamDto, @Body() createDto: CreateTicketMessageDto, @UserDec() user: User) {
-    return this.ticketsService.createTicketMessage(paramDto.id, createDto, user.id, user.role);
+    return this.ticketsService.createTicketMessage(paramDto.id, createDto, user.id, user.roles as unknown as RoleEnum[]);
   }
 
   @ApiOperation({ summary: "Get all ticket messages of user" })
@@ -106,7 +111,7 @@ export class TicketsController {
   @Roles(RoleEnum.USER, RoleEnum.ADMIN)
   @Get(":id/messages")
   getTicketMessages(@Param() paramDto: ParamDto, @UserDec() user: User) {
-    return this.ticketsService.getTicketMessages(paramDto.id, user.id, user.role);
+    return this.ticketsService.getTicketMessages(paramDto.id, user.id, user.roles as unknown as RoleEnum[]);
   }
 
   @ApiOperation({ summary: "close ticket by user or admin" })
@@ -115,6 +120,6 @@ export class TicketsController {
   @HttpCode(HttpStatus.OK)
   @Post(":id/close")
   closedTicketByUser(@Param() paramDto: ParamDto, @UserDec() user: User) {
-    return this.ticketsService.closeTicketByUser(paramDto.id, user.id, user.role);
+    return this.ticketsService.closeTicketByUser(paramDto.id, user.id, user.roles as unknown as RoleEnum[]);
   }
 }