danak/dsc-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: the whole role and permission flow

Browse Source
This commit is contained in:
mahyargdz
2025-02-17 13:54:34 +03:30
parent ad673613d9
commit 763b6b49d9
42 changed files with 479 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/tickets/tickets.controller.ts
+14 -20
View File
@@ -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);
}
}