refactor: the whole role and permission flow

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

@@ -4,7 +4,6 @@ import { DataSource, Not } from "typeorm";
 import { ParamDto } from "../../../common/DTO/param.dto";
 import { CommonMessage, TicketMessageEnum, UserMessage } from "../../../common/enums/message.enum";
 import { User } from "../../users/entities/user.entity";
-import { RoleEnum } from "../../users/enums/role.enum";
 import { UsersService } from "../../users/providers/users.service";
 import { PaginationUtils } from "../../utils/providers/pagination.utils";
 import { CreateTicketCategoryDto } from "../DTO/create-ticket-category.dto";
@@ -181,7 +180,7 @@ export class TicketsService {
 
   //******************************** */
 
-  async createTicketMessage(ticketId: string, createDto: CreateTicketMessageDto, userId: string, roles: RoleEnum[]) {
+  async createTicketMessage(ticketId: string, createDto: CreateTicketMessageDto, userId: string, isAdmin: boolean) {
     const queryRunner = this.dataSource.createQueryRunner();
     await queryRunner.connect();
     await queryRunner.startTransaction();
@@ -189,7 +188,7 @@ export class TicketsService {
     try {
       let ticket: null | Ticket = null;
 
-      if (roles.includes(RoleEnum.ADMIN)) {
+      if (isAdmin) {
         ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId });
       } else {
         ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId, user: { id: userId } });
@@ -204,7 +203,7 @@ export class TicketsService {
 
       const ticketMessage = queryRunner.manager.create(TicketMessage, { ...createDto, author: user, ticket });
 
-      if (roles.includes(RoleEnum.ADMIN) && ticket.status === TicketStatus.PENDING) {
+      if (isAdmin && ticket.status === TicketStatus.PENDING) {
         ticket.status = TicketStatus.ANSWERED;
       }
 
@@ -234,11 +233,11 @@ export class TicketsService {
 
   //******************************** */
 
-  async getTicketMessages(ticketId: string, userId: string, roles: RoleEnum[]) {
+  async getTicketMessages(ticketId: string, userId: string, isAdmin: boolean) {
     let ticket: null | Ticket = null;
 
     //
-    if (roles.includes(RoleEnum.ADMIN)) {
+    if (isAdmin) {
       ticket = await this.ticketsRepository.findTicketById(ticketId);
     } else {
       ticket = await this.ticketsRepository.findTicketById(ticketId, userId);
@@ -254,10 +253,10 @@ export class TicketsService {
 
   //******************************** */
 
-  async closeTicketByUser(ticketId: string, userId: string, roles: RoleEnum[]) {
+  async closeTicketByUser(ticketId: string, userId: string, isAdmin: boolean) {
     let ticket: null | Ticket = null;
 
-    if (roles.includes(RoleEnum.ADMIN)) {
+    if (isAdmin) {
       ticket = await this.ticketsRepository.findTicketById(ticketId);
     } else {
       ticket = await this.ticketsRepository.findTicketById(ticketId, userId);

src/modules/tickets/tickets.controller.ts

@@ -11,12 +11,9 @@ 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")
 @ApiTags("Tickets")
@@ -27,7 +24,6 @@ export class TicketsController {
 
   @ApiOperation({ summary: "Create ticket category => admin route" })
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
   @PermissionsDec(PermissionEnum.TICKETS)
   @Post("category")
   createTicketCategory(@Body() createDto: CreateTicketCategoryDto) {
@@ -36,7 +32,6 @@ 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) {
@@ -45,7 +40,6 @@ export class TicketsController {
 
   @ApiOperation({ summary: "Get ticket categories " })
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN, RoleEnum.USER)
   @Get("categories")
   @PermissionsDec(PermissionEnum.TICKETS)
   getTicketCategories() {
@@ -55,7 +49,7 @@ export class TicketsController {
   @ApiOperation({ summary: "Get ticket categories list => admin route" })
   @Pagination()
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
+  @PermissionsDec(PermissionEnum.TICKETS)
   @Get("categories-list")
   getCategoriesList(@Query() queryDto: SearchTicketCategoryDto) {
     return this.ticketsService.getCategoriesList(queryDto);
@@ -63,8 +57,8 @@ export class TicketsController {
 
   @ApiOperation({ summary: "toggle status of categories => admin route" })
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
   @HttpCode(HttpStatus.OK)
+  @PermissionsDec(PermissionEnum.TICKETS)
   @Post("category/toggle-status/:id")
   toggleCategoryStatus(@Param() paramDto: ParamDto) {
     return this.ticketsService.toggleCategoryStatus(paramDto);
@@ -74,7 +68,6 @@ export class TicketsController {
 
   @ApiOperation({ summary: "create ticket ==> user route" })
   @AuthGuards()
-  @Roles(RoleEnum.USER)
   @Post()
   createTicket(@Body() createDto: CreateTicketDto, @UserDec("id") userId: string) {
     return this.ticketsService.createTicket(createDto, userId);
@@ -82,7 +75,6 @@ export class TicketsController {
 
   @ApiOperation({ summary: "Get all tickets of user ==> user route" })
   @AuthGuards()
-  @Roles(RoleEnum.USER)
   @Pagination()
   @Get()
   getTickets(@Query() queryDto: SearchTicketQueryDto, @UserDec("id") userId: string) {
@@ -91,7 +83,7 @@ export class TicketsController {
 
   @ApiOperation({ summary: "Get all tickets ==> admin route" })
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
+  @PermissionsDec(PermissionEnum.TICKETS)
   @Pagination()
   @Get("admin")
   getAllTickets(@Query() queryDto: SearchTicketQueryDto) {
@@ -100,26 +92,28 @@ export class TicketsController {
 
   @ApiOperation({ summary: "create ticket messages" })
   @AuthGuards()
-  @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.roles as unknown as RoleEnum[]);
+  createTicketMessage(
+    @Param() paramDto: ParamDto,
+    @Body() createDto: CreateTicketMessageDto,
+    @UserDec("id") userId: string,
+    @UserDec("isAdmin") isAdmin: boolean,
+  ) {
+    return this.ticketsService.createTicketMessage(paramDto.id, createDto, userId, isAdmin);
   }
 
   @ApiOperation({ summary: "Get all ticket messages of user" })
   @AuthGuards()
-  @Roles(RoleEnum.USER, RoleEnum.ADMIN)
   @Get(":id/messages")
-  getTicketMessages(@Param() paramDto: ParamDto, @UserDec() user: User) {
-    return this.ticketsService.getTicketMessages(paramDto.id, user.id, user.roles as unknown as RoleEnum[]);
+  getTicketMessages(@Param() paramDto: ParamDto, @UserDec("id") userId: string, @UserDec("isAdmin") isAdmin: boolean) {
+    return this.ticketsService.getTicketMessages(paramDto.id, userId, isAdmin);
   }
 
   @ApiOperation({ summary: "close ticket by user or admin" })
   @AuthGuards()
-  @Roles(RoleEnum.USER, RoleEnum.ADMIN)
   @HttpCode(HttpStatus.OK)
   @Post(":id/close")
-  closedTicketByUser(@Param() paramDto: ParamDto, @UserDec() user: User) {
-    return this.ticketsService.closeTicketByUser(paramDto.id, user.id, user.roles as unknown as RoleEnum[]);
+  closedTicketByUser(@Param() paramDto: ParamDto, @UserDec("id") userId: string, @UserDec("isAdmin") isAdmin: boolean) {
+    return this.ticketsService.closeTicketByUser(paramDto.id, userId, isAdmin);
   }
 }